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:
8402d5a
)
Changed formatting of initSubmodelComponents
author
Daniel Kirschten
<daniel.kirschten@gmx.de>
Tue, 4 Jun 2019 08:27:54 +0000
(10:27 +0200)
committer
Daniel Kirschten
<daniel.kirschten@gmx.de>
Tue, 4 Jun 2019 08:27:54 +0000
(10:27 +0200)
net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/mi/nandbased/GUI_rsLatch.java
patch
|
blob
|
history
net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/mi/nandbased/GUIand.java
patch
|
blob
|
history
net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/mi/nandbased/GUIand41.java
patch
|
blob
|
history
diff --git
a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/mi/nandbased/GUI_rsLatch.java
b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/mi/nandbased/GUI_rsLatch.java
index
26be11e
..
6f3e951
100644
(file)
--- a/
net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/mi/nandbased/GUI_rsLatch.java
+++ b/
net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/mi/nandbased/GUI_rsLatch.java
@@
-39,13
+39,14
@@
public class GUI_rsLatch extends SubmodelComponent
{
GUINandGate nand1 = new GUINandGate(submodelModifiable, 1);
{
GUINandGate nand1 = new GUINandGate(submodelModifiable, 1);
- nand1.moveTo(80, 20);
GUINandGate nand2 = new GUINandGate(submodelModifiable, 1);
GUINandGate nand2 = new GUINandGate(submodelModifiable, 1);
- nand2.moveTo(80, 85);
WireCrossPoint cp1 = new WireCrossPoint(submodelModifiable, 1);
WireCrossPoint cp1 = new WireCrossPoint(submodelModifiable, 1);
- cp1.moveTo(120, 30);
WireCrossPoint cp2 = new WireCrossPoint(submodelModifiable, 1);
WireCrossPoint cp2 = new WireCrossPoint(submodelModifiable, 1);
+
+ nand1.moveTo(80, 20);
+ nand2.moveTo(80, 85);
+ cp1.moveTo(120, 30);
cp2.moveTo(120, 95);
new GUIWire(submodelModifiable, _S, nand1.getInputPins().get(0));
cp2.moveTo(120, 95);
new GUIWire(submodelModifiable, _S, nand1.getInputPins().get(0));
diff --git
a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/mi/nandbased/GUIand.java
b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/mi/nandbased/GUIand.java
index
2d6d3b5
..
c0a50f3
100644
(file)
--- a/
net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/mi/nandbased/GUIand.java
+++ b/
net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/mi/nandbased/GUIand.java
@@
-35,11
+35,12
@@
public class GUIand extends SubmodelComponent
private void initSubmodelComponents(Pin A, Pin B, Pin Y)
{
GUINandGate nand = new GUINandGate(submodelModifiable, 1);
private void initSubmodelComponents(Pin A, Pin B, Pin Y)
{
GUINandGate nand = new GUINandGate(submodelModifiable, 1);
- nand.moveTo(20, 21.25);
GUINandGate not = new GUINandGate(submodelModifiable, 1);
GUINandGate not = new GUINandGate(submodelModifiable, 1);
- not.moveTo(50, 21.25);
WireCrossPoint cp1 = new WireCrossPoint(submodelModifiable, 1);
WireCrossPoint cp1 = new WireCrossPoint(submodelModifiable, 1);
+
+ nand.moveTo(20, 21.25);
+ not.moveTo(50, 21.25);
cp1.moveTo(45, 31.25);
new GUIWire(submodelModifiable, A, nand.getInputPins().get(0), new Point(10, 12.5), new Point(10, 26.25));
cp1.moveTo(45, 31.25);
new GUIWire(submodelModifiable, A, nand.getInputPins().get(0), new Point(10, 12.5), new Point(10, 26.25));
diff --git
a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/mi/nandbased/GUIand41.java
b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/mi/nandbased/GUIand41.java
index
5909819
..
13ed464
100644
(file)
--- a/
net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/mi/nandbased/GUIand41.java
+++ b/
net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/mi/nandbased/GUIand41.java
@@
-51,21
+51,21
@@
public class GUIand41 extends SubmodelComponent
@SuppressWarnings("unused") // for GUIWires being created
private void initSubmodelComponents(Pin A1, Pin A2, Pin A3, Pin A4, Pin B, Pin Y1, Pin Y2, Pin Y3, Pin Y4)
{
@SuppressWarnings("unused") // for GUIWires being created
private void initSubmodelComponents(Pin A1, Pin A2, Pin A3, Pin A4, Pin B, Pin Y1, Pin Y2, Pin Y3, Pin Y4)
{
-
GUIand and1 = new GUIand(submodelModifiable);
GUIand and1 = new GUIand(submodelModifiable);
- and1.moveTo(70, 20);
GUIand and2 = new GUIand(submodelModifiable);
GUIand and2 = new GUIand(submodelModifiable);
- and2.moveTo(70, 70);
GUIand and3 = new GUIand(submodelModifiable);
GUIand and3 = new GUIand(submodelModifiable);
- and3.moveTo(70, 120);
GUIand and4 = new GUIand(submodelModifiable);
GUIand and4 = new GUIand(submodelModifiable);
- and4.moveTo(70, 170);
WireCrossPoint cpB2 = new WireCrossPoint(submodelModifiable, 1);
WireCrossPoint cpB2 = new WireCrossPoint(submodelModifiable, 1);
- cpB2.moveTo(60, 90);
WireCrossPoint cpB3 = new WireCrossPoint(submodelModifiable, 1);
WireCrossPoint cpB3 = new WireCrossPoint(submodelModifiable, 1);
- cpB3.moveTo(60, 140);
WireCrossPoint cpB4 = new WireCrossPoint(submodelModifiable, 1);
WireCrossPoint cpB4 = new WireCrossPoint(submodelModifiable, 1);
+
+ and1.moveTo(70, 20);
+ and2.moveTo(70, 70);
+ and3.moveTo(70, 120);
+ and4.moveTo(70, 170);
+ cpB2.moveTo(60, 90);
+ cpB3.moveTo(60, 140);
cpB4.moveTo(60, 190);
new GUIWire(submodelModifiable, A1, and1.getPinA());
cpB4.moveTo(60, 190);
new GUIWire(submodelModifiable, A1, and1.getPinA());