|
@@ -98,16 +98,6 @@ class MyCanvas extends JPanel implements MouseListener, MouseMotionListener {
|
|
RenderingHints rh = new RenderingHints(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
|
|
RenderingHints rh = new RenderingHints(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
|
|
g2.setRenderingHints(rh);
|
|
g2.setRenderingHints(rh);
|
|
|
|
|
|
- // Supplied Highlighting
|
|
|
|
-
|
|
|
|
- /*
|
|
|
|
- * // Selection if (selectRect != null &&
|
|
|
|
- * controller.searchByID(model.getSelectedObjectID()) != null &&
|
|
|
|
- * controller.searchByID(model.getSelectedObjectID()).getClass() !=
|
|
|
|
- * CpsNode.class) { g2.setColor(Color.BLUE); g2.fillRect((int)
|
|
|
|
- * selectRect.getX(), (int) selectRect.getY(), (int)
|
|
|
|
- * selectRect.getWidth(), (int) selectRect.getHeight()); }
|
|
|
|
- */
|
|
|
|
// drawEdges
|
|
// drawEdges
|
|
// g2.setColor(Color.BLACK);
|
|
// g2.setColor(Color.BLACK);
|
|
if (drawEdge) {
|
|
if (drawEdge) {
|
|
@@ -185,7 +175,7 @@ class MyCanvas extends JPanel implements MouseListener, MouseMotionListener {
|
|
if (((HolonObject) cps).getSupplied()) {
|
|
if (((HolonObject) cps).getSupplied()) {
|
|
g2.setColor(Color.GREEN);
|
|
g2.setColor(Color.GREEN);
|
|
} else {
|
|
} else {
|
|
- g2.setColor(Color.GRAY);
|
|
|
|
|
|
+ g2.setColor(Color.RED);
|
|
}
|
|
}
|
|
g2.fillRect(cps.getPosition().x - (controller.getScale() / 20),
|
|
g2.fillRect(cps.getPosition().x - (controller.getScale() / 20),
|
|
cps.getPosition().y - (controller.getScale() / 20),
|
|
cps.getPosition().y - (controller.getScale() / 20),
|
|
@@ -398,13 +388,12 @@ class MyCanvas extends JPanel implements MouseListener, MouseMotionListener {
|
|
}
|
|
}
|
|
if (newEdge) {
|
|
if (newEdge) {
|
|
e = new CpsEdge(cps, tempCps);
|
|
e = new CpsEdge(cps, tempCps);
|
|
- // cps.AddConnection(e);
|
|
|
|
- // tempCps.AddConnection(e);
|
|
|
|
|
|
+ controller.calculateStateForTimeStep(model.getCurIteration());
|
|
controller.AddEdgeOnCanvas(e);
|
|
controller.AddEdgeOnCanvas(e);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
- // Auf eine Edge gezoggen?
|
|
|
|
|
|
+ // Edge auf eine Edge gezogen?
|
|
if (onEdge) {
|
|
if (onEdge) {
|
|
CpsEdge p = mousePositionOnEdge(x, y);
|
|
CpsEdge p = mousePositionOnEdge(x, y);
|
|
if (p != null) {
|
|
if (p != null) {
|
|
@@ -424,17 +413,11 @@ class MyCanvas extends JPanel implements MouseListener, MouseMotionListener {
|
|
k = p.getB();
|
|
k = p.getB();
|
|
|
|
|
|
e = new CpsEdge(n, tempCps);
|
|
e = new CpsEdge(n, tempCps);
|
|
- // n.AddConnection(e);
|
|
|
|
- // tempCps.AddConnection(e);
|
|
|
|
-
|
|
|
|
|
|
+
|
|
e1 = new CpsEdge(n, r);
|
|
e1 = new CpsEdge(n, r);
|
|
- // n.AddConnection(e1);
|
|
|
|
- // r.AddConnection(e1);
|
|
|
|
-
|
|
|
|
|
|
+
|
|
e2 = new CpsEdge(n, k);
|
|
e2 = new CpsEdge(n, k);
|
|
- // n.AddConnection(e2);
|
|
|
|
- // k.AddConnection(e2);
|
|
|
|
-
|
|
|
|
|
|
+
|
|
p.getA().getConnections().remove(p);
|
|
p.getA().getConnections().remove(p);
|
|
p.getB().getConnections().remove(p);
|
|
p.getB().getConnections().remove(p);
|
|
|
|
|