-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy pathjmt_patch
150 lines (139 loc) · 6.27 KB
/
jmt_patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
Index: src/main/java/jmt/gui/jsimgraph/JGraphMod/JmtGraphConstants.java
===================================================================
--- src/main/java/jmt/gui/jsimgraph/JGraphMod/JmtGraphConstants.java (revision 971)
+++ src/main/java/jmt/gui/jsimgraph/JGraphMod/JmtGraphConstants.java (working copy)
@@ -18,6 +18,7 @@
package jmt.gui.jsimgraph.JGraphMod;
+import jmt.gui.jsimgraph.JGraphMod.arrows.JmtRoutingNew;
import org.jgraph.graph.Edge;
import org.jgraph.graph.GraphConstants;
@@ -31,5 +32,6 @@
public class JmtGraphConstants extends GraphConstants {
public static final Edge.Routing ROUTING_JMT = new JmtRouting();
+ public static final Edge.Routing ROUTING_JMT_NEW = new JmtRoutingNew();
}
Index: src/main/java/jmt/gui/jsimgraph/JGraphMod/JmtRouting.java
===================================================================
--- src/main/java/jmt/gui/jsimgraph/JGraphMod/JmtRouting.java (revision 971)
+++ src/main/java/jmt/gui/jsimgraph/JGraphMod/JmtRouting.java (working copy)
@@ -59,6 +59,7 @@
}
if (from != null && to != null) {
+ System.out.println("From = " + from + ", to = " + to);
JmtEdge edge = (JmtEdge) edgeView.getCell();//qua era defaultEdge l ho cambiato
JmtCell source = (JmtCell) ((DefaultPort) edge.getSource()).getParent();
JmtCell target = (JmtCell) ((DefaultPort) edge.getTarget()).getParent();
Index: src/main/java/jmt/gui/jsimgraph/controller/Mediator.java
===================================================================
--- src/main/java/jmt/gui/jsimgraph/controller/Mediator.java (revision 971)
+++ src/main/java/jmt/gui/jsimgraph/controller/Mediator.java (working copy)
@@ -78,20 +78,11 @@
import jmt.gui.common.xml.ModelLoader;
import jmt.gui.common.xml.XMLWriter;
import jmt.gui.jsimgraph.DialogFactory;
-import jmt.gui.jsimgraph.JGraphMod.BlockingRegion;
-import jmt.gui.jsimgraph.JGraphMod.CellComponent;
-import jmt.gui.jsimgraph.JGraphMod.CellFactory;
-import jmt.gui.jsimgraph.JGraphMod.InputPort;
-import jmt.gui.jsimgraph.JGraphMod.JmtCell;
-import jmt.gui.jsimgraph.JGraphMod.JmtDefaultCellViewFactory;
-import jmt.gui.jsimgraph.JGraphMod.JmtEdge;
-import jmt.gui.jsimgraph.JGraphMod.JmtEdgeView;
-import jmt.gui.jsimgraph.JGraphMod.JmtGraphConstants;
-import jmt.gui.jsimgraph.JGraphMod.JmtJGraph;
-import jmt.gui.jsimgraph.JGraphMod.JmtOverlapping;
-import jmt.gui.jsimgraph.JGraphMod.OutputPort;
-import jmt.gui.jsimgraph.JGraphMod.SinkCell;
-import jmt.gui.jsimgraph.JGraphMod.SourceCell;
+import jmt.gui.jsimgraph.JGraphMod.*;
+import jmt.gui.jsimgraph.JGraphMod.arrows.JmtComponentsMatrix;
+import jmt.gui.jsimgraph.JGraphMod.arrows.JmtEdgesMatrix;
+import jmt.gui.jsimgraph.JGraphMod.arrows.JmtMatrixCoordinate;
+import jmt.gui.jsimgraph.JGraphMod.arrows.JmtRoutingNew;
import jmt.gui.jsimgraph.controller.actions.About;
import jmt.gui.jsimgraph.controller.actions.AbstractJmodelAction;
import jmt.gui.jsimgraph.controller.actions.ActionCopy;
@@ -262,6 +253,9 @@
private JmtOverlapping overlapping;
+ private JmtComponentsMatrix componentsMatrix;
+ private JmtEdgesMatrix connectionsMatrix;
+
public Mediator(final JmtJGraph graph, MainWindow mainWindow) {
this.mainWindow = mainWindow;
dialogFactory = new DialogFactory(mainWindow);
@@ -324,11 +318,16 @@
actionRotate = new ActionRotate(this);
overlapping = new JmtOverlapping(this);
+ componentsMatrix = new JmtComponentsMatrix(this);
+ connectionsMatrix = new JmtEdgesMatrix();
+
editUserClasses = new EditUserClasses(this);
editMeasures = new EditMeasures(this);
switchToExactSolver = new SwitchToExactSolver(this);
// Initialize new Component bar
componentBar = new ComponentBar(this);
+
+ ((JmtRoutingNew) JmtGraphConstants.ROUTING_JMT_NEW).setMediator(this);
}
/**
@@ -697,6 +696,8 @@
takeScreenShot.setEnabled(true);
openedArchive = null;
mainWindow.updateTitle(null);
+ //componentsMatrix.setCellSize(graph.getTolerance());
+ componentsMatrix.setCellSize(50);
// Free same resources by forcing a garbage collection
System.gc();
}
@@ -996,8 +997,8 @@
list.add(p2);
Map map = new Hashtable();
GraphConstants.setPoints(map, list);
- GraphConstants.setRouting(map, GraphConstants.ROUTING_SIMPLE);
- GraphConstants.setRouting(map, JmtGraphConstants.ROUTING_JMT);
+ //GraphConstants.setRouting(map, GraphConstants.ROUTING_SIMPLE);
+ GraphConstants.setRouting(map, JmtGraphConstants.ROUTING_JMT_NEW);
GraphConstants.setLineEnd(map, GraphConstants.ARROW_CLASSIC);
GraphConstants.setEndFill(map, true);
GraphConstants.setDisconnectable(map, false);
@@ -1013,6 +1014,13 @@
cs.connect(connection, inPort.getCell(), false);
// Visualizes connection only if it can be created into data structure
if (model.setConnected(sourceKey, targetKey, true)) {
+ int startX = (int) p.getX() / componentsMatrix.getCellSize() + 1;
+ int startY = (int) p.getY() / componentsMatrix.getCellSize();
+
+ int endX = (int) p2.getX() / componentsMatrix.getCellSize() - 1;
+ int endY = (int) p2.getY() / componentsMatrix.getCellSize();
+ connectionsMatrix.put(new JmtMatrixCoordinate(startX, startY), new JmtMatrixCoordinate(endX, endY));
+ //((JmtRoutingNew) JmtGraphConstants.ROUTING_JMT_NEW).bestMatrix();
graph.getModel().insert(insert, viewMap, cs, null, null);
}
}
@@ -3289,4 +3297,15 @@
}
}
+ public void addStationCell(Rectangle2D r) {
+ componentsMatrix.addStationCell(r);
+ }
+
+ public JmtComponentsMatrix getComponentsMatrix() {
+ return componentsMatrix;
+ }
+
+ public JmtEdgesMatrix getConnectionsMatrix() {
+ return connectionsMatrix;
+ }
}
Index: src/main/java/jmt/gui/jsimgraph/controller/SelectState.java
===================================================================
--- src/main/java/jmt/gui/jsimgraph/controller/SelectState.java (revision 971)
+++ src/main/java/jmt/gui/jsimgraph/controller/SelectState.java (working copy)
@@ -90,6 +90,7 @@
CellView next = mediator.getNextViewAt(ml.getFocus(), point.getX(), point.getY());
if (next != null && next.getCell() != null) {
if (!(ml.getFocus() != null && next.getCell() instanceof BlockingRegion)) {
+ mediator.addStationCell(next.getBounds());
ml.setCell(next);
}
}