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

made a field to a local var

Browse Source
This commit is contained in:
hneemann 2016-04-15 21:03:50 +02:00
parent ee2513d013
commit 1cc4df08d0
3 changed files with 105 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

165
src/main/dig/Ampel_MSJK.dig
View File

@ -1,16 +1,17 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<circuit> <circuit>
<version>1</version>
<visualElements> <visualElements>
<visualElement> <visualElement>
<elementName>And</elementName> <elementName>And</elementName>
<elementAttributes/> <elementAttributes/>
<pos x="300" y="180"/> <pos x="600" y="360"/>
<rotate>0</rotate> <rotate>0</rotate>
</visualElement> </visualElement>
<visualElement> <visualElement>
<elementName>Const</elementName> <elementName>Const</elementName>
<elementAttributes/> <elementAttributes/>
<pos x="220" y="210"/> <pos x="440" y="420"/>
<rotate>0</rotate> <rotate>0</rotate>
</visualElement> </visualElement>
<visualElement> <visualElement>
@ -21,7 +22,7 @@
<string>Rot</string> <string>Rot</string>
</entry> </entry>
</elementAttributes> </elementAttributes>
<pos x="350" y="150"/> <pos x="700" y="300"/>
<rotate>0</rotate> <rotate>0</rotate>
</visualElement> </visualElement>
<visualElement> <visualElement>
@ -41,7 +42,7 @@
<string>Gelb</string> <string>Gelb</string>
</entry> </entry>
</elementAttributes> </elementAttributes>
<pos x="350" y="170"/> <pos x="700" y="340"/>
<rotate>0</rotate> <rotate>0</rotate>
</visualElement> </visualElement>
<visualElement> <visualElement>
@ -61,30 +62,34 @@
<string>Grün</string> <string>Grün</string>
</entry> </entry>
</elementAttributes> </elementAttributes>
<pos x="350" y="190"/> <pos x="700" y="380"/>
<rotate>0</rotate> <rotate>0</rotate>
</visualElement> </visualElement>
<visualElement> <visualElement>
<elementName>Clock</elementName> <elementName>Clock</elementName>
<elementAttributes> <elementAttributes>
<entry>
<string>runRealTime</string>
<boolean>true</boolean>
</entry>
<entry> <entry>
<string>Label</string> <string>Label</string>
<string>Clock</string> <string>Clock</string>
</entry> </entry>
</elementAttributes> </elementAttributes>
<pos x="130" y="140"/> <pos x="260" y="280"/>
<rotate>0</rotate> <rotate>0</rotate>
</visualElement> </visualElement>
<visualElement> <visualElement>
<elementName>Or</elementName> <elementName>Or</elementName>
<elementAttributes/> <elementAttributes/>
<pos x="170" y="180"/> <pos x="340" y="360"/>
<rotate>0</rotate> <rotate>0</rotate>
</visualElement> </visualElement>
<visualElement> <visualElement>
<elementName>Not</elementName> <elementName>Not</elementName>
<elementAttributes/> <elementAttributes/>
<pos x="140" y="200"/> <pos x="280" y="400"/>
<rotate>0</rotate> <rotate>0</rotate>
</visualElement> </visualElement>
<visualElement> <visualElement>
@ -95,142 +100,156 @@
<string>Feuer</string> <string>Feuer</string>
</entry> </entry>
</elementAttributes> </elementAttributes>
<pos x="130" y="200"/> <pos x="260" y="400"/>
<rotate>0</rotate> <rotate>0</rotate>
</visualElement> </visualElement>
<visualElement> <visualElement>
<elementName>MS-JK.dig</elementName> <elementName>MS-JK.dig</elementName>
<elementAttributes/> <elementAttributes/>
<pos x="240" y="130"/> <pos x="480" y="260"/>
<rotate>0</rotate> <rotate>0</rotate>
</visualElement> </visualElement>
<visualElement> <visualElement>
<elementName>MS-JK.dig</elementName> <elementName>MS-JK.dig</elementName>
<elementAttributes/> <elementAttributes/>
<pos x="240" y="190"/> <pos x="480" y="380"/>
<rotate>0</rotate>
</visualElement>
<visualElement>
<elementName>Data</elementName>
<elementAttributes>
<entry>
<string>maxStepCount</string>
<int>22</int>
</entry>
</elementAttributes>
<pos x="140" y="20"/>
<rotate>0</rotate> <rotate>0</rotate>
</visualElement> </visualElement>
</visualElements> </visualElements>
<wires> <wires>
<wire> <wire>
<p1 x="220" y="210"/> <p1 x="540" y="400"/>
<p2 x="230" y="210"/> <p2 x="600" y="400"/>
</wire> </wire>
<wire> <wire>
<p1 x="230" y="210"/> <p1 x="440" y="400"/>
<p2 x="240" y="210"/> <p2 x="480" y="400"/>
</wire> </wire>
<wire> <wire>
<p1 x="230" y="130"/> <p1 x="260" y="400"/>
<p2 x="240" y="130"/> <p2 x="280" y="400"/>
</wire> </wire>
<wire> <wire>
<p1 x="270" y="130"/> <p1 x="320" y="400"/>
<p2 x="290" y="130"/> <p2 x="340" y="400"/>
</wire> </wire>
<wire> <wire>
<p1 x="210" y="180"/> <p1 x="320" y="320"/>
<p2 x="290" y="180"/> <p2 x="420" y="320"/>
</wire> </wire>
<wire> <wire>
<p1 x="160" y="180"/> <p1 x="440" y="420"/>
<p2 x="170" y="180"/> <p2 x="480" y="420"/>
</wire> </wire>
<wire> <wire>
<p1 x="290" y="180"/> <p1 x="460" y="260"/>
<p2 x="300" y="180"/> <p2 x="480" y="260"/>
</wire> </wire>
<wire> <wire>
<p1 x="230" y="150"/> <p1 x="540" y="260"/>
<p2 x="240" y="150"/> <p2 x="580" y="260"/>
</wire> </wire>
<wire> <wire>
<p1 x="280" y="150"/> <p1 x="460" y="340"/>
<p2 x="350" y="150"/> <p2 x="560" y="340"/>
</wire> </wire>
<wire> <wire>
<p1 x="270" y="200"/> <p1 x="560" y="340"/>
<p2 x="300" y="200"/> <p2 x="700" y="340"/>
</wire> </wire>
<wire> <wire>
<p1 x="220" y="200"/> <p1 x="420" y="360"/>
<p2 x="240" y="200"/> <p2 x="580" y="360"/>
</wire> </wire>
<wire> <wire>
<p1 x="130" y="200"/> <p1 x="320" y="360"/>
<p2 x="140" y="200"/> <p2 x="340" y="360"/>
</wire> </wire>
<wire> <wire>
<p1 x="160" y="200"/> <p1 x="580" y="360"/>
<p2 x="170" y="200"/> <p2 x="600" y="360"/>
</wire> </wire>
<wire> <wire>
<p1 x="230" y="170"/> <p1 x="260" y="280"/>
<p2 x="280" y="170"/> <p2 x="440" y="280"/>
</wire> </wire>
<wire> <wire>
<p1 x="160" y="160"/> <p1 x="540" y="280"/>
<p2 x="210" y="160"/> <p2 x="560" y="280"/>
</wire> </wire>
<wire> <wire>
<p1 x="280" y="170"/> <p1 x="440" y="280"/>
<p2 x="350" y="170"/> <p2 x="480" y="280"/>
</wire> </wire>
<wire> <wire>
<p1 x="130" y="140"/> <p1 x="460" y="300"/>
<p2 x="220" y="140"/> <p2 x="480" y="300"/>
</wire> </wire>
<wire> <wire>
<p1 x="270" y="140"/> <p1 x="560" y="300"/>
<p2 x="280" y="140"/> <p2 x="700" y="300"/>
</wire> </wire>
<wire> <wire>
<p1 x="220" y="140"/> <p1 x="540" y="380"/>
<p2 x="240" y="140"/> <p2 x="560" y="380"/>
</wire> </wire>
<wire> <wire>
<p1 x="270" y="190"/> <p1 x="660" y="380"/>
<p2 x="280" y="190"/> <p2 x="700" y="380"/>
</wire> </wire>
<wire> <wire>
<p1 x="330" y="190"/> <p1 x="400" y="380"/>
<p2 x="350" y="190"/> <p2 x="480" y="380"/>
</wire> </wire>
<wire> <wire>
<p1 x="200" y="190"/> <p1 x="320" y="320"/>
<p2 x="240" y="190"/> <p2 x="320" y="360"/>
</wire> </wire>
<wire> <wire>
<p1 x="160" y="160"/> <p1 x="560" y="340"/>
<p2 x="160" y="180"/> <p2 x="560" y="380"/>
</wire> </wire>
<wire> <wire>
<p1 x="290" y="130"/> <p1 x="560" y="280"/>
<p2 x="290" y="180"/> <p2 x="560" y="300"/>
</wire> </wire>
<wire> <wire>
<p1 x="210" y="160"/> <p1 x="580" y="260"/>
<p2 x="210" y="180"/> <p2 x="580" y="360"/>
</wire> </wire>
<wire> <wire>
<p1 x="230" y="130"/> <p1 x="420" y="320"/>
<p2 x="230" y="150"/> <p2 x="420" y="360"/>
</wire> </wire>
<wire> <wire>
<p1 x="230" y="150"/> <p1 x="440" y="280"/>
<p2 x="230" y="170"/> <p2 x="440" y="400"/>
</wire> </wire>
<wire> <wire>
<p1 x="280" y="170"/> <p1 x="460" y="260"/>
<p2 x="280" y="190"/> <p2 x="460" y="300"/>
</wire> </wire>
<wire> <wire>
<p1 x="280" y="140"/> <p1 x="460" y="300"/>
<p2 x="280" y="150"/> <p2 x="460" y="340"/>
</wire>
<wire>
<p1 x="220" y="140"/>
<p2 x="220" y="200"/>
</wire> </wire>
</wires> </wires>
<measurementOrdering>
<string>Clock</string>
<string>Feuer</string>
<string>Rot</string>
<string>Gelb</string>
<string>Grün</string>
</measurementOrdering>
</circuit> </circuit>

12
src/main/dig/MS-JK.dig
View File

@ -52,6 +52,10 @@
<visualElement> <visualElement>
<elementName>In</elementName> <elementName>In</elementName>
<elementAttributes> <elementAttributes>
<entry>
<string>Description</string>
<string>Takt</string>
</entry>
<entry> <entry>
<string>Label</string> <string>Label</string>
<string>C</string> <string>C</string>
@ -99,6 +103,10 @@
<visualElement> <visualElement>
<elementName>Out</elementName> <elementName>Out</elementName>
<elementAttributes> <elementAttributes>
<entry>
<string>Description</string>
<string>Ausgang</string>
</entry>
<entry> <entry>
<string>Label</string> <string>Label</string>
<string>Q</string> <string>Q</string>
@ -110,6 +118,10 @@
<visualElement> <visualElement>
<elementName>Out</elementName> <elementName>Out</elementName>
<elementAttributes> <elementAttributes>
<entry>
<string>Description</string>
<string>invertierter Ausgang</string>
</entry>
<entry> <entry>
<string>Label</string> <string>Label</string>
<string>~Q</string> <string>~Q</string>

3
src/main/java/de/neemann/digital/gui/components/data/DataSetDialog.java
View File

@ -26,7 +26,6 @@ import java.util.List;
*/ */
public class DataSetDialog extends JDialog implements ModelStateObserver { public class DataSetDialog extends JDialog implements ModelStateObserver {
private static final int MAX_SAMPLE_SIZE = 1000; private static final int MAX_SAMPLE_SIZE = 1000;
private final ArrayList<Model.Signal> signals;
private final DataSetComponent dsc; private final DataSetComponent dsc;
private final JScrollPane scrollPane; private final JScrollPane scrollPane;
private DataSet dataSet; private DataSet dataSet;
@ -45,7 +44,7 @@ public class DataSetDialog extends JDialog implements ModelStateObserver {
setDefaultCloseOperation(DISPOSE_ON_CLOSE); setDefaultCloseOperation(DISPOSE_ON_CLOSE);
setAlwaysOnTop(true); setAlwaysOnTop(true);
signals = model.getSignalsCopy(); ArrayList<Model.Signal> signals = model.getSignalsCopy();
new OrderMerger<String, Model.Signal>(ordering) { new OrderMerger<String, Model.Signal>(ordering) {
@Override @Override
public boolean equals(Model.Signal a, String b) { public boolean equals(Model.Signal a, String b) {