|
@@ -401,6 +401,7 @@ public class GUI implements CategoryListener {
|
|
public void actionPerformed(ActionEvent e) {
|
|
public void actionPerformed(ActionEvent e) {
|
|
try {
|
|
try {
|
|
controller.loadAutoSave(controller.getUndoSave());
|
|
controller.loadAutoSave(controller.getUndoSave());
|
|
|
|
+ controller.calculateStateForCurrentTimeStep();
|
|
canvas.repaint();
|
|
canvas.repaint();
|
|
unitGraph.update(model.getObjectsOnCanvas());
|
|
unitGraph.update(model.getObjectsOnCanvas());
|
|
updateUpperNodes();
|
|
updateUpperNodes();
|
|
@@ -420,6 +421,7 @@ public class GUI implements CategoryListener {
|
|
public void actionPerformed(ActionEvent e) {
|
|
public void actionPerformed(ActionEvent e) {
|
|
try {
|
|
try {
|
|
controller.loadAutoSave(controller.getRedoSave());
|
|
controller.loadAutoSave(controller.getRedoSave());
|
|
|
|
+ controller.calculateStateForCurrentTimeStep();
|
|
canvas.repaint();
|
|
canvas.repaint();
|
|
unitGraph.update(model.getObjectsOnCanvas());
|
|
unitGraph.update(model.getObjectsOnCanvas());
|
|
updateUpperNodes();
|
|
updateUpperNodes();
|
|
@@ -632,10 +634,12 @@ public class GUI implements CategoryListener {
|
|
canvasOrUpperNodeCanvas
|
|
canvasOrUpperNodeCanvas
|
|
.getMousePosition());
|
|
.getMousePosition());
|
|
unitGraph.update(model.getSelectedCpsObjects());
|
|
unitGraph.update(model.getSelectedCpsObjects());
|
|
|
|
+ controller.calculateStateForCurrentTimeStep();
|
|
scrollPane.getViewport().getComponent(0).repaint();
|
|
scrollPane.getViewport().getComponent(0).repaint();
|
|
} else {
|
|
} else {
|
|
controller.paste(null, canvas.getMousePosition());
|
|
controller.paste(null, canvas.getMousePosition());
|
|
unitGraph.update(model.getSelectedCpsObjects());
|
|
unitGraph.update(model.getSelectedCpsObjects());
|
|
|
|
+ controller.calculateStateForCurrentTimeStep();
|
|
canvas.repaint();
|
|
canvas.repaint();
|
|
}
|
|
}
|
|
} catch (HeadlessException | JsonParseException
|
|
} catch (HeadlessException | JsonParseException
|
|
@@ -664,13 +668,16 @@ public class GUI implements CategoryListener {
|
|
if (scrollPane.getViewport().getComponent(0) instanceof UpperNodeCanvas) {
|
|
if (scrollPane.getViewport().getComponent(0) instanceof UpperNodeCanvas) {
|
|
controller.cut(((UpperNodeCanvas) scrollPane
|
|
controller.cut(((UpperNodeCanvas) scrollPane
|
|
.getViewport().getComponent(0)).upperNode);
|
|
.getViewport().getComponent(0)).upperNode);
|
|
|
|
+ controller.calculateStateForCurrentTimeStep();
|
|
|
|
+ scrollPane.getViewport().getComponent(0).repaint();
|
|
} else {
|
|
} else {
|
|
controller.cut(null);
|
|
controller.cut(null);
|
|
|
|
+ controller.calculateStateForCurrentTimeStep();
|
|
|
|
+ canvas.repaint();
|
|
}
|
|
}
|
|
if (!model.getClipboradObjects().isEmpty()) {
|
|
if (!model.getClipboradObjects().isEmpty()) {
|
|
canvas.itemPaste.setEnabled(true);
|
|
canvas.itemPaste.setEnabled(true);
|
|
}
|
|
}
|
|
- canvas.repaint();
|
|
|
|
}
|
|
}
|
|
}
|
|
}
|
|
};
|
|
};
|