projects
/
Mograsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
GUIComponents now have names
[Mograsim.git]
/
net.mograsim.logic.ui.am2900
/
src
/
net
/
mograsim
/
logic
/
ui
/
model
/
components
/
mi
/
nandbased
/
GUIor_4.java
diff --git
a/net.mograsim.logic.ui.am2900/src/net/mograsim/logic/ui/model/components/mi/nandbased/GUIor_4.java
b/net.mograsim.logic.ui.am2900/src/net/mograsim/logic/ui/model/components/mi/nandbased/GUIor_4.java
index
9d14d1a
..
7744abd
100644
(file)
--- a/
net.mograsim.logic.ui.am2900/src/net/mograsim/logic/ui/model/components/mi/nandbased/GUIor_4.java
+++ b/
net.mograsim.logic.ui.am2900/src/net/mograsim/logic/ui/model/components/mi/nandbased/GUIor_4.java
@@
-7,12
+7,18
@@
import net.mograsim.logic.ui.model.components.submodels.SimpleRectangularSubmode
import net.mograsim.logic.ui.model.wires.GUIWire;
import net.mograsim.logic.ui.model.wires.Pin;
import net.mograsim.logic.ui.model.wires.WireCrossPoint;
import net.mograsim.logic.ui.model.wires.GUIWire;
import net.mograsim.logic.ui.model.wires.Pin;
import net.mograsim.logic.ui.model.wires.WireCrossPoint;
+import net.mograsim.logic.ui.serializing.IndirectGUIComponentCreator;
public class GUIor_4 extends SimpleRectangularSubmodelComponent
{
public GUIor_4(ViewModelModifiable model)
{
public class GUIor_4 extends SimpleRectangularSubmodelComponent
{
public GUIor_4(ViewModelModifiable model)
{
- super(model, 1, "GUIor_4");
+ this(model, null);
+ }
+
+ public GUIor_4(ViewModelModifiable model, String name)
+ {
+ super(model, 1, "GUIor_4", name);
setSubmodelScale(.4);
setInputPins("A1", "A2", "A3", "A4", "B1", "B2", "B3", "B4");
setOutputPins("Y1", "Y2", "Y3", "Y4");
setSubmodelScale(.4);
setInputPins("A1", "A2", "A3", "A4", "B1", "B2", "B3", "B4");
setOutputPins("Y1", "Y2", "Y3", "Y4");
@@
-115,4
+121,9
@@
public class GUIor_4 extends SimpleRectangularSubmodelComponent
new GUIWire(submodelModifiable, nandY3.getPin("Y"), Y3, new Point[0]);
new GUIWire(submodelModifiable, nandY4.getPin("Y"), Y4, new Point[0]);
}
new GUIWire(submodelModifiable, nandY3.getPin("Y"), Y3, new Point[0]);
new GUIWire(submodelModifiable, nandY4.getPin("Y"), Y4, new Point[0]);
}
+
+ static
+ {
+ IndirectGUIComponentCreator.setComponentSupplier(GUIor_4.class.getCanonicalName(), (m, p, n) -> new GUIor_4(m, n));
+ }
}
\ No newline at end of file
}
\ No newline at end of file