Browse Source

bild fix multiselect on uppernode fix

Kevin Trometer 7 years ago
parent
commit
022b52beb6
3 changed files with 13 additions and 6 deletions
  1. BIN
      res/Images/Thumbs.db
  2. BIN
      res/Images/upper_node.png
  3. 13 6
      src/ui/view/UpperNodeCanvas.java

BIN
res/Images/Thumbs.db


BIN
res/Images/upper_node.png


+ 13 - 6
src/ui/view/UpperNodeCanvas.java

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