TheCloud/Digital
1
0
Fork 0
mirror of https://github.com/hneemann/Digital.git synced 2025-09-08 20:35:39 -04:00
Code Issues Packages Projects Releases Wiki Activity

reordered the menu entries in the simulation and analysis menu

Browse Source
This commit is contained in:
hneemann 2024-06-09 09:50:39 +02:00
parent e80dd4c475
commit bc25efa312
1 changed files with 56 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1141,31 +1141,6 @@ public final class Main extends JFrame implements ClosingWindowListener.ConfirmS
}
}.setToolTip(Lang.get("menu_runAllTests_tt")).setAccelerator("F11");
ToolTipAction speedTest = new ToolTipAction(Lang.get("menu_speedTest")) {
private final NumberFormat format = new DecimalFormat("0.0");
@Override
public void actionPerformed(ActionEvent e) {
try {
Model model = new ModelCreator(circuitComponent.getCircuit(), library).createModel(false);
try {
model.setWindowPosManager(windowPosManager);
SpeedTest speedTest = new SpeedTest(model);
String frequency = format.format(speedTest.calculate() / 1000);
circuitComponent.getCircuit().clearState();
SwingUtilities.invokeLater(() -> {
windowPosManager.closeAll();
JOptionPane.showMessageDialog(Main.this, Lang.get("msg_frequency_N", frequency));
});
} finally {
model.close();
}
} catch (Exception e1) {
showError(Lang.get("msg_speedTestError"), e1);
}
}
}.setToolTip(Lang.get("menu_speedTest_tt"));
showMeasurementDialog = new ToolTipAction(Lang.get("menu_showDataTable")) {
@Override
public void actionPerformed(ActionEvent actionEvent) {
@ -1201,33 +1176,6 @@ public final class Main extends JFrame implements ClosingWindowListener.ConfirmS
}
});
ToolTipAction stats = new ToolTipAction(Lang.get("menu_stats")) {
@Override
public void actionPerformed(ActionEvent actionEvent) {
try {
model = new ModelCreator(getCircuitComponent().getCircuit(), library).createModel(false);
Statistics stats = new Statistics(model);
new StatsDialog(Main.this, stats.getTableModel()).setVisible(true);
} catch (ElementNotFoundException | PinException | NodeException e) {
new ErrorMessage(Lang.get("msg_couldNotCreateStats")).addCause(e).show(Main.this);
}
}
}.setToolTip(Lang.get("menu_stats_tt"));
ToolTipAction pathLen = new ToolTipAction(Lang.get("menu_calcMaxPathLen")) {
@Override
public void actionPerformed(ActionEvent actionEvent) {
try {
Model model = new ModelCreator(getCircuitComponent().getCircuit(), library).createModel(false);
ModelAnalyser ma = new ModelAnalyser(model);
int depth = ma.calcMaxPathLen();
JOptionPane.showMessageDialog(Main.this, Lang.get("msg_maxPathLen", depth));
} catch (ElementNotFoundException | PinException | NodeException | AnalyseException | BacktrackException e) {
new ErrorMessage(Lang.get("msg_couldNotCalculateMaxPathLen")).addCause(e).show(Main.this);
}
}
}.setToolTip(Lang.get("menu_calcMaxPathLen_tt"));
JMenu run = new JMenu(Lang.get("menu_sim"));
menuBar.add(run);
run.add(showMeasurementDialog.createJMenuItem());
@ -1243,10 +1191,6 @@ public final class Main extends JFrame implements ClosingWindowListener.ConfirmS
run.addSeparator();
run.add(runTests.createJMenuItem());
run.add(runAllTests.createJMenuItem());
run.addSeparator();
run.add(speedTest.createJMenuItem());
run.add(stats.createJMenuItem());
run.add(pathLen.createJMenuItem());
toolBar.add(runModelState.setIndicator(runModelAction.createJButtonNoText()));
toolBar.add(runToBreakAction.createJButtonNoText());
@ -1335,6 +1279,8 @@ public final class Main extends JFrame implements ClosingWindowListener.ConfirmS
.setToolTip(Lang.get("menu_expression_tt"))
.createJMenuItem());
analyse.addSeparator();
analyse.add(new ToolTipAction(Lang.get("menu_fsm")) {
@Override
public void actionPerformed(ActionEvent e) {
@ -1356,6 +1302,60 @@ public final class Main extends JFrame implements ClosingWindowListener.ConfirmS
}
.setToolTip(Lang.get("menu_fsm_tt"))
.createJMenuItem());
analyse.addSeparator();
analyse.add(new ToolTipAction(Lang.get("menu_speedTest")) {
private final NumberFormat format = new DecimalFormat("0.0");
@Override
public void actionPerformed(ActionEvent e) {
try {
Model model = new ModelCreator(circuitComponent.getCircuit(), library).createModel(false);
try {
model.setWindowPosManager(windowPosManager);
SpeedTest speedTest = new SpeedTest(model);
String frequency = format.format(speedTest.calculate() / 1000);
circuitComponent.getCircuit().clearState();
SwingUtilities.invokeLater(() -> {
windowPosManager.closeAll();
JOptionPane.showMessageDialog(Main.this, Lang.get("msg_frequency_N", frequency));
});
} finally {
model.close();
}
} catch (Exception e1) {
showError(Lang.get("msg_speedTestError"), e1);
}
}
}.setToolTip(Lang.get("menu_speedTest_tt")).createJMenuItem());
analyse.add(new ToolTipAction(Lang.get("menu_stats")) {
@Override
public void actionPerformed(ActionEvent actionEvent) {
try {
model = new ModelCreator(getCircuitComponent().getCircuit(), library).createModel(false);
Statistics stats = new Statistics(model);
new StatsDialog(Main.this, stats.getTableModel()).setVisible(true);
} catch (ElementNotFoundException | PinException | NodeException e) {
new ErrorMessage(Lang.get("msg_couldNotCreateStats")).addCause(e).show(Main.this);
}
}
}.setToolTip(Lang.get("menu_stats_tt")).createJMenuItem());
analyse.add(new ToolTipAction(Lang.get("menu_calcMaxPathLen")) {
@Override
public void actionPerformed(ActionEvent actionEvent) {
try {
Model model = new ModelCreator(getCircuitComponent().getCircuit(), library).createModel(false);
ModelAnalyser ma = new ModelAnalyser(model);
int depth = ma.calcMaxPathLen();
JOptionPane.showMessageDialog(Main.this, Lang.get("msg_maxPathLen", depth));
} catch (ElementNotFoundException | PinException | NodeException | AnalyseException | BacktrackException e) {
new ErrorMessage(Lang.get("msg_couldNotCalculateMaxPathLen")).addCause(e).show(Main.this);
}
}
}.setToolTip(Lang.get("menu_calcMaxPathLen_tt")).createJMenuItem());
}
private void orderMeasurements() {