|
@@ -638,6 +638,14 @@ public class UpperNodeCanvas extends JPanel implements MouseListener, MouseMotio
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ if (e.isControlDown() && tempCps != null) {
|
|
|
+ if (model.getSelectedCpsObjects().contains(tempCps)) {
|
|
|
+ controller.deleteSelectedObject(tempCps);
|
|
|
+ } else {
|
|
|
+ controller.addSelectedObject(tempCps);
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
// Selection of CpsObject
|
|
|
model.setSelectedCpsObject(tempCps);
|
|
|
|
|
@@ -780,9 +788,8 @@ public class UpperNodeCanvas extends JPanel implements MouseListener, MouseMotio
|
|
|
|
|
|
tempCps.setPosition(x, y); // Drag Position
|
|
|
// TipText Position and name
|
|
|
- // objectTT.setTipText(tempCps.getName() + ", " +
|
|
|
- // tempCps.getID());
|
|
|
- // objectTT.setLocation(x, y + controller.getScale());
|
|
|
+ objectTT.setTipText(tempCps.getName() + ", " + tempCps.getID());
|
|
|
+ objectTT.setLocation(x, y + controller.getScale());
|
|
|
|
|
|
// All Selected Objects
|
|
|
for (AbstractCpsObject cps : model.getSelectedCpsObjects()) {
|
|
@@ -866,11 +873,11 @@ public class UpperNodeCanvas extends JPanel implements MouseListener, MouseMotio
|
|
|
cps = ed.getA();
|
|
|
}
|
|
|
|
|
|
- cx = borderPos>>1;
|
|
|
+ cx = borderPos >> 1;
|
|
|
cy = (int) (scalediv20 + 5 + (model.getScale() + scalediv20 + 10) * count);
|
|
|
if (x - controller.getScale() <= cx && y - controller.getScale() <= cy && x >= cx && y >= cy) {
|
|
|
|
|
|
- objectTT.setLocation(cx-model.getScaleDiv2(), cy + controller.getScale());
|
|
|
+ objectTT.setLocation(cx - model.getScaleDiv2(), cy + controller.getScale());
|
|
|
objectTT.setTipText(cps.getName() + ", " + cps.getID());
|
|
|
|
|
|
on = true;
|
|
@@ -880,7 +887,7 @@ public class UpperNodeCanvas extends JPanel implements MouseListener, MouseMotio
|
|
|
|
|
|
if (!on) {
|
|
|
objectTT.setTipText("");
|
|
|
- objectTT.setLocation(-200, -200);
|
|
|
+ //objectTT.setLocation(-200, -200);
|
|
|
}
|
|
|
|
|
|
}
|