TheCloud/Digital
1
0
Fork 0
mirror of https://github.com/hneemann/Digital.git synced 2025-09-14 15:26:52 -04:00
Code Issues Packages Projects Releases Wiki Activity

improved error handling

Browse Source
This commit is contained in:
hneemann 2016-04-05 15:00:54 +02:00
parent f4393f91d9
commit 6e09ffaa1b
4 changed files with 58 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/de/neemann/digital/core/Model.java
View File

@ -165,7 +165,7 @@ public class Model {
int counter = 0;
while (needsUpdate()) {
if (counter++ > MAX_COUNTER) {
throw new NodeException(Lang.get("err_seemsToOscillate"), nodesToUpdateNext.get(0));
throw new NodeException(Lang.get("err_seemsToOscillate")).addNodes(nodesToUpdateNext);
}
doMicroStep(noise);
}
@ -236,7 +236,7 @@ public class Model {
}
lastIn = brIn;
}
throw new NodeException(Lang.get("err_breakTimeOut", aBreak.getCycles()), null, brVal);
throw new NodeException(Lang.get("err_breakTimeOut", aBreak.getCycles()), brVal);
}
/**

26
src/main/java/de/neemann/digital/core/NodeException.java
View File

@ -7,23 +7,30 @@ import java.util.Collection;
* @author hneemann
*/
public class NodeException extends Exception {
private final Node node;
private final ArrayList<Node> nodes;
private final ObservableValue[] values;
public NodeException(String message, ObservableValue... values) {
this(message, null, values);
}
public NodeException(String message, Node node, ObservableValue... values) {
super(message);
this.node = node;
this.nodes = new ArrayList<>();
if (node != null)
nodes.add(node);
this.values = values;
}
public NodeException addNodes(Collection<Node> nodesToAdd) {
nodes.addAll(nodesToAdd);
return this;
}
public ObservableValue[] getValues() {
return values;
}
public Node getNode() {
return node;
}
@Override
public String getMessage() {
if (values == null || values.length == 0)
@ -44,11 +51,6 @@ public class NodeException extends Exception {
}
public Collection<Node> getNodes() {
if (node == null)
return null;
ArrayList<Node> list = new ArrayList<>();
list.add(node);
return list;
return nodes;
}
}

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

@ -45,7 +45,7 @@ public class Main extends JFrame implements ClosingWindowListener.ConfirmSave {
private static final Icon ICON_STEP = IconCreator.create("step.gif");
private static final Icon ICON_ELEMENT = IconCreator.create("element.gif");
private static final Icon ICON_SELECT = IconCreator.create("Select24.gif");
private static final Icon ICON_WIRE = IconCreator.create("wire.gif");
// private static final Icon ICON_WIRE = IconCreator.create("wire.gif");
private static final Icon ICON_NEW = IconCreator.create("New24.gif");
private static final Icon ICON_OPEN = IconCreator.create("Open24.gif");
private static final Icon ICON_OPEN_WIN = IconCreator.create("OpenNew24.gif");
@ -232,7 +232,6 @@ public class Main extends JFrame implements ClosingWindowListener.ConfirmSave {
}.setToolTip(Lang.get("menu_orderMeasurements_tt"));
ToolTipAction editAttributes = new ToolTipAction(Lang.get("menu_editAttributes")) {
@Override
public void actionPerformed(ActionEvent e) {
@ -362,22 +361,23 @@ public class Main extends JFrame implements ClosingWindowListener.ConfirmSave {
@Override
public void enter() {
super.enter();
createAndStartModel(runClock.isSelected(), ModelEvent.Event.STEP);
circuitComponent.setManualChangeObserver(new FullStepObserver(model));
if (createAndStartModel(runClock.isSelected(), ModelEvent.Event.STEP))
circuitComponent.setManualChangeObserver(new FullStepObserver(model));
}
});
runModelMicroState = stateManager.register(new State() {
@Override
public void enter() {
super.enter();
createAndStartModel(false, ModelEvent.Event.MICROSTEP);
circuitComponent.setManualChangeObserver(new MicroStepObserver(model));
if (createAndStartModel(false, ModelEvent.Event.MICROSTEP))
circuitComponent.setManualChangeObserver(new MicroStepObserver(model));
}
});
}
/**
* Starts the main app
*
* @param args the arguments
*/
public static void main(String[] args) {
@ -393,7 +393,7 @@ public class Main extends JFrame implements ClosingWindowListener.ConfirmSave {
model = null;
}
private void setModelDescription(ModelDescription md, boolean runClock) throws NodeException, PinException {
private void setModelDescription(ModelDescription md) throws NodeException, PinException {
modelDescription = md;
if (model != null)
@ -403,12 +403,12 @@ public class Main extends JFrame implements ClosingWindowListener.ConfirmSave {
}
private void createAndStartModel(boolean runClock, ModelEvent.Event updateEvent) {
private boolean createAndStartModel(boolean runClock, ModelEvent.Event updateEvent) {
try {
circuitComponent.removeHighLighted();
circuitComponent.setModeAndReset(CircuitComponent.Mode.running);
setModelDescription(new ModelDescription(circuitComponent.getCircuit(), library), runClock);
setModelDescription(new ModelDescription(circuitComponent.getCircuit(), library));
if (runClock) {
// if clock is running, enable automatic update of gui
GuiModelObserver gmo = new GuiModelObserver(circuitComponent, updateEvent);
@ -425,14 +425,12 @@ public class Main extends JFrame implements ClosingWindowListener.ConfirmSave {
runToBreak.setEnabled(!runClock && model.isFastRunModel());
if (showProbes.isSelected())
new ProbeDialog(this, model, updateEvent).setVisible(true);
if (showGraph.isSelected())
new DataSetDialog(this, model, updateEvent).setVisible(true);
if (showListing.isSelected())
for (ROM rom : model.getRoms())
try {
@ -444,17 +442,16 @@ public class Main extends JFrame implements ClosingWindowListener.ConfirmSave {
model.init();
return true;
} catch (NodeException e) {
if (modelDescription != null) {
if (e.getNodes() != null)
modelDescription.addNodeElementsTo(e.getNodes(), circuitComponent.getHighLighted());
else
circuitComponent.addHighLightedWires(e.getValues());
circuitComponent.repaint();
}
SwingUtilities.invokeLater(new ErrorMessage(Lang.get("msg_errorCreatingModel")).addCause(e).setComponent(Main.this));
circuitComponent.setModeAndReset(CircuitComponent.Mode.part);
showSwingError(Lang.get("msg_errorCreatingModel"), e);
} catch (PinException e) {
if (modelDescription != null) {
circuitComponent.addHighLighted(e.getVisualElement());
@ -462,9 +459,18 @@ public class Main extends JFrame implements ClosingWindowListener.ConfirmSave {
circuitComponent.addHighLighted(e.getNet().getWires());
circuitComponent.repaint();
}
SwingUtilities.invokeLater(new ErrorMessage(Lang.get("msg_errorCreatingModel")).addCause(e).setComponent(Main.this));
circuitComponent.setModeAndReset(CircuitComponent.Mode.part);
showSwingError(Lang.get("msg_errorCreatingModel"), e);
} catch (RuntimeException e) {
showSwingError(Lang.get("msg_errorCreatingModel"), e);
}
return false;
}
private void showSwingError(String message, Throwable cause) {
SwingUtilities.invokeLater(() -> {
new ErrorMessage(message).addCause(cause).show(Main.this);
elementState.activate();
});
}
private static JFileChooser getjFileChooser(File filename) {
@ -549,10 +555,14 @@ public class Main extends JFrame implements ClosingWindowListener.ConfirmSave {
try {
model.doStep();
circuitComponent.repaint();
} catch (Exception e) {
SwingUtilities.invokeLater(
new ErrorMessage(Lang.get("msg_errorCalculatingStep")).addCause(e).setComponent(Main.this)
);
} catch (NodeException e) {
if (modelDescription != null) {
modelDescription.addNodeElementsTo(e.getNodes(), circuitComponent.getHighLighted());
circuitComponent.repaint();
}
showSwingError(Lang.get("msg_errorCalculatingStep"), e);
} catch (RuntimeException e) {
showSwingError(Lang.get("msg_errorCalculatingStep"), e);
}
}
}

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

@ -22,7 +22,10 @@ import de.neemann.gui.ToolTipAction;
import javax.swing.*;
import java.awt.*;
import java.awt.event.*;
import java.awt.event.ActionEvent;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import java.awt.event.MouseMotionListener;
import java.awt.geom.AffineTransform;
import java.awt.geom.NoninvertibleTransformException;
import java.awt.geom.Point2D;
@ -61,19 +64,14 @@ public class CircuitComponent extends JComponent {
setFocusable(true);
addMouseWheelListener(new MouseWheelListener() {
@Override
public void mouseWheelMoved(MouseWheelEvent e) {
Vector pos = getPosVector(e);
double f = Math.pow(0.9, e.getWheelRotation());
transform.translate(pos.x, pos.y);
transform.scale(f, f);
transform.translate(-pos.x, -pos.y);
repaint();
}
}
);
addMouseWheelListener(e -> {
Vector pos = getPosVector(e);
double f = Math.pow(0.9, e.getWheelRotation());
transform.translate(pos.x, pos.y);
transform.scale(f, f);
transform.translate(-pos.x, -pos.y);
repaint();
});
}
public ToolTipAction getDeleteAction() {