X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.ui%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fui%2Fmodel%2Fcomponents%2FGUIBitDisplay.java;h=3b909c51763f8ce1d6f9d87bcf8047cd91ed412f;hb=6c1fd50db4ade47f87011879b4a6548495eb183f;hp=c4d8df3891f2cd48d0b42a9a7460af8ffc971c93;hpb=f14ea37d69488dd51518a36413af7176916b8bd7;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 c4d8df38..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,18 +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.ModelVisitor;
 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
 {
@@ -37,6 +38,9 @@ public class GUIBitDisplay extends GUIComponent
 	@Override
 	public void render(GeneralGC gc, Rectangle visibleRegion)
 	{
+		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());
@@ -44,27 +48,25 @@ public class GUIBitDisplay extends GUIComponent
 		Font labelFont = new Font(oldFont.getName(), fontHeight, oldFont.getStyle());
 		gc.setFont(labelFont);
 		Point textExtent = gc.textExtent(label);
+		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);
-	}
-
-	private void registerLogicObs(LogicObservable observable)
-	{
-		if (observable != null)
-			observable.registerObserver(logicObs);
+		if (bitDisplay != null)
+			bitDisplay.registerObserver(logicObs);
 	}
 
-	private void deregisterLogicObs(LogicObservable observable)
+	public boolean hasLogicModelBinding()
 	{
-		if (observable != null)
-			observable.deregisterObserver(logicObs);
+		return bitDisplay != null;
 	}
 
 	public BitDisplay getBitDisplay()
@@ -77,12 +79,6 @@ public class GUIBitDisplay extends GUIComponent
 		return inputPin;
 	}
 
-	@Override
-	public void accept(ModelVisitor mv)
-	{
-		mv.visit(this);
-	}
-
 	static
 	{
 		ViewLogicModelAdapter.addComponentAdapter(new BitDisplayAdapter());