projects
/
Mograsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
TextComponent no longer eats your CPU
[Mograsim.git]
/
net.mograsim.logic.model
/
src
/
net
/
mograsim
/
logic
/
model
/
model
/
components
/
atomic
/
SimpleRectangularGUIGate.java
diff --git
a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/SimpleRectangularGUIGate.java
b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/SimpleRectangularGUIGate.java
index
b14aaec
..
e343c58
100644
(file)
--- a/
net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/SimpleRectangularGUIGate.java
+++ b/
net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/SimpleRectangularGUIGate.java
@@
-16,6
+16,8
@@
import net.mograsim.logic.model.model.ViewModelModifiable;
import net.mograsim.logic.model.model.components.GUIComponent;
import net.mograsim.logic.model.model.wires.MovablePin;
import net.mograsim.logic.model.model.wires.Pin;
import net.mograsim.logic.model.model.components.GUIComponent;
import net.mograsim.logic.model.model.wires.MovablePin;
import net.mograsim.logic.model.model.wires.Pin;
+import net.mograsim.logic.model.model.wires.PinUsage;
+import net.mograsim.logic.model.serializing.IdentifierGetter;
import net.mograsim.preferences.Preferences;
public class SimpleRectangularGUIGate extends GUIComponent
import net.mograsim.preferences.Preferences;
public class SimpleRectangularGUIGate extends GUIComponent
@@
-40,7
+42,7
@@
public class SimpleRectangularGUIGate extends GUIComponent
this.logicWidth = logicWidth;
this.isInverted = isInverted;
this.rectWidth = width - (isInverted ? invertedCircleDiam : 0);
this.logicWidth = logicWidth;
this.isInverted = isInverted;
this.rectWidth = width - (isInverted ? invertedCircleDiam : 0);
- this.outputPin = new MovablePin(this, "Y", logicWidth, width, 0);
+ this.outputPin = new MovablePin(this, "Y", logicWidth,
PinUsage.OUTPUT,
width, 0);
addPin(outputPin);
this.inputPins = new ArrayList<>();
setInputCount(1);
addPin(outputPin);
this.inputPins = new ArrayList<>();
setInputCount(1);
@@
-57,7
+59,7
@@
public class SimpleRectangularGUIGate extends GUIComponent
for (int i = oldInputCount; i < inputCount; i++)
{
// TODO what for more than 24 input pins?
for (int i = oldInputCount; i < inputCount; i++)
{
// TODO what for more than 24 input pins?
- Pin pin = new Pin(this, String.valueOf((char) ('A' + i)), logicWidth, 0, pinDistance / 2 + i * pinDistance);
+ Pin pin = new Pin(this, String.valueOf((char) ('A' + i)), logicWidth,
PinUsage.INPUT,
0, pinDistance / 2 + i * pinDistance);
inputPins.add(pin);
addPin(pin);
}
inputPins.add(pin);
addPin(pin);
}
@@
-94,7
+96,7
@@
public class SimpleRectangularGUIGate extends GUIComponent
* @see GUIComponent#getParamsForSerializing()
*/
@Override
* @see GUIComponent#getParamsForSerializing()
*/
@Override
- public JsonElement getParamsForSerializing()
+ public JsonElement getParamsForSerializing(
IdentifierGetter idGetter
)
{
return new JsonPrimitive(logicWidth);
}
{
return new JsonPrimitive(logicWidth);
}