TheCloud/Digital
1
0
Fork 0
mirror of https://github.com/hneemann/Digital.git synced 2025-09-25 22:18:48 -04:00
Code Issues Packages Projects Releases Wiki Activity

more concise handling of model stopping

Browse Source
This commit is contained in:
hneemann 2017-05-31 18:29:45 +02:00
parent 214f002797
commit d6e1a3e510
4 changed files with 30 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/main/java/de/neemann/digital/gui/Main.java
View File

@ -565,7 +565,7 @@ public final class Main extends JFrame implements ClosingWindowListener.ConfirmS
@Override
public void actionPerformed(ActionEvent e) {
circuitComponent.actualToDefault();
stoppedState.enter();
ensureModelIsStopped();
}
}.setToolTip(Lang.get("menu_actualToDefault_tt"));
@ -573,7 +573,7 @@ public final class Main extends JFrame implements ClosingWindowListener.ConfirmS
@Override
public void actionPerformed(ActionEvent e) {
circuitComponent.restoreAllFuses();
stoppedState.enter();
ensureModelIsStopped();
}
}.setToolTip(Lang.get("menu_restoreAllFuses_tt"));
@ -740,7 +740,7 @@ public final class Main extends JFrame implements ClosingWindowListener.ConfirmS
circuitComponent.repaintNeeded();
statusLabel.setText(Lang.get("stat_clocks", i));
} catch (NodeException e1) {
stoppedState.enter();
ensureModelIsStopped();
new ErrorMessage(Lang.get("msg_fastRunError")).addCause(e1).show(Main.this);
}
}
@ -832,7 +832,7 @@ public final class Main extends JFrame implements ClosingWindowListener.ConfirmS
windowPosManager.register("testResult", new TestResultDialog(Main.this, tsl, circuitComponent.getCircuit(), library)).setVisible(true);
stoppedState.enter();
ensureModelIsStopped();
} catch (NodeException | ElementNotFoundException | PinException | TestingDataException | RuntimeException e1) {
showErrorAndStopModel(Lang.get("msg_runningTestError"), e1);
}
@ -853,7 +853,7 @@ public final class Main extends JFrame implements ClosingWindowListener.ConfirmS
Model model = new ModelCreator(circuitComponent.getCircuit(), library).createModel(false);
new TableDialog(Main.this, new ModelAnalyser(model).analyse(), library, shapeFactory, getBaseFileName())
.setVisible(true);
stoppedState.enter();
ensureModelIsStopped();
} catch (PinException | NodeException | AnalyseException | ElementNotFoundException | RuntimeException e1) {
showErrorAndStopModel(Lang.get("msg_analyseErr"), e1);
}
@ -867,7 +867,7 @@ public final class Main extends JFrame implements ClosingWindowListener.ConfirmS
public void actionPerformed(ActionEvent e) {
TruthTable tt = new TruthTable(3).addResult();
new TableDialog(Main.this, tt, library, shapeFactory, getBaseFileName()).setVisible(true);
stoppedState.enter();
ensureModelIsStopped();
}
}
.setToolTip(Lang.get("menu_synthesise_tt"))
@ -887,7 +887,7 @@ public final class Main extends JFrame implements ClosingWindowListener.ConfirmS
private void orderMeasurements() {
try {
Model m = new ModelCreator(circuitComponent.getCircuit(), library).createModel(false);
stoppedState.enter();
ensureModelIsStopped();
ArrayList<String> names = new ArrayList<>();
for (Signal s : m.getSignals())
names.add(s.getName());
@ -1030,8 +1030,9 @@ public final class Main extends JFrame implements ClosingWindowListener.ConfirmS
/**
* stops the model
*/
public void stopModel() {
stoppedState.enter();
public void ensureModelIsStopped() {
if (!stoppedState.isActive())
stoppedState.enter();
}
@ -1068,7 +1069,7 @@ public final class Main extends JFrame implements ClosingWindowListener.ConfirmS
if (setLibraryRoot) library.setRootFilePath(filename.getParentFile());
Circuit circuit = Circuit.loadCircuit(filename, shapeFactory);
circuitComponent.setCircuit(circuit);
stoppedState.enter();
ensureModelIsStopped();
windowPosManager.closeAll();
statusLabel.setText(" ");
} catch (Exception e) {
@ -1081,7 +1082,7 @@ public final class Main extends JFrame implements ClosingWindowListener.ConfirmS
private void saveFile(File filename, boolean toPrefs) {
try {
circuitComponent.getCircuit().save(filename);
stoppedState.enter();
ensureModelIsStopped();
setFilename(filename, toPrefs);
library.invalidateElement(filename);
@ -1112,6 +1113,7 @@ public final class Main extends JFrame implements ClosingWindowListener.ConfirmS
@Override
public void circuitHasChanged() {
ensureModelIsStopped();
if (!modifiedPrefixVisible)
setFilename(filename, false);
}
@ -1339,7 +1341,7 @@ public final class Main extends JFrame implements ClosingWindowListener.ConfirmS
@Override
public void stop() {
SwingUtilities.invokeLater(() -> {
stoppedState.enter();
ensureModelIsStopped();
circuitComponent.repaintNeeded();
});
}

2
src/main/java/de/neemann/digital/gui/components/CircuitComponent.java
View File

@ -595,7 +595,7 @@ public class CircuitComponent extends JComponent implements Circuit.ChangedListe
* @param element the element to insert
*/
public void setPartToInsert(VisualElement element) {
parent.stopModel();
parent.ensureModelIsStopped();
mouseInsertElement.activate(element);
Point point = MouseInfo.getPointerInfo().getLocation();
SwingUtilities.convertPointFromScreen(point, this);

6
src/main/java/de/neemann/digital/gui/state/State.java
View File

@ -82,4 +82,10 @@ public class State implements StateInterface {
return action;
}
/**
* @return true if this state is active
*/
public boolean isActive() {
return stateManager.isActive(this);
}
}

9
src/main/java/de/neemann/digital/gui/state/StateManager.java
View File

@ -39,4 +39,13 @@ public class StateManager {
return state;
}
/**
* Returns true if the given state is the active state
*
* @param state the state
* @return true if the given state is active
*/
public boolean isActive(State state) {
return actualState == state;
}
}