|
@@ -215,7 +215,7 @@ public class UpperNodeCanvas extends JPanel implements MouseListener, MouseMotio
|
|
public void actionPerformed(ActionEvent e) {
|
|
public void actionPerformed(ActionEvent e) {
|
|
// Remove the selected Object objects
|
|
// Remove the selected Object objects
|
|
for (AbstractCpsObject cps : model.getSelectedCpsObjects()) {
|
|
for (AbstractCpsObject cps : model.getSelectedCpsObjects()) {
|
|
- controller.delObjUpperNode(cps, UpperNode);
|
|
|
|
|
|
+ controller.delObjUpperNode(cps, upperNode);
|
|
// Remove UpperNodeTab if UpperNode deleted
|
|
// Remove UpperNodeTab if UpperNode deleted
|
|
if (cps instanceof CpsUpperNode) {
|
|
if (cps instanceof CpsUpperNode) {
|
|
JTabbedPane tabbedPane = (JTabbedPane) getParent().getParent().getParent();
|
|
JTabbedPane tabbedPane = (JTabbedPane) getParent().getParent().getParent();
|
|
@@ -466,10 +466,22 @@ public class UpperNodeCanvas extends JPanel implements MouseListener, MouseMotio
|
|
} else {
|
|
} else {
|
|
cps = e.getA();
|
|
cps = e.getA();
|
|
}
|
|
}
|
|
- //Show and Highlight
|
|
|
|
|
|
+ // Show and Highlight
|
|
if (model.getSelectedCpsObjects().contains(cps)) {
|
|
if (model.getSelectedCpsObjects().contains(cps)) {
|
|
- for (CpsEdge ed: cps.getConnections()) {
|
|
|
|
-
|
|
|
|
|
|
+ for (CpsEdge ed : cps.getConnections()) {
|
|
|
|
+ AbstractCpsObject obj = null;
|
|
|
|
+ if (upperNode.getNodes().contains(ed.getA())) {
|
|
|
|
+ obj = ed.getA();
|
|
|
|
+ } else if (upperNode.getNodes().contains(ed.getB())) {
|
|
|
|
+ obj = ed.getB();
|
|
|
|
+ }
|
|
|
|
+ if (obj != null) {
|
|
|
|
+ g2.setColor(Color.BLUE);
|
|
|
|
+ g2.drawLine(obj.getPosition().x + model.getScaleDiv2(),
|
|
|
|
+ obj.getPosition().y + model.getScaleDiv2(), (borderPos >> 1),
|
|
|
|
+ (int) (scalediv20 + 5 + (model.getScale() + scalediv20 + 10) * count)
|
|
|
|
+ + model.getScaleDiv2());
|
|
|
|
+ }
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|