|
@@ -98,6 +98,7 @@ public class GUI<E> implements CategoryListener {
|
|
|
private final JSplitPane splitPane_1 = new JSplitPane();
|
|
|
private final JSplitPane splitPane_tree_console = new JSplitPane(JSplitPane.VERTICAL_SPLIT);
|
|
|
|
|
|
+ private final JScrollPane canvasSP = new JScrollPane();
|
|
|
private final JScrollPane scrollPane_1 = new JScrollPane();
|
|
|
private final JTabbedPane tabbedPane = new JTabbedPane(JTabbedPane.TOP);
|
|
|
private final JScrollPane SimulationPane = new JScrollPane();
|
|
@@ -537,19 +538,7 @@ public class GUI<E> implements CategoryListener {
|
|
|
|
|
|
canvas.setBackground(Color.WHITE);
|
|
|
canvas.setPreferredSize(new Dimension(1000, 1000));
|
|
|
- JScrollPane canvasSP = new JScrollPane(canvas);
|
|
|
- canvasSP.setBorder(null);
|
|
|
-
|
|
|
- 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("Simulation",
|
|
|
- new ImageIcon(new ImageIcon(this.getClass().getResource("/Images/Dummy_House.png")).getImage()
|
|
|
- .getScaledInstance(30, 30, Image.SCALE_SMOOTH)),
|
|
|
- SimulationPane, "Simulate the CPS");
|
|
|
- dtrpnHereWillBe.setText("Here will be the Simulation");
|
|
|
-
|
|
|
- SimulationPane.setViewportView(dtrpnHereWillBe);
|
|
|
+
|
|
|
|
|
|
/********************
|
|
|
* RIGHT CONTAINER (INFORMATION)
|
|
@@ -600,6 +589,8 @@ public class GUI<E> implements CategoryListener {
|
|
|
toolBarGraph.setFloatable(false);
|
|
|
scrollGraph.setRowHeaderView(graphLabel);
|
|
|
scrollGraph.setColumnHeaderView(toolBarGraph);
|
|
|
+ canvasSP.setViewportView(canvas);
|
|
|
+ canvasSP.setColumnHeaderView(new JMenu());
|
|
|
|
|
|
/***********************
|
|
|
* HolonElement Table Actions
|
|
@@ -1451,7 +1442,7 @@ public class GUI<E> implements CategoryListener {
|
|
|
splitPane.setLeftComponent(splitPane_tree_console);
|
|
|
splitPane_tree_console.setLeftComponent(scrollPane_1);
|
|
|
splitPane_tree_console.setRightComponent(console);
|
|
|
- splitPane_1.setLeftComponent(tabbedPane);
|
|
|
+ splitPane_1.setLeftComponent(canvasSP);
|
|
|
splitPane_1.setRightComponent(split_HolonEl_Pro);
|
|
|
|
|
|
split_HolonEl_Pro.setDividerLocation(400);
|
|
@@ -1459,8 +1450,7 @@ 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);
|
|
|
tabbedPane.setBorder(null);
|
|
|
scrollProperties.setBorder(null);
|
|
|
scrollGraph.setBorder(null);
|