Browse Source

simulationmenu

Kevin Trometer 7 years ago
parent
commit
c93b897a2e
3 changed files with 34 additions and 4 deletions
  1. 0 1
      src/ui/controller/Control.java
  2. 6 3
      src/ui/view/GUI.java
  3. 28 0
      src/ui/view/SimulationMenu.java

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

@@ -14,7 +14,6 @@ import classes.CpsNode;
 import classes.CpsObject;
 import classes.HolonElement;
 import classes.HolonObject;
-import classes.HolonSwitch;
 import classes.Position;
 import ui.model.Model;
 import ui.view.MyCanvas;

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

@@ -83,6 +83,8 @@ public class GUI<E> implements CategoryListener {
 
 	private JFrame frmCyberPhysical;
 
+	private final SimulationMenu simMenu;
+	
 	private final JMenuBar menuBar = new JMenuBar();
 	private final JMenu mnNewMenu = new JMenu("File");
 	private final JMenu mnNewMenu_1 = new JMenu("Edit");
@@ -221,6 +223,7 @@ public class GUI<E> implements CategoryListener {
 		control.initListener(this);
 		controller.setCanvas(canvas);
 		model.setConsole(console);
+		simMenu = new SimulationMenu(model, control);
 		initialize();
 		updateCategories(model.getCategories());
 	}
@@ -588,8 +591,6 @@ public class GUI<E> implements CategoryListener {
 		toolBarGraph.setFloatable(false);
 		scrollGraph.setRowHeaderView(graphLabel);
 		scrollGraph.setColumnHeaderView(toolBarGraph);
-		canvasSP.setViewportView(canvas);
-		canvasSP.setColumnHeaderView(new JMenu("Menü Für Modeling und Simulation hier hin :)"));
 
 		/***********************
 		 * HolonElement Table Actions
@@ -1449,7 +1450,9 @@ public class GUI<E> implements CategoryListener {
 		split_HolonEl_Pro.setBottomComponent(scrollProperties);
 		split_Graph_HolonEl.setDividerLocation(150);
 		split_Graph_HolonEl.setTopComponent(scrollGraph);
-		split_Graph_HolonEl.setBottomComponent(scrollElements);		
			
+		split_Graph_HolonEl.setBottomComponent(scrollElements);		
+		canvasSP.setViewportView(canvas);
+		canvasSP.setColumnHeaderView(simMenu);
			
 		tabbedPane.setBorder(null);
 		scrollProperties.setBorder(null);
 		scrollGraph.setBorder(null);

+ 28 - 0
src/ui/view/SimulationMenu.java

@@ -0,0 +1,28 @@
+package ui.view;
+
+import javax.swing.JButton;
+import javax.swing.JMenuBar;
+import javax.swing.JMenuItem;
+import javax.swing.JPanel;
+import javax.swing.JRadioButton;
+
+import ui.controller.Control;
+import ui.model.Model;
+import java.awt.BorderLayout;
+import java.awt.MenuItem;
+
+public class SimulationMenu extends JMenuBar {
+
+	private Model model;
+	private Control controller;
+
+	public SimulationMenu(Model mod, Control cont) {
+		super();
+		this.model = mod;
+		this.controller = cont;
+		
+		this.add(new JRadioButton("Simulate"));
+		this.add(new JButton("testbutton"));
+	}
+
+}