projects
/
Mograsim.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
d6ca4ff
)
Introduced guessing the correct order for ManualSwitches and BitDisplays
author
Daniel Kirschten
<daniel.kirschten@gmx.de>
Wed, 17 Jul 2019 12:16:29 +0000
(14:16 +0200)
committer
Daniel Kirschten
<daniel.kirschten@gmx.de>
Wed, 17 Jul 2019 12:16:29 +0000
(14:16 +0200)
net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/examples/SubmodelComponentTestbench.java
patch
|
blob
|
history
net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/Am2901Testbench.java
patch
|
blob
|
history
diff --git
a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/examples/SubmodelComponentTestbench.java
b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/examples/SubmodelComponentTestbench.java
index
2da80ae
..
2ab4230
100644
(file)
--- a/
net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/examples/SubmodelComponentTestbench.java
+++ b/
net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/examples/SubmodelComponentTestbench.java
@@
-1,6
+1,7
@@
package net.mograsim.logic.model.examples;
import java.util.ArrayList;
package net.mograsim.logic.model.examples;
import java.util.ArrayList;
+import java.util.Comparator;
import java.util.List;
import net.mograsim.logic.model.SimpleLogicUIStandalone;
import java.util.List;
import net.mograsim.logic.model.SimpleLogicUIStandalone;
@@
-26,7
+27,6
@@
public class SubmodelComponentTestbench
// guess which pins are outputs and which are inputs
// TODO this code exists three times... but it seems too "hacky" to put it in a helper class
// guess which pins are outputs and which are inputs
// TODO this code exists three times... but it seems too "hacky" to put it in a helper class
- // TODO sort pins correctly - use Y coordinate
List<String> inputPinNames = new ArrayList<>();
List<String> outputPinNames = new ArrayList<>();
for (Pin p : comp.getPins().values())
List<String> inputPinNames = new ArrayList<>();
List<String> outputPinNames = new ArrayList<>();
for (Pin p : comp.getPins().values())
@@
-35,6
+35,9
@@
public class SubmodelComponentTestbench
else
outputPinNames.add(p.name);
else
outputPinNames.add(p.name);
+ inputPinNames.sort(Comparator.comparing(comp::getPin, Comparator.comparing(Pin::getRelY)));
+ outputPinNames.sort(Comparator.comparing(comp::getPin, Comparator.comparing(Pin::getRelY)));
+
comp.moveTo(100, 0);
for (int i = 0; i < inputPinNames.size(); i++)
{
comp.moveTo(100, 0);
for (int i = 0; i < inputPinNames.size(); i++)
{
diff --git
a/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/Am2901Testbench.java
b/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/Am2901Testbench.java
index
d6057f8
..
7939eae
100644
(file)
--- a/
net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/Am2901Testbench.java
+++ b/
net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/Am2901Testbench.java
@@
-1,6
+1,7
@@
package net.mograsim.logic.model.am2900;
import java.util.ArrayList;
package net.mograsim.logic.model.am2900;
import java.util.ArrayList;
+import java.util.Comparator;
import java.util.List;
import net.mograsim.logic.model.SimpleLogicUIStandalone;
import java.util.List;
import net.mograsim.logic.model.SimpleLogicUIStandalone;
@@
-60,6
+61,9
@@
public class Am2901Testbench
else
outputPinNames.add(p.name);
else
outputPinNames.add(p.name);
+ inputPinNames.sort(Comparator.comparing(comp::getPin, Comparator.comparing(Pin::getRelY)));
+ outputPinNames.sort(Comparator.comparing(comp::getPin, Comparator.comparing(Pin::getRelY)));
+
for (int i = 0; i < inputPinNames.size(); i++)
{
double x = 55 + 70 * (i % 2);
for (int i = 0; i < inputPinNames.size(); i++)
{
double x = 55 + 70 * (i % 2);