projects
/
Mograsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'development' of https://gitlab.lrz.de/lrr-tum/students/eragp-misim...
[Mograsim.git]
/
net.mograsim.logic.ui
/
src
/
net
/
mograsim
/
logic
/
ui
/
model
/
components
/
SimpleRectangularGUIGate.java
diff --git
a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/SimpleRectangularGUIGate.java
b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/SimpleRectangularGUIGate.java
index
a1b0c8a
..
cbb8ab7
100644
(file)
--- a/
net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/SimpleRectangularGUIGate.java
+++ b/
net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/SimpleRectangularGUIGate.java
@@
-35,7
+35,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, logicWidth, width, 0);
+ this.outputPin = new MovablePin(this,
"Y",
logicWidth, width, 0);
addPin(outputPin);
this.inputPins = new ArrayList<>();
this.inputPinsUnmodifiable = Collections.unmodifiableList(inputPins);
addPin(outputPin);
this.inputPins = new ArrayList<>();
this.inputPinsUnmodifiable = Collections.unmodifiableList(inputPins);
@@
-48,11
+48,12
@@
public class SimpleRectangularGUIGate extends GUIComponent
setSize(width, inputCount * pinDistance);
if (oldInputCount > inputCount)
while (inputPins.size() > inputCount)
setSize(width, inputCount * pinDistance);
if (oldInputCount > inputCount)
while (inputPins.size() > inputCount)
- removePin(inputPins.
get
(inputCount));
+ removePin(inputPins.
remove
(inputCount));
else if (oldInputCount < inputCount)
for (int i = oldInputCount; i < inputCount; i++)
{
else if (oldInputCount < inputCount)
for (int i = oldInputCount; i < inputCount; i++)
{
- Pin pin = new Pin(this, logicWidth, 0, pinDistance / 2 + i * pinDistance);
+ // TODO what for more than 26 input pins?
+ Pin pin = new Pin(this, "A" + i, logicWidth, 0, pinDistance / 2 + i * pinDistance);
inputPins.add(pin);
addPin(pin);
}
inputPins.add(pin);
addPin(pin);
}