|
@@ -121,8 +121,6 @@ public class GUI implements CategoryListener {
|
|
|
private final JMenuItem mntmSplitView = new JMenuItem("Split View");
|
|
|
private final JSplitPane splitPane = new JSplitPane();
|
|
|
private final JSplitPane splitPane1 = new JSplitPane();
|
|
|
- private final JSplitPane splitPaneCanvasConsole = new JSplitPane(
|
|
|
- JSplitPane.VERTICAL_SPLIT);
|
|
|
// the tabbed canvas containing the different sub-net tabs of the grid (Main
|
|
|
// Grid + Nodes of Nodes)
|
|
|
|
|
@@ -237,7 +235,6 @@ public class GUI implements CategoryListener {
|
|
|
private final JMenuItem germanBtn = new JMenuItem("DE");
|
|
|
private final JMenuItem czechBtn = new JMenuItem("CZ");
|
|
|
private final JMenuItem chineseBtn = new JMenuItem("ZH");
|
|
|
- private final Console console = new Console();
|
|
|
private final MyCanvas canvas;
|
|
|
private final HolonCanvas holonCanvas;
|
|
|
private final UnitGraph unitGraph;
|
|
@@ -329,7 +326,6 @@ public class GUI implements CategoryListener {
|
|
|
control.initListener(this);
|
|
|
controller.setCanvas(canvas);
|
|
|
control.setGui(this);
|
|
|
- model.setConsole(console);
|
|
|
model.setTableProperties(tableProperties);
|
|
|
algorithmMenu = new AlgorithmMenu(model, control, this);
|
|
|
initialize();
|
|
@@ -368,7 +364,7 @@ public class GUI implements CategoryListener {
|
|
|
public void windowClosing(java.awt.event.WindowEvent windowEvent) {
|
|
|
if (JOptionPane.showConfirmDialog(frmCyberPhysical,
|
|
|
Languages.getLanguage()[88],
|
|
|
- "Cyber Physical Systems Model",
|
|
|
+ "HOLEG",
|
|
|
JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE) == JOptionPane.YES_OPTION) {
|
|
|
controller.deleteDirectory(new File(System
|
|
|
.getProperty("user.home")
|
|
@@ -801,10 +797,7 @@ public class GUI implements CategoryListener {
|
|
|
|
|
|
tree.repaint();
|
|
|
});
|
|
|
- mnNewMenuOptions.add(consoleLogCheckBox);
|
|
|
- consoleLogCheckBox.setSelected(true);
|
|
|
- consoleLogCheckBox.addActionListener(arg0 -> controller
|
|
|
- .setShowConsoleLog(consoleLogCheckBox.isSelected()));
|
|
|
+
|
|
|
|
|
|
mnNewMenuOptions.add(useFlexibleDevicesCheckBox);
|
|
|
useFlexibleDevicesCheckBox.setSelected(true);
|
|
@@ -926,42 +919,31 @@ public class GUI implements CategoryListener {
|
|
|
// Split View
|
|
|
mntmSplitView
|
|
|
.addActionListener(actionEvent -> {
|
|
|
- if (splitPaneCanvasConsole.getLeftComponent() instanceof JSplitPane) {
|
|
|
- initSplit = true;
|
|
|
- Component tempC = tabbedPaneSplit
|
|
|
- .getSelectedComponent();
|
|
|
- tabbedPaneOriginal.setComponentAt(
|
|
|
- tabbedPaneSplit.getSelectedIndex(), tempC);
|
|
|
- tabbedPaneSplit.removeAll();
|
|
|
- splitPaneCanvasConsole
|
|
|
- .setLeftComponent(tabbedPaneOriginal);
|
|
|
+ for (int i = 0; i < tabbedPaneOriginal.getTabCount(); i++) {
|
|
|
+ // add outer tabs
|
|
|
+ // (inner tabs are added by tabbedPaneSplit
|
|
|
+ // changelistener)
|
|
|
+ tabbedPaneSplit.addTab(
|
|
|
+ tabbedPaneOriginal.getTitleAt(i), null);
|
|
|
+ }
|
|
|
+ if (tabbedPaneOriginal.getSelectedComponent() == statScrollPane) {
|
|
|
+ tabbedPaneOriginal.setComponentAt(0, null);
|
|
|
+ tabbedPaneSplit.setComponentAt(0, canvasSP);
|
|
|
+ tabbedPaneSplit.setSelectedIndex(0);
|
|
|
} else {
|
|
|
- for (int i = 0; i < tabbedPaneOriginal.getTabCount(); i++) {
|
|
|
- // add outer tabs
|
|
|
- // (inner tabs are added by tabbedPaneSplit
|
|
|
- // changelistener)
|
|
|
- tabbedPaneSplit.addTab(
|
|
|
- tabbedPaneOriginal.getTitleAt(i), null);
|
|
|
- }
|
|
|
- if (tabbedPaneOriginal.getSelectedComponent() == statScrollPane) {
|
|
|
- tabbedPaneOriginal.setComponentAt(0, null);
|
|
|
- tabbedPaneSplit.setComponentAt(0, canvasSP);
|
|
|
- tabbedPaneSplit.setSelectedIndex(0);
|
|
|
- } else {
|
|
|
- tabbedPaneOriginal.setComponentAt(1, null);
|
|
|
- tabbedPaneSplit.setComponentAt(1, statScrollPane);
|
|
|
- tabbedPaneSplit.setSelectedIndex(1);
|
|
|
- }
|
|
|
- tempSplit = new JSplitPane();
|
|
|
- tempSplit.setBorder(null);
|
|
|
- tempSplit.setRightComponent(tabbedPaneSplit);
|
|
|
- tempSplit.setLeftComponent(tabbedPaneOriginal);
|
|
|
- tempSplit.setDividerLocation(tabbedPaneOriginal
|
|
|
- .getWidth() / 2);
|
|
|
- tempSplit.setResizeWeight(0.9);
|
|
|
- splitPaneCanvasConsole.setLeftComponent(tempSplit);
|
|
|
- initSplit = false;
|
|
|
+ tabbedPaneOriginal.setComponentAt(1, null);
|
|
|
+ tabbedPaneSplit.setComponentAt(1, statScrollPane);
|
|
|
+ tabbedPaneSplit.setSelectedIndex(1);
|
|
|
}
|
|
|
+ tempSplit = new JSplitPane();
|
|
|
+ tempSplit.setBorder(null);
|
|
|
+ tempSplit.setRightComponent(tabbedPaneSplit);
|
|
|
+ tempSplit.setLeftComponent(tabbedPaneOriginal);
|
|
|
+ tempSplit.setDividerLocation(tabbedPaneOriginal
|
|
|
+ .getWidth() / 2);
|
|
|
+ tempSplit.setResizeWeight(0.9);
|
|
|
+ initSplit = false;
|
|
|
+
|
|
|
contentPane.updateUI();
|
|
|
});
|
|
|
|
|
@@ -2440,11 +2422,8 @@ public class GUI implements CategoryListener {
|
|
|
splitPane.setRightComponent(splitPane1);
|
|
|
splitPane.setDividerLocation(200);
|
|
|
splitPane1.setDividerLocation(500);
|
|
|
- splitPaneCanvasConsole.setDividerLocation(550);
|
|
|
- splitPaneCanvasConsole.setResizeWeight(0.9);
|
|
|
|
|
|
splitPane.setLeftComponent(scrollPane1);
|
|
|
- splitPaneCanvasConsole.setLeftComponent(tabbedPaneOriginal);
|
|
|
tabbedPaneOriginal.addTab("View", tabbedPaneInnerOriginal);
|
|
|
|
|
|
|
|
@@ -2461,9 +2440,7 @@ public class GUI implements CategoryListener {
|
|
|
controller.setFlexiblePane(flexPane);
|
|
|
controller.getModel().getObjectListeners().add(flexPane);
|
|
|
tabbedPaneOriginal.addTab("Flexibility", flexPane);
|
|
|
-
|
|
|
- splitPaneCanvasConsole.setRightComponent(console);
|
|
|
- splitPane1.setLeftComponent(splitPaneCanvasConsole);
|
|
|
+ splitPane1.setLeftComponent(tabbedPaneOriginal);
|
|
|
splitPane1.setRightComponent(splitHolonElPro);
|
|
|
|
|
|
splitPane1.setResizeWeight(0.9);
|
|
@@ -2486,7 +2463,6 @@ public class GUI implements CategoryListener {
|
|
|
scrollElements.setBorder(null);
|
|
|
splitPane.setBorder(null);
|
|
|
splitPane1.setBorder(null);
|
|
|
- splitPaneCanvasConsole.setBorder(null);
|
|
|
splitHolonElPro.setBorder(null);
|
|
|
splitGraphHolonEl.setBorder(null);
|
|
|
panelHolonEl.setBorder(null);
|
|
@@ -2496,10 +2472,7 @@ public class GUI implements CategoryListener {
|
|
|
|
|
|
frmCyberPhysical.getContentPane().add(timePanel, BorderLayout.SOUTH);
|
|
|
|
|
|
- MouseAdapter focusCanvasAdapter = new FocusCanvasMouseAdapter();
|
|
|
- model.getTableHolonElement().addMouseListener(focusCanvasAdapter);
|
|
|
- tableProperties.addMouseListener(focusCanvasAdapter);
|
|
|
- console.getConsoleText().addMouseListener(focusCanvasAdapter);
|
|
|
+
|
|
|
|
|
|
try {
|
|
|
controller.loadAutoSave(System.getProperty("user.home")
|