Browse Source

2 new items in popmenu

Kevin Trometer 7 years ago
parent
commit
e7d1a8b29f
2 changed files with 33 additions and 1 deletions
  1. 3 1
      src/ui/view/GUI.java
  2. 30 0
      src/ui/view/MyCanvas.java

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

@@ -1002,10 +1002,12 @@ public class GUI<E> implements CategoryListener {
 						if (tempCps.getClass() == HolonTransformer.class) {
 							h = new HolonTransformer(tempCps);
 						}
-
+					
 						h.setPosition(x, y);
 						controller.addObjectCanvas(h);
+						canvas.invalidate();
 						canvas.repaint();
+						
 						dragging = false;
 					}
 				} catch (Exception eex) {

+ 30 - 0
src/ui/view/MyCanvas.java

@@ -73,6 +73,8 @@ public class MyCanvas extends JPanel implements MouseListener, MouseMotionListen
 	private JMenuItem itemCut = new JMenuItem("Cut");
 	private JMenuItem itemCopy = new JMenuItem("Copy");
 	public JMenuItem itemPaste = new JMenuItem("Paste");
+	public JMenuItem itemCollapse = new JMenuItem("Colapse Nodes");
+	public JMenuItem itemTrack = new JMenuItem("Track");
 	private JToolTip objectTT = new JToolTip();
 
 	private Point mousePosition = new Point(); // Mouse Position when
@@ -104,12 +106,32 @@ public class MyCanvas extends JPanel implements MouseListener, MouseMotionListen
 		popmenu.add(itemCopy);
 		popmenu.add(itemPaste);
 		popmenu.add(itemDelete);
+		popmenu.addSeparator();
+		popmenu.add(itemCollapse);
+		popmenu.add(itemTrack);
 
 		itemDelete.setEnabled(false);
 		itemCut.setEnabled(false);
 		itemCopy.setEnabled(false);
 		itemPaste.setEnabled(false);
+		itemCollapse.setEnabled(false);
+		itemTrack.setEnabled(false);
 
+		itemCollapse.addActionListener(new ActionListener() {
+			@Override
+			public void actionPerformed(ActionEvent e) {
+				
+				repaint();
+			}
+		});
+		
+		itemTrack.addActionListener(new ActionListener() {
+			@Override
+			public void actionPerformed(ActionEvent e) {
+				
+			}
+		});
+		
 		itemDelete.addActionListener(new ActionListener() {
 			@Override
 			public void actionPerformed(ActionEvent e) {
@@ -446,6 +468,12 @@ public class MyCanvas extends JPanel implements MouseListener, MouseMotionListen
 				itemDelete.setEnabled(true);
 				itemCut.setEnabled(true);
 				itemCopy.setEnabled(true);
+				itemCollapse.setEnabled(true);
+				if (!(tempCps instanceof HolonSwitch)) {
+					itemTrack.setEnabled(true);
+				} else {
+					itemTrack.setEnabled(false);
+				}
 				if (model.getSelectedCpsObjects().size() == 0) {
 					controller.addSelectedObject(tempCps);
 				}
@@ -453,6 +481,8 @@ public class MyCanvas extends JPanel implements MouseListener, MouseMotionListen
 				itemCut.setEnabled(false);
 				itemCopy.setEnabled(false);
 				itemDelete.setEnabled(false);
+				itemCollapse.setEnabled(false);
+				itemTrack.setEnabled(false);
 			}
 			mousePosition = this.getMousePosition();
 			popmenu.show(e.getComponent(), e.getX(), e.getY());