projects
/
Mograsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit '28314e7a9a3c3ebfcc4db8e9f1875507063ae6e6' into development
[Mograsim.git]
/
net.mograsim.logic.ui
/
src
/
net
/
mograsim
/
logic
/
ui
/
model
/
components
/
mi
/
nandbased
/
GUIdff.java
diff --git
a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/mi/nandbased/GUIdff.java
b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/mi/nandbased/GUIdff.java
index
ce4f441
..
3341906
100644
(file)
--- a/
net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/mi/nandbased/GUIdff.java
+++ b/
net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/mi/nandbased/GUIdff.java
@@
-14,8
+14,8
@@
public class GUIdff extends SimpleRectangularSubmodelComponent
{
super(model, 1, "GUIdff");
setSubmodelScale(.2);
{
super(model, 1, "GUIdff");
setSubmodelScale(.2);
- setInput
Count(2
);
- setOutput
Count(2
);
+ setInput
Pins("C", "D"
);
+ setOutput
Pins("Q", "_Q"
);
initSubmodelComponents();
}
initSubmodelComponents();
}
@@
-41,10
+41,10
@@
public class GUIdff extends SimpleRectangularSubmodelComponent
nand3.moveTo(40, 40);
nand2.moveTo(120, 60);
_rsLatch2.moveTo(120, 30);
nand3.moveTo(40, 40);
nand2.moveTo(120, 60);
_rsLatch2.moveTo(120, 30);
- cp1.moveTo(10, 25);
- cp2.moveTo(20, 65);
- cp3.moveTo(100, 35);
- cp4.moveTo(100, 45);
+ cp1.move
Center
To(10, 25);
+ cp2.move
Center
To(20, 65);
+ cp3.move
Center
To(100, 35);
+ cp4.move
Center
To(100, 45);
new GUIWire(submodelModifiable, C, cp1, new Point[0]);
new GUIWire(submodelModifiable, cp1, _rsLatch1.getInputPins().get(1), new Point[0]);
new GUIWire(submodelModifiable, C, cp1, new Point[0]);
new GUIWire(submodelModifiable, cp1, _rsLatch1.getInputPins().get(1), new Point[0]);