X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.model%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Fmodel%2Fcomponents%2Fatomic%2FGUIManualSwitch.java;h=48bff90f88b61b9d214a24441004214e166b395c;hb=0a04a4ed66ecebd4254541c4977599f6052c115a;hp=daa7bd9acba87616d3d35ec701dd41f2e1e6ae91;hpb=21ffb2a7f764069fb3c55b71647b43e8803e668c;p=Mograsim.git

diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/GUIManualSwitch.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/GUIManualSwitch.java
index daa7bd9a..48bff90f 100644
--- a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/GUIManualSwitch.java
+++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/GUIManualSwitch.java
@@ -2,15 +2,13 @@ package net.mograsim.logic.model.model.components.atomic;
 
 import org.eclipse.swt.graphics.Color;
 
-import com.google.gson.JsonElement;
-import com.google.gson.JsonPrimitive;
-
 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.LogicObserver;
-import net.mograsim.logic.core.components.ManualSwitch;
+import net.mograsim.logic.core.components.CoreManualSwitch;
+import net.mograsim.logic.core.types.Bit;
 import net.mograsim.logic.core.types.BitVector;
 import net.mograsim.logic.core.types.BitVectorFormatter;
 import net.mograsim.logic.model.model.ViewModelModifiable;
@@ -19,7 +17,7 @@ import net.mograsim.logic.model.model.wires.Pin;
 import net.mograsim.logic.model.model.wires.PinUsage;
 import net.mograsim.logic.model.modeladapter.ViewLogicModelAdapter;
 import net.mograsim.logic.model.modeladapter.componentadapters.ManualSwitchAdapter;
-import net.mograsim.logic.model.serializing.IdentifierGetter;
+import net.mograsim.logic.model.serializing.IdentifyParams;
 import net.mograsim.logic.model.serializing.IndirectGUIComponentCreator;
 import net.mograsim.preferences.Preferences;
 
@@ -28,12 +26,13 @@ public class GUIManualSwitch extends GUIComponent
 	private static final double width = 20;
 	private static final double height = 15;
 	private static final double fontHeight = 5;
+	private static final double heightMiniButtons = 4; // 0 is disabled
 
 	public final int logicWidth;
 	private final Pin outputPin;
 
 	private final LogicObserver logicObs;
-	private ManualSwitch logicSwitch;
+	private CoreManualSwitch logicSwitch;
 
 	public GUIManualSwitch(ViewModelModifiable model, int logicWidth)
 	{
@@ -67,9 +66,33 @@ public class GUIManualSwitch extends GUIComponent
 			gc.setForeground(textColor);
 		gc.drawText(label, getPosX() + (width - textExtent.x) / 2, getPosY() + (height - textExtent.y) / 2, true);
 		gc.setFont(oldFont);
+
+		if (logicSwitch != null && logicWidth > 1 && heightMiniButtons > 0 && visibleRegion.y < getPosY() + heightMiniButtons)
+		{
+			double x = getPosX();
+			double y = getPosY();
+			gc.drawLine(x, y + heightMiniButtons, x + width, y + heightMiniButtons);
+			Color c = gc.getBackground();
+			gc.setBackground(gc.getForeground());
+			BitVector bv = logicSwitch.getValues();
+			double part = width / bv.length();
+			for (int i = 0; i < bv.length(); i++)
+			{
+				double start = x + part * i;
+				if (i != 0)
+					gc.drawLine(start, y, start, y + heightMiniButtons);
+				if (bv.getMSBit(i) == Bit.ONE)
+				{
+//					gc.fillRectangle(start, y, part, heightMiniButtons); // alternative, but not always visible what Bit is where 
+					gc.drawLine(start, y, start + part, y + heightMiniButtons);
+					gc.drawLine(start + part, y, start, y + heightMiniButtons);
+				}
+			}
+			gc.setBackground(c);
+		}
 	}
 
-	public void setLogicModelBinding(ManualSwitch logicSwitch)
+	public void setLogicModelBinding(CoreManualSwitch logicSwitch)
 	{
 		if (this.logicSwitch != null)
 			this.logicSwitch.deregisterObserver(logicObs);
@@ -116,11 +139,20 @@ public class GUIManualSwitch extends GUIComponent
 	public boolean clicked(double x, double y)
 	{
 		if (logicSwitch != null)
-			logicSwitch.toggle();
+		{
+			if (heightMiniButtons > 0 && y - getPosY() < heightMiniButtons)
+			{
+				int part = (int) ((x - getPosX()) * logicWidth / width);
+				logicSwitch.setState(logicSwitch.getValues().withBitChanged(part, Bit::not));
+			} else
+			{
+				logicSwitch.toggle();
+			}
+		}
 		return true;
 	}
 
-	public ManualSwitch getManualSwitch()
+	public CoreManualSwitch getManualSwitch()
 	{
 		return logicSwitch;
 	}
@@ -131,9 +163,15 @@ public class GUIManualSwitch extends GUIComponent
 	}
 
 	@Override
-	public JsonElement getParamsForSerializing(IdentifierGetter idGetter)
+	public String getIDForSerializing(IdentifyParams idParams)
+	{
+		return "GUIManualSwitch";
+	}
+
+	@Override
+	public Integer getParamsForSerializing(IdentifyParams idParams)
 	{
-		return new JsonPrimitive(logicWidth);
+		return logicWidth;
 	}
 
 	static