浏览代码

Upper Node blabla

Teh-Hai Julian Zheng 7 年之前
父节点
当前提交
b98e2dfce8
共有 3 个文件被更改,包括 27 次插入2 次删除
  1. 5 1
      src/ui/controller/Control.java
  2. 21 0
      src/ui/controller/NodeController.java
  3. 1 1
      src/ui/view/UpperNodeCanvas.java

+ 5 - 1
src/ui/controller/Control.java

@@ -736,7 +736,11 @@ public class Control {
 		nodeController.addNode(nodeName, upperNode);
 	}
 	
-	public void addObjectInUpperNode(AbstractCpsObject object, CpsUpperNode upperNode) {
+	public void addObjUpperNode(AbstractCpsObject object, CpsUpperNode upperNode) {
 		nodeController.addObjectInUpperNode(object, upperNode);
 	}
+	
+	public void delObjUpperNode() {
+		
+	}
 }

+ 21 - 0
src/ui/controller/NodeController.java

@@ -9,6 +9,7 @@ import classes.CpsEdge;
 import classes.CpsUpperNode;
 import classes.Position;
 import ui.model.Model;
+import ui.view.UpperNodeCanvas;
 
 public class NodeController {
 
@@ -84,6 +85,26 @@ public class NodeController {
 		upperNode.getNodesIdx().remove(object.getID());
 		upperNode.getNodes().remove(object);
 	}
+	
+	/**
+	 * Add Edge in UpperNode
+	 * @param edge
+	 * @param upperNode
+	 */
+	public void addEdgeInUpperNode(CpsEdge edge, CpsUpperNode upperNode) {
+		upperNode.getNodeEdges().add(edge);
+	}
+	
+	/**
+	 * Delete Edge in UpperNode
+	 * @param edge
+	 * @param upperNode
+	 */
+	public void deleteEdgeInUpperNode(CpsEdge edge, CpsUpperNode upperNode) {
+		edge.getA().getConnections().remove(edge);
+		edge.getB().getConnections().remove(edge);
+		upperNode.getNodeEdges().remove(edge);
+	}
 
 	/**
 	 * Put selected Nodes inside the Upper Node

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

@@ -130,7 +130,7 @@ public class UpperNodeCanvas extends JPanel implements MouseListener, MouseMotio
 		itemCollapse.addActionListener(new ActionListener() {
 			@Override
 			public void actionPerformed(ActionEvent e) {
-				controller.addUpperNode("NodeOfNode", null);
+				controller.addUpperNode("NodeOfNode", UpperNode);
 				repaint();
 			}
 		});