In debug mode also measurement values are shown

This commit is contained in:
hneemann 2016-08-22 17:43:50 +02:00
parent c53c522a71
commit a3fc6845d4
2 changed files with 197 additions and 169 deletions

View File

@ -1,174 +1,201 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<circuit> <circuit>
<version>1</version> <version>1</version>
<attributes> <attributes>
<entry>
<string>Description</string>
<string>Speichert die Prozessorflags</string>
</entry>
</attributes>
<visualElements>
<visualElement>
<elementName>In</elementName>
<elementAttributes>
<entry> <entry>
<string>Description</string> <string>Label</string>
<string>Speichert die Prozessorflags</string> <string>Zi</string>
</entry> </entry>
</attributes> </elementAttributes>
<visualElements> <pos x="240" y="200"/>
<visualElement> </visualElement>
<elementName>In</elementName> <visualElement>
<elementAttributes> <elementName>Out</elementName>
<entry> <elementAttributes>
<string>Label</string> <entry>
<string>Zi</string> <string>Label</string>
</entry> <string>Zo</string>
</elementAttributes> </entry>
<pos x="240" y="220"/> </elementAttributes>
</visualElement> <pos x="460" y="200"/>
<visualElement> </visualElement>
<elementName>Out</elementName> <visualElement>
<elementAttributes> <elementName>D_FF</elementName>
<entry> <elementAttributes>
<string>Label</string> <entry>
<string>Zo</string> <string>valueIsProbe</string>
</entry> <boolean>true</boolean>
</elementAttributes> </entry>
<pos x="460" y="220"/> <entry>
</visualElement> <string>Label</string>
<visualElement> <string>C</string>
<elementName>D_FF</elementName> </entry>
<elementAttributes/> </elementAttributes>
<pos x="360" y="140"/> <pos x="360" y="100"/>
</visualElement> </visualElement>
<visualElement> <visualElement>
<elementName>In</elementName> <elementName>In</elementName>
<elementAttributes> <elementAttributes>
<entry> <entry>
<string>Label</string> <string>Label</string>
<string>Ni</string> <string>Ni</string>
</entry> </entry>
</elementAttributes> </elementAttributes>
<pos x="240" y="300"/> <pos x="240" y="300"/>
</visualElement> </visualElement>
<visualElement> <visualElement>
<elementName>Out</elementName> <elementName>Out</elementName>
<elementAttributes> <elementAttributes>
<entry> <entry>
<string>Label</string> <string>Label</string>
<string>No</string> <string>No</string>
</entry> </entry>
</elementAttributes> </elementAttributes>
<pos x="460" y="300"/> <pos x="460" y="300"/>
</visualElement> </visualElement>
<visualElement> <visualElement>
<elementName>D_FF</elementName> <elementName>D_FF</elementName>
<elementAttributes/> <elementAttributes>
<pos x="360" y="220"/> <entry>
</visualElement> <string>valueIsProbe</string>
<visualElement> <boolean>true</boolean>
<elementName>In</elementName> </entry>
<elementAttributes> <entry>
<entry> <string>Label</string>
<string>Label</string> <string>Z</string>
<string>Ci</string> </entry>
</entry> </elementAttributes>
</elementAttributes> <pos x="360" y="200"/>
<pos x="240" y="140"/> </visualElement>
</visualElement> <visualElement>
<visualElement> <elementName>In</elementName>
<elementName>Out</elementName> <elementAttributes>
<elementAttributes> <entry>
<entry> <string>Label</string>
<string>Label</string> <string>Ci</string>
<string>Co</string> </entry>
</entry> </elementAttributes>
</elementAttributes> <pos x="240" y="100"/>
<pos x="460" y="140"/> </visualElement>
</visualElement> <visualElement>
<visualElement> <elementName>Out</elementName>
<elementName>D_FF</elementName> <elementAttributes>
<elementAttributes/> <entry>
<pos x="360" y="300"/> <string>Label</string>
</visualElement> <string>Co</string>
<visualElement> </entry>
<elementName>In</elementName> </elementAttributes>
<elementAttributes> <pos x="460" y="100"/>
<entry> </visualElement>
<string>Label</string> <visualElement>
<string>C</string> <elementName>D_FF</elementName>
</entry> <elementAttributes>
</elementAttributes> <entry>
<pos x="240" y="360"/> <string>valueIsProbe</string>
</visualElement> <boolean>true</boolean>
<visualElement> </entry>
<elementName>In</elementName> <entry>
<elementAttributes> <string>Label</string>
<entry> <string>N</string>
<string>Label</string> </entry>
<string>store</string> </elementAttributes>
</entry> <pos x="360" y="300"/>
</elementAttributes> </visualElement>
<pos x="240" y="400"/> <visualElement>
</visualElement> <elementName>In</elementName>
<visualElement> <elementAttributes>
<elementName>And</elementName> <entry>
<elementAttributes/> <string>Label</string>
<pos x="260" y="360"/> <string>C</string>
</visualElement> </entry>
</visualElements> </elementAttributes>
<wires> <pos x="240" y="360"/>
<wire> </visualElement>
<p1 x="340" y="320"/> <visualElement>
<p2 x="360" y="320"/> <elementName>In</elementName>
</wire> <elementAttributes>
<wire> <entry>
<p1 x="340" y="240"/> <string>Label</string>
<p2 x="360" y="240"/> <string>store</string>
</wire> </entry>
<wire> </elementAttributes>
<p1 x="340" y="160"/> <pos x="240" y="400"/>
<p2 x="360" y="160"/> </visualElement>
</wire> <visualElement>
<wire> <elementName>And</elementName>
<p1 x="240" y="400"/> <elementAttributes/>
<p2 x="260" y="400"/> <pos x="260" y="360"/>
</wire> </visualElement>
<wire> </visualElements>
<p1 x="240" y="360"/> <wires>
<p2 x="260" y="360"/> <wire>
</wire> <p1 x="340" y="320"/>
<wire> <p2 x="360" y="320"/>
<p1 x="320" y="380"/> </wire>
<p2 x="340" y="380"/> <wire>
</wire> <p1 x="240" y="400"/>
<wire> <p2 x="260" y="400"/>
<p1 x="420" y="140"/> </wire>
<p2 x="460" y="140"/> <wire>
</wire> <p1 x="420" y="100"/>
<wire> <p2 x="460" y="100"/>
<p1 x="240" y="140"/> </wire>
<p2 x="360" y="140"/> <wire>
</wire> <p1 x="240" y="100"/>
<wire> <p2 x="360" y="100"/>
<p1 x="420" y="220"/> </wire>
<p2 x="460" y="220"/> <wire>
</wire> <p1 x="240" y="360"/>
<wire> <p2 x="260" y="360"/>
<p1 x="240" y="220"/> </wire>
<p2 x="360" y="220"/> <wire>
</wire> <p1 x="340" y="120"/>
<wire> <p2 x="360" y="120"/>
<p1 x="420" y="300"/> </wire>
<p2 x="460" y="300"/> <wire>
</wire> <p1 x="420" y="200"/>
<wire> <p2 x="460" y="200"/>
<p1 x="240" y="300"/> </wire>
<p2 x="360" y="300"/> <wire>
</wire> <p1 x="240" y="200"/>
<wire> <p2 x="360" y="200"/>
<p1 x="340" y="160"/> </wire>
<p2 x="340" y="240"/> <wire>
</wire> <p1 x="340" y="220"/>
<wire> <p2 x="360" y="220"/>
<p1 x="340" y="320"/> </wire>
<p2 x="340" y="380"/> <wire>
</wire> <p1 x="320" y="380"/>
<wire> <p2 x="340" y="380"/>
<p1 x="340" y="240"/> </wire>
<p2 x="340" y="320"/> <wire>
</wire> <p1 x="420" y="300"/>
</wires> <p2 x="460" y="300"/>
</wire>
<wire>
<p1 x="240" y="300"/>
<p2 x="360" y="300"/>
</wire>
<wire>
<p1 x="340" y="120"/>
<p2 x="340" y="220"/>
</wire>
<wire>
<p1 x="340" y="220"/>
<p2 x="340" y="320"/>
</wire>
<wire>
<p1 x="340" y="320"/>
<p2 x="340" y="380"/>
</wire>
</wires>
</circuit> </circuit>

View File

@ -1008,6 +1008,7 @@ public class Main extends JFrame implements ClosingWindowListener.ConfirmSave, E
private void setDebug(boolean debug) throws RemoteException { private void setDebug(boolean debug) throws RemoteException {
VisualElement rom = getProgramRomFromCircuit(); VisualElement rom = getProgramRomFromCircuit();
rom.getElementAttributes().set(Keys.SHOW_LISTING, debug); rom.getElementAttributes().set(Keys.SHOW_LISTING, debug);
settings.set(Keys.SHOW_DATA_TABLE, debug);
} }
@Override @Override