diff --git a/AlgebraicDataflowArchitectureModel/src/application/editor/stages/DependencyModelingStage.java b/AlgebraicDataflowArchitectureModel/src/application/editor/stages/DependencyModelingStage.java index 850b41c..6271060 100644 --- a/AlgebraicDataflowArchitectureModel/src/application/editor/stages/DependencyModelingStage.java +++ b/AlgebraicDataflowArchitectureModel/src/application/editor/stages/DependencyModelingStage.java @@ -86,21 +86,18 @@ mxCell parent = (mxCell) graph.getDefaultParent(); mxCell layer = (mxCell) parent.getChildAt(DEPENDENCY_LAYER); - // レイヤーが空の場合のみ、グラフ構造の構築と描画を行う + //↓clear機能を改善しない限り、pushpull編集後の影響を反映できない if (layer.getChildCount() == 0) { - // 1. 論理モデルの構築 + clearDependencyGraphCells(graph); DataFlowGraph dataFlowGraph = ((PushPullSelectionStage) prevStage).getDataFlowGraph(); ControlFlowGraph controlFlowGraph = new ControlFlowGraph(dataFlowGraph, model); this.dependencyGraph = new DependencyGraph(controlFlowGraph, model); - // 2. 前のステージからのマッピング準備 statefulObjectNodeToCell = buildStatefulObjectNodeMap(prevStage); eventChannelObjNodeToCell = buildEventChannelObjNodeMap(prevStage); - // 3. 既存のゴミをクリア(マップ含む) - clearDependencyGraphCells(graph); - // 4. 描画 + graph = constructGraph(graph, dependencyGraph); } @@ -248,7 +245,7 @@ mxGeometry geo = (mxGeometry) oldCell.getGeometry().clone(); String label = (String) oldCell.getValue(); - String newStyle = "shape=ellipse;perimeter=ellipsePerimeter;verticalAlign=top;opacity=" + 0; + String newStyle = "shape=ellipse;perimeter=ellipsePerimeter;verticalAlign=top;"; mxCell newCell = (mxCell) graph.insertVertex(newParent,null, label, geo.getX(), geo.getY(), geo.getWidth(), geo.getHeight(), newStyle);