projects
/
Mograsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Introduced guessing the correct order for ManualSwitches and BitDisplays
[Mograsim.git]
/
net.mograsim.logic.model.am2900
/
src
/
net
/
mograsim
/
logic
/
model
/
examples
/
SubmodelComponentTestbench.java
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
6a42d70
..
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,18
+1,17
@@
package net.mograsim.logic.model.examples;
package net.mograsim.logic.model.examples;
-import java.io.IOException;
-import java.io.UncheckedIOException;
import java.util.ArrayList;
import java.util.ArrayList;
+import java.util.Comparator;
import java.util.List;
import net.mograsim.logic.model.SimpleLogicUIStandalone;
import net.mograsim.logic.model.model.ViewModelModifiable;
import java.util.List;
import net.mograsim.logic.model.SimpleLogicUIStandalone;
import net.mograsim.logic.model.model.ViewModelModifiable;
+import net.mograsim.logic.model.model.components.GUIComponent;
import net.mograsim.logic.model.model.components.atomic.GUIBitDisplay;
import net.mograsim.logic.model.model.components.atomic.GUIManualSwitch;
import net.mograsim.logic.model.model.components.atomic.GUIBitDisplay;
import net.mograsim.logic.model.model.components.atomic.GUIManualSwitch;
-import net.mograsim.logic.model.model.components.submodels.SubmodelComponent;
import net.mograsim.logic.model.model.wires.GUIWire;
import net.mograsim.logic.model.model.wires.Pin;
import net.mograsim.logic.model.model.wires.GUIWire;
import net.mograsim.logic.model.model.wires.Pin;
-import net.mograsim.logic.model.serializing.
SubmodelComponentSerialize
r;
+import net.mograsim.logic.model.serializing.
IndirectGUIComponentCreato
r;
public class SubmodelComponentTestbench
{
public class SubmodelComponentTestbench
{
@@
-24,15
+23,7
@@
public class SubmodelComponentTestbench
@SuppressWarnings("unused") // for GUIWires being created
public static void createTestbench(ViewModelModifiable model)
{
@SuppressWarnings("unused") // for GUIWires being created
public static void createTestbench(ViewModelModifiable model)
{
- SubmodelComponent comp;
- try
- {
- comp = SubmodelComponentSerializer.deserialize(model, "components/am2901/GUIAm2901.json");
- }
- catch (IOException e)
- {
- throw new UncheckedIOException(e);
- }
+ GUIComponent comp = IndirectGUIComponentCreator.createComponent(model, "GUIAm2901", "Am2901");
// 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
@@
-44,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++)
{