Parcourir la source

Algorithm Tab added

Jessey Widhalm il y a 8 ans
Parent
commit
64078ac34f
1 fichiers modifiés avec 42 ajouts et 3 suppressions
  1. 42 3
      src/ui/view/GUI.java

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

@@ -21,8 +21,6 @@ import javax.swing.JTable;
 import javax.swing.tree.DefaultTreeModel;
 import javax.swing.tree.TreeCellRenderer;
 
-import com.sun.javafx.geom.Edge;
-
 import ui.controller.Control;
 import ui.model.*;
 
@@ -68,8 +66,14 @@ import javax.swing.JSlider;
 import javax.swing.event.ChangeListener;
 import javax.swing.event.TableModelEvent;
 import javax.swing.event.ChangeEvent;
+import javax.swing.JList;
+import javax.swing.JCheckBoxMenuItem;
+import javax.swing.Box;
+import javax.swing.JPopupMenu;
+import javax.swing.JSeparator;
+import javax.swing.SwingConstants;
 
-public class GUI implements CategoryListener {
+public class GUI<E> implements CategoryListener {
 
 	private JFrame frmCyberPhysical;
 
@@ -167,6 +171,12 @@ public class GUI implements CategoryListener {
 	private final JLabel lblImageSize = new JLabel("Image Size");
 	// Time Stuff
 	private TimePanel timePanel;
+	private final JMenu mnAlgorithm = new JMenu("Algorithm");
+	private final JCheckBoxMenuItem chckbxmntmUseAlgorithm = new JCheckBoxMenuItem("Use Algorithm");
+	private final JSplitPane splitPane_2 = new JSplitPane();
+	private final JLabel label_1 = new JLabel("New label");
+	private final JLabel lblSelect = new JLabel("Select");
+	private final JComboBox comboBoxAlgo = new JComboBox();
 
 	/**
 	 * Create the application.
@@ -232,6 +242,16 @@ public class GUI implements CategoryListener {
 		menuBar.add(mnHelp);
 
 		mnHelp.add(aboutUs);
+		
+		menuBar.add(mnAlgorithm);
+		
+		mnAlgorithm.add(chckbxmntmUseAlgorithm);
+		
+		mnAlgorithm.add(splitPane_2);
+		
+		splitPane_2.setLeftComponent(lblSelect);
+		
+		splitPane_2.setRightComponent(comboBoxAlgo);
 
 		unitGraph.setBackground(Color.WHITE);
 
@@ -242,6 +262,8 @@ public class GUI implements CategoryListener {
 
 		tabbedPane.addTab("Modeling", new ImageIcon(new ImageIcon(this.getClass().getResource("/Images/home.png"))
 				.getImage().getScaledInstance(30, 30, Image.SCALE_SMOOTH)), canvasSP, "Model a CPS");
+		
+		tabbedPane.addTab("New tab", null, label_1, null);
 
 		tabbedPane.addTab("Simulation",
 				new ImageIcon(new ImageIcon(this.getClass().getResource("/Images/Dummy_House.png")).getImage()
@@ -951,4 +973,21 @@ public class GUI implements CategoryListener {
 			tableModelProperties.insertRow(2, tempEnergy);
 		}
 	}
+	private static void addPopup(Component component, final JPopupMenu popup) {
+		component.addMouseListener(new MouseAdapter() {
+			public void mousePressed(MouseEvent e) {
+				if (e.isPopupTrigger()) {
+					showMenu(e);
+				}
+			}
+			public void mouseReleased(MouseEvent e) {
+				if (e.isPopupTrigger()) {
+					showMenu(e);
+				}
+			}
+			private void showMenu(MouseEvent e) {
+				popup.show(e.getComponent(), e.getX(), e.getY());
+			}
+		});
+	}
 }