Browse Source

show edges from outside in uppernode, when selected

Kevin Trometer 7 years ago
parent
commit
6ea77fa0be
3 changed files with 18 additions and 6 deletions
  1. 0 1
      src/ui/view/GUI.java
  2. 2 1
      src/ui/view/MyCanvas.java
  3. 16 4
      src/ui/view/UpperNodeCanvas.java

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

@@ -2008,7 +2008,6 @@ public class GUI<E> implements CategoryListener {
 			tabbedPane.setSelectedComponent(sp);
 			tabbedPane.setTabComponentAt(tabbedPane.getTabCount() - 1, new ButtonTabComponent(tabbedPane));
 			temp = null;
-
 		}
 	}
 

+ 2 - 1
src/ui/view/MyCanvas.java

@@ -467,12 +467,13 @@ public class MyCanvas extends JPanel implements MouseListener, MouseMotionListen
 		dataSelected = null;
 		edgeHighlight = null;
 		controller.setSelecteEdge(null);
+		
 		// Object Selection
 		for (AbstractCpsObject cps : model.getObjectsOnCanvas()) {
 			cx = cps.getPosition().x;
 			cy = cps.getPosition().y;
 			if (x - controller.getScale() <= cx && y - controller.getScale() <= cy && x >= cx && y >= cy) {
-				tempCps = cps;
+				tempCps = cps;				
 				controller.addTextToConsole("Selected: ", Color.BLACK, 12, false, false, false);
 				controller.addTextToConsole("" + cps.getName(), Color.BLUE, 12, true, false, false);
 				controller.addTextToConsole(", ID:", Color.BLACK, 12, false, false, false);

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

@@ -215,7 +215,7 @@ public class UpperNodeCanvas extends JPanel implements MouseListener, MouseMotio
 			public void actionPerformed(ActionEvent e) {
 				// Remove the selected Object objects
 				for (AbstractCpsObject cps : model.getSelectedCpsObjects()) {
-					controller.delObjUpperNode(cps, UpperNode);
+					controller.delObjUpperNode(cps, upperNode);
 					// Remove UpperNodeTab if UpperNode deleted
 					if (cps instanceof CpsUpperNode) {
 						JTabbedPane tabbedPane = (JTabbedPane) getParent().getParent().getParent();
@@ -466,10 +466,22 @@ public class UpperNodeCanvas extends JPanel implements MouseListener, MouseMotio
 			} else {
 				cps = e.getA();
 			}
-			//Show and Highlight 
+			// Show and Highlight
 			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());
+					}
 				}
 			}