X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=plugins%2Fnet.mograsim.logic.model%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Fmodel%2Fcomponents%2Fatomic%2FModelBitDisplay.java;h=8bff082fab96f1813954228473af462c25424042;hb=5711229bc04a9495a84f09f6baf446283f228923;hp=5be3e22de69b9c7aae2f6fd6265c27b8c19ea112;hpb=ce59b30bcd1139d2cdd497e2903f239a2d0084dd;p=Mograsim.git

diff --git a/plugins/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/ModelBitDisplay.java b/plugins/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/ModelBitDisplay.java
index 5be3e22d..8bff082f 100644
--- a/plugins/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/ModelBitDisplay.java
+++ b/plugins/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/ModelBitDisplay.java
@@ -8,7 +8,6 @@ import net.haspamelodica.swt.helper.swtobjectwrappers.Point;
 import net.haspamelodica.swt.helper.swtobjectwrappers.Rectangle;
 import net.mograsim.logic.core.LogicObserver;
 import net.mograsim.logic.core.components.CoreBitDisplay;
-import net.mograsim.logic.core.types.BitVector;
 import net.mograsim.logic.core.types.BitVectorFormatter;
 import net.mograsim.logic.model.model.LogicModelModifiable;
 import net.mograsim.logic.model.model.components.ModelComponent;
@@ -23,7 +22,7 @@ import net.mograsim.preferences.Preferences;
 public class ModelBitDisplay extends ModelComponent
 {
 	private static final double width = 20;
-	private static final double height = 15;
+	private static final double height = 10;
 	private static final double fontHeight = 5;
 
 	public final int logicWidth;
@@ -56,15 +55,7 @@ public class ModelBitDisplay extends ModelComponent
 		if (foreground != null)
 			gc.setForeground(foreground);
 		gc.drawRectangle(getBounds());
-		String label;
-		if (bitDisplay == null)
-			label = BitVectorFormatter.formatAsString(null);
-		else
-		{
-			BitVector toDisplay = bitDisplay.getDisplayedValue();
-			label = toDisplay != null && toDisplay.isHighImpedance() ? "-"
-					: BitVectorFormatter.formatAsString(bitDisplay.getDisplayedValue());
-		}
+		String label = BitVectorFormatter.formatAsString(bitDisplay == null ? null : bitDisplay.getDisplayedValue(), true);
 		Font oldFont = gc.getFont();
 		Font labelFont = new Font(oldFont.getName(), fontHeight, oldFont.getStyle());
 		gc.setFont(labelFont);