X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=net.mograsim.logic.ui%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fui%2Fmodel%2Fcomponents%2FGUIBitDisplay.java;h=3b909c51763f8ce1d6f9d87bcf8047cd91ed412f;hb=67c7e16eac6ef555f7ebe0cbe6048598d7f1187e;hp=4a75f541b5d3c14836a543c4645c84a35b8b3d7d;hpb=41d70703ef1579e85a0965bd1e09cac4b47d52c1;p=Mograsim.git

diff --git a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/GUIBitDisplay.java b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/GUIBitDisplay.java
index 4a75f541..3b909c51 100644
--- a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/GUIBitDisplay.java
+++ b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/GUIBitDisplay.java
@@ -1,15 +1,19 @@
 package net.mograsim.logic.ui.model.components;
 
+import org.eclipse.swt.graphics.Color;
+
 import net.haspamelodica.swt.helper.gcs.GeneralGC;
 import net.haspamelodica.swt.helper.swtobjectwrappers.Font;
 import net.haspamelodica.swt.helper.swtobjectwrappers.Point;
 import net.haspamelodica.swt.helper.swtobjectwrappers.Rectangle;
-import net.mograsim.logic.core.LogicObservable;
 import net.mograsim.logic.core.LogicObserver;
 import net.mograsim.logic.core.components.BitDisplay;
 import net.mograsim.logic.core.types.BitVectorFormatter;
-import net.mograsim.logic.ui.model.ViewModel;
+import net.mograsim.logic.ui.model.ViewModelModifiable;
 import net.mograsim.logic.ui.model.wires.Pin;
+import net.mograsim.logic.ui.modeladapter.ViewLogicModelAdapter;
+import net.mograsim.logic.ui.modeladapter.componentadapters.BitDisplayAdapter;
+import net.mograsim.preferences.Preferences;
 
 public class GUIBitDisplay extends GUIComponent
 {
@@ -22,54 +26,61 @@ public class GUIBitDisplay extends GUIComponent
 	private final LogicObserver logicObs;
 	private BitDisplay bitDisplay;
 
-	public GUIBitDisplay(ViewModel model)
+	public GUIBitDisplay(ViewModelModifiable model)
 	{
 		super(model);
-		logicObs = (i) -> callComponentLookChangedListeners();
+		logicObs = (i) -> requestRedraw();
 
 		setSize(width, height);
-		addPin(this.inputPin = new Pin(this, 1, 0, height / 2));
+		addPin(this.inputPin = new Pin(this, "", 1, 0, height / 2));
 	}
 
 	@Override
 	public void render(GeneralGC gc, Rectangle visibleRegion)
 	{
-		double posX = getBounds().x;
-		double posY = getBounds().y;
-
-		// TODO maybe draw switch state too?
-		gc.drawRectangle(posX, posY, width, height);
+		Color foreground = Preferences.current().getColor("net.mograsim.logic.ui.color.foreground");
+		if (foreground != null)
+			gc.setForeground(foreground);
+		gc.drawRectangle(getBounds());
 		String label = bitDisplay == null ? BitVectorFormatter.formatAsString(null)
 				: BitVectorFormatter.formatAsString(bitDisplay.getDisplayedValue());
 		Font oldFont = gc.getFont();
 		Font labelFont = new Font(oldFont.getName(), fontHeight, oldFont.getStyle());
 		gc.setFont(labelFont);
 		Point textExtent = gc.textExtent(label);
-		gc.drawText(label, posX + (width - textExtent.x) / 2, posY + (height - textExtent.y) / 2, true);
+		Color textColor = Preferences.current().getColor("net.mograsim.logic.ui.color.text");
+		if (textColor != null)
+			gc.setForeground(textColor);
+		gc.drawText(label, getPosX() + (width - textExtent.x) / 2, getPosY() + (height - textExtent.y) / 2, true);
 		gc.setFont(oldFont);
 	}
 
 	public void setLogicModelBinding(BitDisplay bitDisplay)
 	{
-		deregisterLogicObs(this.bitDisplay);
+		if (this.bitDisplay != null)
+			this.bitDisplay.deregisterObserver(logicObs);
 		this.bitDisplay = bitDisplay;
-		registerLogicObs(bitDisplay);
+		if (bitDisplay != null)
+			bitDisplay.registerObserver(logicObs);
 	}
 
-	private void registerLogicObs(LogicObservable observable)
+	public boolean hasLogicModelBinding()
 	{
-		if (observable != null)
-			observable.registerObserver(logicObs);
+		return bitDisplay != null;
 	}
 
-	private void deregisterLogicObs(LogicObservable observable)
+	public BitDisplay getBitDisplay()
 	{
-		if (observable != null)
-			observable.deregisterObserver(logicObs);
+		return bitDisplay;
 	}
 
 	public Pin getInputPin()
 	{
 		return inputPin;
 	}
+
+	static
+	{
+		ViewLogicModelAdapter.addComponentAdapter(new BitDisplayAdapter());
+	}
 }
\ No newline at end of file