|
@@ -402,7 +402,7 @@ public class GUI implements CategoryListener {
|
|
|
controller.loadAutoSave(controller.getUndoSave());
|
|
|
closeInvalidUpperNodeTabs();
|
|
|
|
|
|
- controller.calculateStateForCurrentTimeStep();
|
|
|
+ controller.calculateStateAndVisualForCurrentTimeStep();
|
|
|
canvas.repaint();
|
|
|
unitGraph.update(model.getObjectsOnCanvas());
|
|
|
updateUpperNodes();
|
|
@@ -425,7 +425,7 @@ public class GUI implements CategoryListener {
|
|
|
|
|
|
closeInvalidUpperNodeTabs();
|
|
|
|
|
|
- controller.calculateStateForCurrentTimeStep();
|
|
|
+ controller.calculateStateAndVisualForCurrentTimeStep();
|
|
|
canvas.repaint();
|
|
|
unitGraph.update(model.getObjectsOnCanvas());
|
|
|
updateUpperNodes();
|
|
@@ -555,7 +555,7 @@ public class GUI implements CategoryListener {
|
|
|
// recalculate net if a producer was deleted
|
|
|
if (wasProducerDeleted) {
|
|
|
controller.resetSimulation();
|
|
|
- controller.calculateStateForCurrentTimeStep();
|
|
|
+ controller.calculateStateAndVisualForCurrentTimeStep();
|
|
|
}
|
|
|
|
|
|
model.getSelectedCpsObjects().clear();
|
|
@@ -632,12 +632,12 @@ public class GUI implements CategoryListener {
|
|
|
canvasOrUpperNodeCanvas
|
|
|
.getMousePosition());
|
|
|
unitGraph.update(model.getSelectedCpsObjects());
|
|
|
- controller.calculateStateForCurrentTimeStep();
|
|
|
+ controller.calculateStateAndVisualForCurrentTimeStep();
|
|
|
scrollPane.getViewport().getComponent(0).repaint();
|
|
|
} else {
|
|
|
controller.paste(null, canvas.getMousePosition());
|
|
|
unitGraph.update(model.getSelectedCpsObjects());
|
|
|
- controller.calculateStateForCurrentTimeStep();
|
|
|
+ controller.calculateStateAndVisualForCurrentTimeStep();
|
|
|
canvas.repaint();
|
|
|
}
|
|
|
} catch (HeadlessException | JsonParseException
|
|
@@ -666,11 +666,11 @@ public class GUI implements CategoryListener {
|
|
|
if (scrollPane.getViewport().getComponent(0) instanceof UpperNodeCanvas) {
|
|
|
controller.cut(((UpperNodeCanvas) scrollPane
|
|
|
.getViewport().getComponent(0)).upperNode);
|
|
|
- controller.calculateStateForCurrentTimeStep();
|
|
|
+ controller.calculateStateAndVisualForCurrentTimeStep();
|
|
|
scrollPane.getViewport().getComponent(0).repaint();
|
|
|
} else {
|
|
|
controller.cut(null);
|
|
|
- controller.calculateStateForCurrentTimeStep();
|
|
|
+ controller.calculateStateAndVisualForCurrentTimeStep();
|
|
|
canvas.repaint();
|
|
|
}
|
|
|
if (!model.getClipboradObjects().isEmpty()) {
|
|
@@ -813,7 +813,7 @@ public class GUI implements CategoryListener {
|
|
|
mntmFairMinFirst.setForeground(Color.BLUE);
|
|
|
mntmFairAlleEqual.setForeground(mnFairnessModel
|
|
|
.getForeground());
|
|
|
- controller.calculateStateForCurrentTimeStep();
|
|
|
+ controller.calculateStateAndVisualForCurrentTimeStep();
|
|
|
// Update UpperNodes
|
|
|
Component canvasOrUpperNodeCanvas = getScrollPaneFromTabbedPane()
|
|
|
.getViewport().getComponent(0);
|
|
@@ -831,7 +831,7 @@ public class GUI implements CategoryListener {
|
|
|
controller.setFairnessModel(FairnessModel.AllEqual);
|
|
|
mntmFairAlleEqual.setForeground(Color.BLUE);
|
|
|
mntmFairMinFirst.setForeground(mnFairnessModel.getForeground());
|
|
|
- controller.calculateStateForCurrentTimeStep();
|
|
|
+ controller.calculateStateAndVisualForCurrentTimeStep();
|
|
|
// Update UpperNodes
|
|
|
Component canvasOrUpperNodeCanvas = getScrollPaneFromTabbedPane()
|
|
|
.getViewport().getComponent(0);
|
|
@@ -1202,7 +1202,7 @@ public class GUI implements CategoryListener {
|
|
|
ele.getAmount(), ele.getEnergyPerElement(),
|
|
|
ele.getId());
|
|
|
}
|
|
|
- controller.calculateStateForTimeStep(model
|
|
|
+ controller.calculateStateAndVisualForTimeStep(model
|
|
|
.getCurIteration());
|
|
|
triggerUpdateController(null);
|
|
|
contentPane.updateUI();
|
|
@@ -1228,7 +1228,7 @@ public class GUI implements CategoryListener {
|
|
|
for (HolonElement e : selectedElements) {
|
|
|
controller.deleteElementCanvas(obj.getId(),
|
|
|
e.getId());
|
|
|
- controller.calculateStateForTimeStep(model
|
|
|
+ controller.calculateStateAndVisualForTimeStep(model
|
|
|
.getCurIteration());
|
|
|
triggerUpdateController(null);
|
|
|
contentPane.updateUI();
|
|
@@ -1519,7 +1519,7 @@ public class GUI implements CategoryListener {
|
|
|
selectedValueBY);
|
|
|
}
|
|
|
}
|
|
|
- controller.calculateStateForTimeStep(model
|
|
|
+ controller.calculateStateAndVisualForTimeStep(model
|
|
|
.getCurIteration());
|
|
|
model.getSingleTable().fireTableDataChanged();
|
|
|
triggerUpdateController(null);
|
|
@@ -1855,7 +1855,7 @@ public class GUI implements CategoryListener {
|
|
|
*/
|
|
|
unc.mayBeReplaced = null;
|
|
|
unc.invalidate();
|
|
|
- controller.calculateStateForCurrentTimeStep();
|
|
|
+ controller.calculateStateAndVisualForCurrentTimeStep();
|
|
|
unc.repaint();
|
|
|
unc.setXY((int) canvas.getMousePosition()
|
|
|
.getX(), (int) canvas
|
|
@@ -1898,7 +1898,7 @@ public class GUI implements CategoryListener {
|
|
|
(int) canvas.getMousePosition().getY());
|
|
|
canvas.repaint();
|
|
|
}
|
|
|
- controller.calculateStateForCurrentTimeStep();
|
|
|
+ controller.calculateStateAndVisualForCurrentTimeStep();
|
|
|
contentPane.updateUI();
|
|
|
dragging = false;
|
|
|
}
|
|
@@ -2346,7 +2346,7 @@ public class GUI implements CategoryListener {
|
|
|
|
|
|
closeInvalidUpperNodeTabs();
|
|
|
|
|
|
- controller.calculateStateForCurrentTimeStep();
|
|
|
+ controller.calculateStateAndVisualForCurrentTimeStep();
|
|
|
canvas.repaint();
|
|
|
|
|
|
repaintGraphAfterUndoRedo();
|
|
@@ -2369,7 +2369,7 @@ public class GUI implements CategoryListener {
|
|
|
|
|
|
closeInvalidUpperNodeTabs();
|
|
|
|
|
|
- controller.calculateStateForCurrentTimeStep();
|
|
|
+ controller.calculateStateAndVisualForCurrentTimeStep();
|
|
|
canvas.repaint();
|
|
|
|
|
|
repaintGraphAfterUndoRedo();
|
|
@@ -2385,7 +2385,7 @@ public class GUI implements CategoryListener {
|
|
|
timePanel.getTimeSlider()
|
|
|
.addChangeListener(changeEvent -> {
|
|
|
//TimeSliderChanged event
|
|
|
- controller.calculateStateForTimeStep(timePanel.getTimeSlider().getValue());
|
|
|
+ controller.calculateStateAndVisualForTimeStep(timePanel.getTimeSlider().getValue());
|
|
|
unitGraph.repaint();
|
|
|
if (model.getIsSimRunning()) {
|
|
|
controller.runAlgorithm(model, controller);
|
|
@@ -3150,4 +3150,21 @@ public class GUI implements CategoryListener {
|
|
|
public void repaintCanvas() {
|
|
|
tabbedPaneInnerOriginal.repaint();
|
|
|
}
|
|
|
+
|
|
|
+ /**
|
|
|
+ * Class should be reworked as soon as possible!
|
|
|
+ * @param state
|
|
|
+ */
|
|
|
+ public void guiDisable(boolean state) {
|
|
|
+ canvas.diabled = state;
|
|
|
+ for (int i = 1; i < tabbedPaneInnerOriginal.getTabCount(); i++) {
|
|
|
+ JScrollPane scrollPaneOriginal = (JScrollPane) tabbedPaneInnerOriginal
|
|
|
+ .getComponentAt(i);
|
|
|
+ if (((UpperNodeCanvas) scrollPaneOriginal.getViewport()
|
|
|
+ .getComponent(0)).upperNode != null) {
|
|
|
+ ((UpperNodeCanvas) scrollPaneOriginal.getViewport()
|
|
|
+ .getComponent(0)).disable = state;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|