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:
3eab8ad
)
Hardcoded a wire path in GUImux1
author
Daniel Kirschten
<daniel.kirschten@gmx.de>
Wed, 5 Jun 2019 17:33:09 +0000
(19:33 +0200)
committer
Daniel Kirschten
<daniel.kirschten@gmx.de>
Wed, 5 Jun 2019 17:33:27 +0000
(19:33 +0200)
net.mograsim.logic.ui/src/net/mograsim/logic/ui/examples/SubmodelComponentTestbench.java
patch
|
blob
|
history
net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/mi/nandbased/GUImux1.java
patch
|
blob
|
history
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
9ff84c0
..
0f5e345
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
@@
-5,7
+5,7
@@
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.SimpleRectangularSubmodelComponent;
import net.mograsim.logic.ui.model.components.GUIBitDisplay;
import net.mograsim.logic.ui.model.components.GUIManualSwitch;
import net.mograsim.logic.ui.model.components.SimpleRectangularSubmodelComponent;
-import net.mograsim.logic.ui.model.components.mi.nandbased.GUI
not4
;
+import net.mograsim.logic.ui.model.components.mi.nandbased.GUI
mux1
;
import net.mograsim.logic.ui.model.wires.GUIWire;
public class SubmodelComponentTestbench
import net.mograsim.logic.ui.model.wires.GUIWire;
public class SubmodelComponentTestbench
@@
-18,7
+18,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)
{
- SimpleRectangularSubmodelComponent comp = new GUI
not4
(model);
+ SimpleRectangularSubmodelComponent comp = new GUI
mux1
(model);
comp.moveTo(100, 0);
for (int i = 0; i < comp.getInputPins().size(); i++)
comp.moveTo(100, 0);
for (int i = 0; i < comp.getInputPins().size(); i++)
diff --git
a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/mi/nandbased/GUImux1.java
b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/mi/nandbased/GUImux1.java
index
056b696
..
14a612b
100644
(file)
--- a/
net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/mi/nandbased/GUImux1.java
+++ b/
net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/mi/nandbased/GUImux1.java
@@
-52,8
+52,7
@@
public class GUImux1 extends SimpleRectangularSubmodelComponent
new GUIWire(submodelModifiable, nandS0.getOutputPin(), nandI0.getInputPins().get(0));
new GUIWire(submodelModifiable, I0, nandI0.getInputPins().get(1), new Point[0]);
new GUIWire(submodelModifiable, nandS0.getOutputPin(), nandI0.getInputPins().get(0));
new GUIWire(submodelModifiable, I0, nandI0.getInputPins().get(1), new Point[0]);
- new GUIWire(submodelModifiable, cp1, nandI1.getInputPins().get(0),
- new Point(cp1.getPin().getPos().x, nandI1.getInputPins().get(0).getPos().y));
+ new GUIWire(submodelModifiable, cp1, nandI1.getInputPins().get(0), new Point(5, 52));
new GUIWire(submodelModifiable, I1, nandI1.getInputPins().get(1), new Point[0]);
new GUIWire(submodelModifiable, nandI0.getOutputPin(), nandY.getInputPins().get(0));
new GUIWire(submodelModifiable, I1, nandI1.getInputPins().get(1), new Point[0]);
new GUIWire(submodelModifiable, nandI0.getOutputPin(), nandY.getInputPins().get(0));