diff --git a/AlgebraicDataflowArchitectureModel/src/graphicalrefactor/layouts/DAGLayout.java b/AlgebraicDataflowArchitectureModel/src/graphicalrefactor/layouts/DAGLayout.java index c09178c..2665efe 100644 --- a/AlgebraicDataflowArchitectureModel/src/graphicalrefactor/layouts/DAGLayout.java +++ b/AlgebraicDataflowArchitectureModel/src/graphicalrefactor/layouts/DAGLayout.java @@ -40,7 +40,7 @@ mxGraphView view = graph.getView(); mxCellState state = view.getState(cell); - if (!"ellipse".equals(state.getStyle().get("shape")) && (cell.getEdgeCount() == 1)) { + if (!"ellipse".equals(state.getStyle().get("shape")) && (cell.getEdgeCount() == 1) && !"true".equals(state.getStyle().get("dashed"))) { List newline = new ArrayList(); map.add(newline); lines(map, cell); @@ -48,7 +48,7 @@ } } - // ���בւ� + // ���בւ� sort(map, 0, false); // layout @@ -94,9 +94,11 @@ mapping.get(mapping.size()-1).add(next); int tagcount = 0; mxCell edge; + mxGraphView view = graph.getView(); for (int i = 0; i < next.getEdgeCount(); i++) { edge = (mxCell) next.getEdgeAt(i); - if (next != (mxCell) edge.getTarget() && ((mxCell) edge.getTarget() != null)) { + mxCellState state = view.getState(edge); + if (next != (mxCell) edge.getTarget() && ((mxCell) edge.getTarget() != null) && !"true".equals(state.getStyle().get("dashed"))) { tagcount++; if (tagcount > 1) { List newline = new ArrayList(mapping.get(mapping.size()-1));