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:
7ee61bc
)
Improved rendering of GUIMerger and GUISplitter
author
Daniel Kirschten
<daniel.kirschten@gmx.de>
Mon, 19 Aug 2019 08:35:11 +0000
(10:35 +0200)
committer
Daniel Kirschten
<daniel.kirschten@gmx.de>
Mon, 19 Aug 2019 08:35:11 +0000
(10:35 +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
a287dd8
..
ad1d51e
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
@@
-1,5
+1,7
@@
package net.mograsim.logic.model.model.components.atomic;
\r
\r
package net.mograsim.logic.model.model.components.atomic;
\r
\r
+import org.eclipse.swt.SWT;
\r
+
\r
import com.google.gson.JsonElement;
\r
import com.google.gson.JsonPrimitive;
\r
\r
import com.google.gson.JsonElement;
\r
import com.google.gson.JsonPrimitive;
\r
\r
@@
-55,7
+57,12
@@
public class GUIMerger extends GUIComponent
gc.drawLine(posX, inputHeight, posX + width / 2, inputHeight);
\r
}
\r
gc.setForeground(Preferences.current().getColor("net.mograsim.logic.model.color.foreground"));
\r
gc.drawLine(posX, inputHeight, posX + width / 2, inputHeight);
\r
}
\r
gc.setForeground(Preferences.current().getColor("net.mograsim.logic.model.color.foreground"));
\r
+ int oldLineCap = gc.getLineCap();
\r
+ int lineJoin = gc.getLineJoin();
\r
+ // TODO find better "replacement" for JOIN_BEVEL
\r
+ gc.setLineCap(lineJoin == SWT.JOIN_MITER ? SWT.CAP_SQUARE : lineJoin == SWT.JOIN_ROUND ? SWT.CAP_ROUND : SWT.CAP_SQUARE);
\r
gc.drawLine(posX + width / 2, posY, posX + width / 2, posY + heightPerPin * (logicWidth - 1));
\r
gc.drawLine(posX + width / 2, posY, posX + width / 2, posY + heightPerPin * (logicWidth - 1));
\r
+ gc.setLineCap(oldLineCap);
\r
ColorDefinition c = BitVectorFormatter.formatAsColor(outputEnd);
\r
if (c != null)
\r
gc.setForeground(ColorManager.current().toColor(c));
\r
ColorDefinition c = BitVectorFormatter.formatAsColor(outputEnd);
\r
if (c != null)
\r
gc.setForeground(ColorManager.current().toColor(c));
\r
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
1ffe79d
..
08ce951
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
@@
-1,5
+1,7
@@
package net.mograsim.logic.model.model.components.atomic;
\r
\r
package net.mograsim.logic.model.model.components.atomic;
\r
\r
+import org.eclipse.swt.SWT;
\r
+
\r
import com.google.gson.JsonElement;
\r
import com.google.gson.JsonPrimitive;
\r
\r
import com.google.gson.JsonElement;
\r
import com.google.gson.JsonPrimitive;
\r
\r
@@
-52,7
+54,12
@@
public class GUISplitter extends GUIComponent
double inLineY = posY + (logicWidth - 1) * heightPerPin / 2;
\r
gc.drawLine(posX, inLineY, posX + width / 2, inLineY);
\r
gc.setForeground(Preferences.current().getColor("net.mograsim.logic.model.color.foreground"));
\r
double inLineY = posY + (logicWidth - 1) * heightPerPin / 2;
\r
gc.drawLine(posX, inLineY, posX + width / 2, inLineY);
\r
gc.setForeground(Preferences.current().getColor("net.mograsim.logic.model.color.foreground"));
\r
+ int oldLineCap = gc.getLineCap();
\r
+ int lineJoin = gc.getLineJoin();
\r
+ // TODO find better "replacement" for JOIN_BEVEL
\r
+ gc.setLineCap(lineJoin == SWT.JOIN_MITER ? SWT.CAP_SQUARE : lineJoin == SWT.JOIN_ROUND ? SWT.CAP_ROUND : SWT.CAP_SQUARE);
\r
gc.drawLine(posX + width / 2, posY, posX + width / 2, posY + heightPerPin * (logicWidth - 1));
\r
gc.drawLine(posX + width / 2, posY, posX + width / 2, posY + heightPerPin * (logicWidth - 1));
\r
+ gc.setLineCap(oldLineCap);
\r
double outputHeight = posY;
\r
for (int i = 0; i < logicWidth; i++, outputHeight += 10)
\r
{
\r
double outputHeight = posY;
\r
for (int i = 0; i < logicWidth; i++, outputHeight += 10)
\r
{
\r