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

Fixed a bug concerning error visualization.

Browse Source
This commit is contained in:
hneemann 2016-04-13 21:29:22 +02:00
parent 8a56960590
commit d7bb330446
2 changed files with 70 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

115
src/main/dig/splitter.dig
View File

@ -7,73 +7,96 @@
<elementAttributes> <elementAttributes>
<entry> <entry>
<string>Input Splitting</string> <string>Input Splitting</string>
<string>1,1,2*2</string> <string>1,1,1</string>
</entry> </entry>
<entry> <entry>
<string>Output Splitting</string> <string>Output Splitting</string>
<string>4,2</string> <string>3</string>
</entry> </entry>
</elementAttributes> </elementAttributes>
<pos x="300" y="200"/> <pos x="180" y="160"/>
<rotate>0</rotate>
</visualElement>
<visualElement>
<elementName>In</elementName>
<elementAttributes/>
<pos x="140" y="180"/>
<rotate>0</rotate>
</visualElement>
<visualElement>
<elementName>In</elementName>
<elementAttributes/>
<pos x="140" y="140"/>
<rotate>0</rotate>
</visualElement>
<visualElement>
<elementName>In</elementName>
<elementAttributes/>
<pos x="140" y="220"/>
<rotate>0</rotate> <rotate>0</rotate>
</visualElement> </visualElement>
<visualElement> <visualElement>
<elementName>Splitter</elementName> <elementName>Splitter</elementName>
<elementAttributes> <elementAttributes>
<entry>
<string>rotation</string>
<rotation rotation="1"/>
</entry>
<entry> <entry>
<string>Input Splitting</string> <string>Input Splitting</string>
<string>1,1,2*2</string> <string>3</string>
</entry> </entry>
<entry> <entry>
<string>Output Splitting</string> <string>Output Splitting</string>
<string>6</string> <string>1,1,1</string>
</entry> </entry>
</elementAttributes> </elementAttributes>
<pos x="520" y="240"/> <pos x="380" y="160"/>
<rotate>1</rotate> <rotate>0</rotate>
</visualElement> </visualElement>
<visualElement> <visualElement>
<elementName>Splitter</elementName> <elementName>LED</elementName>
<elementAttributes> <elementAttributes/>
<entry> <pos x="440" y="180"/>
<string>rotation</string> <rotate>0</rotate>
<rotation rotation="2"/>
</entry>
<entry>
<string>Input Splitting</string>
<string>1,1,2*2</string>
</entry>
<entry>
<string>Output Splitting</string>
<string>6</string>
</entry>
</elementAttributes>
<pos x="180" y="260"/>
<rotate>2</rotate>
</visualElement> </visualElement>
<visualElement> <visualElement>
<elementName>Splitter</elementName> <elementName>LED</elementName>
<elementAttributes> <elementAttributes/>
<entry> <pos x="440" y="140"/>
<string>rotation</string> <rotate>0</rotate>
<rotation rotation="3"/> </visualElement>
</entry> <visualElement>
<entry> <elementName>LED</elementName>
<string>Input Splitting</string> <elementAttributes/>
<string>1,1,2*2</string> <pos x="440" y="220"/>
</entry> <rotate>0</rotate>
<entry>
<string>Output Splitting</string>
<string>6</string>
</entry>
</elementAttributes>
<pos x="460" y="220"/>
<rotate>3</rotate>
</visualElement> </visualElement>
</visualElements> </visualElements>
<wires/> <wires>
<wire>
<p1 x="140" y="140"/>
<p2 x="180" y="160"/>
</wire>
<wire>
<p1 x="140" y="220"/>
<p2 x="180" y="200"/>
</wire>
<wire>
<p1 x="400" y="160"/>
<p2 x="440" y="140"/>
</wire>
<wire>
<p1 x="400" y="200"/>
<p2 x="440" y="220"/>
</wire>
<wire>
<p1 x="200" y="160"/>
<p2 x="380" y="160"/>
</wire>
<wire>
<p1 x="140" y="180"/>
<p2 x="180" y="180"/>
</wire>
<wire>
<p1 x="400" y="180"/>
<p2 x="440" y="180"/>
</wire>
</wires>
</circuit> </circuit>

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

@ -474,7 +474,7 @@ public class Main extends JFrame implements ClosingWindowListener.ConfirmSave, E
if (modelDescription != null) { if (modelDescription != null) {
if (cause instanceof NodeException) { if (cause instanceof NodeException) {
NodeException e = (NodeException) cause; NodeException e = (NodeException) cause;
if (e.getNodes() != null) if (!e.getNodes().isEmpty())
modelDescription.addNodeElementsTo(e.getNodes(), circuitComponent.getHighLighted()); modelDescription.addNodeElementsTo(e.getNodes(), circuitComponent.getHighLighted());
else else
circuitComponent.addHighLightedWires(e.getValues()); circuitComponent.addHighLightedWires(e.getValues());