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:
bfd483e
)
Fixed GUIMerger/GUISplitter rendering
author
Daniel Kirschten
<daniel.kirschten@gmx.de>
Mon, 2 Sep 2019 10:52:20 +0000
(12:52 +0200)
committer
Daniel Kirschten
<daniel.kirschten@gmx.de>
Mon, 2 Sep 2019 10:52:20 +0000
(12:52 +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
85cafec
..
4d29042
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
@@
-60,8
+60,8
@@
public class GUIMerger extends GUIComponent
gc.setForeground(ColorManager.current().toColor(c));
double outLineY = posY + (logicWidth - 1) * heightPerPin / 2;
gc.drawLine(posX + width / 2, outLineY, posX + width, outLineY);
gc.setForeground(ColorManager.current().toColor(c));
double outLineY = posY + (logicWidth - 1) * heightPerPin / 2;
gc.drawLine(posX + width / 2, outLineY, posX + width, outLineY);
- double inputHeight = posY;
- for (int i = 0; i < logicWidth; i++, inputHeight
+
= 10)
+ double inputHeight = posY
+ (logicWidth - 1) * heightPerPin
;
+ for (int i = 0; i < logicWidth; i++, inputHeight
-
= 10)
{
c = BitVectorFormatter.formatAsColor(inputEnds[i]);
if (c != null)
{
c = BitVectorFormatter.formatAsColor(inputEnds[i]);
if (c != null)
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
8fc4679
..
0962daa
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
@@
-60,8
+60,8
@@
public class GUISplitter extends GUIComponent
gc.setForeground(ColorManager.current().toColor(c));
double inLineY = posY + (logicWidth - 1) * heightPerPin / 2;
gc.drawLine(posX, inLineY, posX + width / 2, inLineY);
gc.setForeground(ColorManager.current().toColor(c));
double inLineY = posY + (logicWidth - 1) * heightPerPin / 2;
gc.drawLine(posX, inLineY, posX + width / 2, inLineY);
- double outputHeight = posY;
- for (int i = 0; i < logicWidth; i++, outputHeight
+
= 10)
+ double outputHeight = posY
+ (logicWidth - 1) * heightPerPin
;
+ for (int i = 0; i < logicWidth; i++, outputHeight
-
= 10)
{
c = BitVectorFormatter.formatAsColor(outputEnds[i]);
if (c != null)
{
c = BitVectorFormatter.formatAsColor(outputEnds[i]);
if (c != null)