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:
4597e24
)
GUIMerger/GUISplitter now have a reference to their output/input pin
author
Daniel Kirschten
<daniel.kirschten@gmx.de>
Sat, 31 Aug 2019 13:40:17 +0000
(15:40 +0200)
committer
Daniel Kirschten
<daniel.kirschten@gmx.de>
Sat, 31 Aug 2019 13:40:17 +0000
(15:40 +0200)
net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/GUIMerger.java
patch
|
blob
|
history
net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/GUISplitter.java
patch
|
blob
|
history
diff --git
a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/GUIMerger.java
b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/GUIMerger.java
index
d1eac5e
..
e72cf8a
100644
(file)
--- a/
net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/GUIMerger.java
+++ b/
net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/GUIMerger.java
@@
-26,10
+26,16
@@
public class GUIMerger extends GUIComponent
private static final double heightPerPin = 10;
public final int logicWidth;
private static final double heightPerPin = 10;
public final int logicWidth;
+ private final Pin outputPin;
private final ReadEnd[] inputEnds;
private ReadEnd outputEnd;
private final ReadEnd[] inputEnds;
private ReadEnd outputEnd;
+ public GUIMerger(ViewModelModifiable model, int logicWidth)
+ {
+ this(model, logicWidth, null);
+ }
+
public GUIMerger(ViewModelModifiable model, int logicWidth, String name)
{
super(model, name);
public GUIMerger(ViewModelModifiable model, int logicWidth, String name)
{
super(model, name);
@@
-38,7
+44,7
@@
public class GUIMerger extends GUIComponent
double inputHeight = 0;
for (int i = 0; i < logicWidth; i++, inputHeight += 10)
addPin(new Pin(this, "I" + i, 1, 0, inputHeight));
double inputHeight = 0;
for (int i = 0; i < logicWidth; i++, inputHeight += 10)
addPin(new Pin(this, "I" + i, 1, 0, inputHeight));
- addPin(new Pin(this, "O", logicWidth, width, (logicWidth - 1) * heightPerPin / 2));
+ addPin(
this.outputPin =
new Pin(this, "O", logicWidth, width, (logicWidth - 1) * heightPerPin / 2));
inputEnds = new ReadEnd[logicWidth];
}
inputEnds = new ReadEnd[logicWidth];
}
@@
-82,6
+88,11
@@
public class GUIMerger extends GUIComponent
this.outputEnd = outputEnd;
}
this.outputEnd = outputEnd;
}
+ public Pin getOutputPin()
+ {
+ return outputPin;
+ }
+
static
{
ViewLogicModelAdapter.addComponentAdapter(new MergerAdapter());
static
{
ViewLogicModelAdapter.addComponentAdapter(new MergerAdapter());
diff --git
a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/GUISplitter.java
b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/GUISplitter.java
index
6ddc276
..
0ca71c7
100644
(file)
--- a/
net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/GUISplitter.java
+++ b/
net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/GUISplitter.java
@@
-26,16
+26,22
@@
public class GUISplitter extends GUIComponent
private static final double heightPerPin = 10;
public final int logicWidth;
private static final double heightPerPin = 10;
public final int logicWidth;
+ private final Pin inputPin;
private ReadEnd inputEnd;
private final ReadEnd[] outputEnds;
private ReadEnd inputEnd;
private final ReadEnd[] outputEnds;
+ public GUISplitter(ViewModelModifiable model, int logicWidth)
+ {
+ this(model, logicWidth, null);
+ }
+
public GUISplitter(ViewModelModifiable model, int logicWidth, String name)
{
super(model, name);
this.logicWidth = logicWidth;
setSize(width, logicWidth * heightPerPin);
public GUISplitter(ViewModelModifiable model, int logicWidth, String name)
{
super(model, name);
this.logicWidth = logicWidth;
setSize(width, logicWidth * heightPerPin);
- addPin(new Pin(this, "I", logicWidth, 0, (logicWidth - 1) * heightPerPin / 2));
+ addPin(
this.inputPin =
new Pin(this, "I", logicWidth, 0, (logicWidth - 1) * heightPerPin / 2));
double outputHeight = 0;
for (int i = 0; i < logicWidth; i++, outputHeight += 10)
addPin(new Pin(this, "O" + i, 1, width, outputHeight));
double outputHeight = 0;
for (int i = 0; i < logicWidth; i++, outputHeight += 10)
addPin(new Pin(this, "O" + i, 1, width, outputHeight));
@@
-82,6
+88,11
@@
public class GUISplitter extends GUIComponent
System.arraycopy(outputEnds, 0, this.outputEnds, 0, logicWidth);
}
System.arraycopy(outputEnds, 0, this.outputEnds, 0, logicWidth);
}
+ public Pin getInputPin()
+ {
+ return inputPin;
+ }
+
static
{
ViewLogicModelAdapter.addComponentAdapter(new SplitterAdapter());
static
{
ViewLogicModelAdapter.addComponentAdapter(new SplitterAdapter());