Переглянути джерело

Graph in canvas and uppernode

Edgardo Palza 7 роки тому
батько
коміт
138e1ad35f

+ 11 - 0
src/classes/CpsUpperNode.java

@@ -113,4 +113,15 @@ public class CpsUpperNode extends AbstractCpsObject {
 		return onlyUpperNodes;
 	}
 
+	public AbstractCpsObject searchObj(int ID) {
+		AbstractCpsObject result = null;
+		for (AbstractCpsObject obj : getNodes()) {
+			if (obj.getID() == ID) {
+				result = obj;
+				break;
+			}
+		}
+		return result;
+	}
+
 }

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

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

+ 6 - 2
src/ui/view/GUI.java

@@ -392,7 +392,7 @@ public class GUI<E> implements CategoryListener {
 
 			@Override
 			public void actionPerformed(ActionEvent e) {
-				
+
 				model.getSelectedCpsObjects().clear();
 				// Uppernode Canvas?
 				if (((JScrollPane) tabbedPane.getSelectedComponent()).getViewport()
@@ -1885,12 +1885,16 @@ public class GUI<E> implements CategoryListener {
 			unc.addMouseListener(new MouseAdapter() {
 				@Override
 				public void mousePressed(MouseEvent e) {
+					unitGraph.empty();
 					temp = ((UpperNodeCanvas) ((JScrollPane) tabbedPane.getSelectedComponent()).getViewport()
 							.getComponent(0)).tempCps;
 					if (doubleClick() && MouseEvent.BUTTON3 != e.getButton() && temp instanceof CpsUpperNode) {
 						openNewUpperNodeTab();
 					}
-					// updCon.refreshTableProperties(table);
+					if (temp instanceof HolonSwitch) {
+						unitGraph.repaintWithNewSwitch((HolonSwitch) temp);
+						unitGraph.fillArrayofBooleans();
+					}
 				}
 			});
 

+ 0 - 1
src/ui/view/UpperNodeCanvas.java

@@ -597,7 +597,6 @@ public class UpperNodeCanvas extends JPanel implements MouseListener, MouseMotio
 
 	@Override
 	public void mousePressed(MouseEvent e) {
-		System.out.println(model.getObjectsOnCanvas());
 		tempCps = null;
 		dataSelected = null;
 		edgeHighlight = null;