X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.ui%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fui%2Fmodel%2Fcomponents%2FSimpleRectangularSubmodelComponent.java;h=ec233625ffeb4ab566bf3e074fd0538e971e9988;hb=35df5a4186f12073d5cdc956b645b882b43b858a;hp=04a6fcc2aaf83c7409e5b3758d8063efffdd4a25;hpb=f14ea37d69488dd51518a36413af7176916b8bd7;p=Mograsim.git

diff --git a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/SimpleRectangularSubmodelComponent.java b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/SimpleRectangularSubmodelComponent.java
index 04a6fcc2..ec233625 100644
--- a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/SimpleRectangularSubmodelComponent.java
+++ b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/SimpleRectangularSubmodelComponent.java
@@ -8,14 +8,16 @@ import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
 
+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.ui.model.ModelVisitor;
 import net.mograsim.logic.ui.model.ViewModelModifiable;
 import net.mograsim.logic.ui.model.wires.MovablePin;
 import net.mograsim.logic.ui.model.wires.Pin;
+import net.mograsim.preferences.Preferences;
 
 public class SimpleRectangularSubmodelComponent extends SubmodelComponent
 {
@@ -98,6 +100,9 @@ public class SimpleRectangularSubmodelComponent extends SubmodelComponent
 		Font oldFont = gc.getFont();
 		gc.setFont(new Font(oldFont.getName(), labelFontHeight, oldFont.getStyle()));
 		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() + (getWidth() - textExtent.x) / 2, getPosY() + (getHeight() - textExtent.y) / 2, true);
 		gc.setFont(new Font(oldFont.getName(), pinNameFontHeight, oldFont.getStyle()));
 		for (int i = 0; i < inputPinNames.size(); i++)
@@ -119,6 +124,9 @@ public class SimpleRectangularSubmodelComponent extends SubmodelComponent
 	@Override
 	protected void renderOutline(GeneralGC gc, Rectangle visibleRegion)
 	{
+		Color foreground = Preferences.current().getColor("net.mograsim.logic.ui.color.foreground");
+		if (foreground != null)
+			gc.setForeground(foreground);
 		gc.drawRectangle(getBounds());
 	}
 
@@ -129,8 +137,8 @@ public class SimpleRectangularSubmodelComponent extends SubmodelComponent
 		ret.type = SimpleRectangularSubmodelComponent.class.getSimpleName();
 		Map<String, Object> m = new TreeMap<>();
 		m.put(kLabel, label);
-		m.put(kInCount, inputPinNames.size());
-		m.put(kOutCount, outputPinNames.size());
+		m.put(kInCount, inputPinNames.toArray());
+		m.put(kOutCount, outputPinNames.toArray());
 		m.put(kLogicWidth, logicWidth);
 		ret.specialized = m;
 		return ret;
@@ -156,10 +164,4 @@ public class SimpleRectangularSubmodelComponent extends SubmodelComponent
 		throw new UnsupportedOperationException(
 				"Can't set the size of a SimpleRectangularSubmodelComponent directly, call setInputPins / setOutputPins instead");
 	}
-
-	@Override
-	public void accept(ModelVisitor mv)
-	{
-		mv.visit(this);
-	}
 }
\ No newline at end of file