Quellcode durchsuchen

MultiSelection of CpsObject on UpperNodeCanvas

Edgardo Palza vor 8 Jahren
Ursprung
Commit
8d326c3368

+ 1 - 0
src/ui/controller/UpdateController.java

@@ -201,6 +201,7 @@ public class UpdateController {
 	 */
 	public AbstractCpsObject getActualCps() {
 		int tempID = model.getSelectedObjectID();
+		System.out.println(model.getSelectedObjectID());
 		AbstractCpsObject tempCps = controller.searchByID(tempID);
 		return tempCps;
 	}

+ 3 - 1
src/ui/view/GUI.java

@@ -733,6 +733,7 @@ public class GUI<E> implements CategoryListener {
 		model.getTableHolonElement().addMouseListener(new MouseAdapter() {
 			public void mousePressed(MouseEvent e) {
 				HolonObject obj = (HolonObject) updCon.getActualCps();
+				System.out.println(obj);
 				yValueElements = e.getY();
 				HolonElement ele = null;
 				// Search for current clicked HolonElement
@@ -1815,7 +1816,8 @@ public class GUI<E> implements CategoryListener {
 			unc.addMouseListener(new MouseAdapter() {
 				@Override
 				public void mousePressed(MouseEvent e) {
-					temp = ((UpperNodeCanvas) ((JScrollPane) tabbedPane.getSelectedComponent()).getViewport().getComponent(0)).tempCps;
+					temp = ((UpperNodeCanvas) ((JScrollPane) tabbedPane.getSelectedComponent()).getViewport()
+							.getComponent(0)).tempCps;
 					if (doubleClick() && temp instanceof CpsUpperNode) {
 						openNewUpperNodeTab();
 					}

+ 4 - 5
src/ui/view/UpperNodeCanvas.java

@@ -624,13 +624,12 @@ public class UpperNodeCanvas extends JPanel implements MouseListener, MouseMotio
 					controller.addTextToConsole("" + cps.getID(), Color.RED, 12, true, false, true);
 					dragging = true;
 					if (e.isControlDown() && tempCps != null) {
-						System.out.println(tempCps.getName() + " " + tempCps.getID());
 						if (model.getSelectedCpsObjects().contains(tempCps)) {
 							controller.deleteSelectedObject(tempCps);
 						} else {
 							controller.addSelectedObject(tempCps);
 						}
-					} else {
+					} else if (e.getButton() != MouseEvent.BUTTON3) {
 						controller.setSelectedObjectID(tempCps.getID());
 						model.getSelectedCpsObjects().clear();
 						controller.addSelectedObject(tempCps);
@@ -713,9 +712,9 @@ public class UpperNodeCanvas extends JPanel implements MouseListener, MouseMotio
 	@Override
 	public void mouseReleased(MouseEvent e) {
 		dragging = false;
-
-		updCon.refreshTableHolonElement(model.getMultiTable(), model.getSingleTable());
-		updCon.refreshTableProperties(model.getPropertyTable());
+		// updCon.refreshTableHolonElement(model.getMultiTable(),
+		// model.getSingleTable());
+		// updCon.refreshTableProperties(model.getPropertyTable());
 		if (model.getSelectedCpsObjects().size() > 1) {
 			model.getTableHolonElement().setModel(model.getMultiTable());
 		} else if (model.getSelectedCpsObjects().size() == 1) {