|
@@ -58,7 +58,7 @@ public class UpperNodeCanvas extends JPanel implements MouseListener, MouseMotio
|
|
|
private int cx, cy;
|
|
|
private int sx, sy; // Mark Coords
|
|
|
private float scalediv20;
|
|
|
- private int borderPos = 0; // Border Position
|
|
|
+ public int borderPos = 0; // Border Position
|
|
|
|
|
|
// Path
|
|
|
public String path;
|
|
@@ -314,9 +314,9 @@ public class UpperNodeCanvas extends JPanel implements MouseListener, MouseMotio
|
|
|
|
|
|
// If TempCps is an outside Object
|
|
|
if (!upperNode.getNodes().contains(tempCps)) {
|
|
|
- controller.addTextToConsole("success");
|
|
|
int count = 0;
|
|
|
for (CpsEdge e : upperNode.getConnections()) {
|
|
|
+ AbstractCpsObject cps;
|
|
|
if (e.getA().equals(tempCps)) {
|
|
|
g2.drawLine(borderPos >> 1, (int) (model.getScaleDiv2() + scalediv20 + 5
|
|
|
+ (model.getScale() + scalediv20 + 10) * count), x, y);
|
|
@@ -1063,12 +1063,13 @@ public class UpperNodeCanvas extends JPanel implements MouseListener, MouseMotio
|
|
|
n.setPosition(x - model.getScaleDiv2(), y - model.getScaleDiv2());
|
|
|
controller.addObjUpperNode(n, upperNode);
|
|
|
|
|
|
+ e = new CpsEdge(n, tempCps, model.getMaxCapacity());
|
|
|
+
|
|
|
if (outsideCon) {
|
|
|
controller.connectNodes(e, upperNode);
|
|
|
} else {
|
|
|
- e = new CpsEdge(n, tempCps, model.getMaxCapacity());
|
|
|
+ controller.addEdgeUpperNode(e, upperNode);
|
|
|
}
|
|
|
- controller.addEdgeUpperNode(e, upperNode);
|
|
|
}
|
|
|
|
|
|
// Wenn ein Node ohne Connections da ist
|