projects
/
Mograsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Implemented SubmodelComponent.clicked(); removed obsolete TODOs
[Mograsim.git]
/
net.mograsim.logic.ui
/
src
/
net
/
mograsim
/
logic
/
ui
/
examples
/
SubmodelComponentTestbench.java
diff --git
a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/examples/SubmodelComponentTestbench.java
b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/examples/SubmodelComponentTestbench.java
index
1898d00
..
90e39c7
100644
(file)
--- a/
net.mograsim.logic.ui/src/net/mograsim/logic/ui/examples/SubmodelComponentTestbench.java
+++ b/
net.mograsim.logic.ui/src/net/mograsim/logic/ui/examples/SubmodelComponentTestbench.java
@@
-4,8
+4,8
@@
import net.mograsim.logic.ui.SimpleLogicUIStandalone;
import net.mograsim.logic.ui.model.ViewModelModifiable;
import net.mograsim.logic.ui.model.components.GUIBitDisplay;
import net.mograsim.logic.ui.model.components.GUIManualSwitch;
import net.mograsim.logic.ui.model.ViewModelModifiable;
import net.mograsim.logic.ui.model.components.GUIBitDisplay;
import net.mograsim.logic.ui.model.components.GUIManualSwitch;
-import net.mograsim.logic.ui.model.components.SubmodelComponent;
-import net.mograsim.logic.ui.model.components.mi.nandbased.
GUInand3
;
+import net.mograsim.logic.ui.model.components.S
impleRectangularS
ubmodelComponent;
+import net.mograsim.logic.ui.model.components.mi.nandbased.
am2901.GUIAm2901
;
import net.mograsim.logic.ui.model.wires.GUIWire;
public class SubmodelComponentTestbench
import net.mograsim.logic.ui.model.wires.GUIWire;
public class SubmodelComponentTestbench
@@
-18,21
+18,20
@@
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 = new GUInand3(model);
- int inputCount = 3;
+ SimpleRectangularSubmodelComponent comp = new GUIAm2901(model);
comp.moveTo(100, 0);
comp.moveTo(100, 0);
- for (int i = 0; i <
inputCount
; i++)
+ for (int i = 0; i <
comp.getInputPinNames().size()
; i++)
{
GUIManualSwitch sw = new GUIManualSwitch(model);
sw.moveTo(0, 20 * i);
{
GUIManualSwitch sw = new GUIManualSwitch(model);
sw.moveTo(0, 20 * i);
- new GUIWire(model, comp.getPin
s().get(i
), sw.getOutputPin());
+ new GUIWire(model, comp.getPin
(comp.getInputPinNames().get(i)
), sw.getOutputPin());
}
}
- for (int i =
inputCount; i < comp.getPin
s().size(); i++)
+ for (int i =
0; i < comp.getOutputPinName
s().size(); i++)
{
GUIBitDisplay bd = new GUIBitDisplay(model);
{
GUIBitDisplay bd = new GUIBitDisplay(model);
- bd.moveTo(200, 20 *
(i - inputCount)
);
- new GUIWire(model, comp.getPin
s().get(i
), bd.getInputPin());
+ bd.moveTo(200, 20 *
i
);
+ new GUIWire(model, comp.getPin
(comp.getOutputPinNames().get(i)
), bd.getInputPin());
}
}
}
\ No newline at end of file
}
}
}
\ No newline at end of file