projects
/
Mograsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Commented GUIWire
[Mograsim.git]
/
net.mograsim.logic.ui
/
src
/
net
/
mograsim
/
logic
/
ui
/
model
/
wires
/
WireCrossPoint.java
diff --git
a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/wires/WireCrossPoint.java
b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/wires/WireCrossPoint.java
index
e48d775
..
2235376
100644
(file)
--- a/
net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/wires/WireCrossPoint.java
+++ b/
net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/wires/WireCrossPoint.java
@@
-1,5
+1,7
@@
package net.mograsim.logic.ui.model.wires;
package net.mograsim.logic.ui.model.wires;
+import java.util.Map;
+
import net.haspamelodica.swt.helper.gcs.GeneralGC;
import net.haspamelodica.swt.helper.swtobjectwrappers.Rectangle;
import net.mograsim.logic.core.LogicObservable;
import net.haspamelodica.swt.helper.gcs.GeneralGC;
import net.haspamelodica.swt.helper.swtobjectwrappers.Rectangle;
import net.mograsim.logic.core.LogicObservable;
@@
-9,6
+11,7
@@
import net.mograsim.logic.core.wires.Wire.ReadEnd;
import net.mograsim.logic.ui.ColorHelper;
import net.mograsim.logic.ui.model.ViewModelModifiable;
import net.mograsim.logic.ui.model.components.GUIComponent;
import net.mograsim.logic.ui.ColorHelper;
import net.mograsim.logic.ui.model.ViewModelModifiable;
import net.mograsim.logic.ui.model.components.GUIComponent;
+import net.mograsim.logic.ui.model.components.SimpleRectangularGUIGate;
public class WireCrossPoint extends GUIComponent
{
public class WireCrossPoint extends GUIComponent
{
@@
-39,9
+42,8
@@
public class WireCrossPoint extends GUIComponent
@Override
public void render(GeneralGC gc, Rectangle visibleRegion)
{
@Override
public void render(GeneralGC gc, Rectangle visibleRegion)
{
- Rectangle bounds = getBounds();
ColorHelper.executeWithDifferentBackground(gc, BitVectorFormatter.formatAsColor(end),
ColorHelper.executeWithDifferentBackground(gc, BitVectorFormatter.formatAsColor(end),
- () -> gc.fillOval(
bounds.x, bounds.y
, CIRCLE_DIAM, CIRCLE_DIAM));
+ () -> gc.fillOval(
getPosX(), getPosY()
, CIRCLE_DIAM, CIRCLE_DIAM));
}
public void setLogicModelBinding(ReadEnd end)
}
public void setLogicModelBinding(ReadEnd end)
@@
-72,4
+74,13
@@
public class WireCrossPoint extends GUIComponent
{
return pin;
}
{
return pin;
}
+
+ @Override
+ public Map<String, Object> getInstantiationParameters()
+ {
+ Map<String, Object> m = super.getInstantiationParameters();
+ m.put(SimpleRectangularGUIGate.kLogicWidth, logicWidth);
+ return m;
+ }
+
}
\ No newline at end of file
}
\ No newline at end of file