X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.model%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fmodel%2FLogicUIRenderer.java;h=1df2f7b7ef415f79848922dfd712e7d3fb8f3885;hb=3a52b6bffe52db5dd5ca907b4b3dfd368a58e14f;hp=c85dd53165ba1727987782192dd57f9e5c8e9bbc;hpb=b5d8c2d71e27350ea7c9314e40df5bb0584271cd;p=Mograsim.git

diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/LogicUIRenderer.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/LogicUIRenderer.java
index c85dd531..1df2f7b7 100644
--- a/net.mograsim.logic.model/src/net/mograsim/logic/model/LogicUIRenderer.java
+++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/LogicUIRenderer.java
@@ -5,17 +5,18 @@ import org.eclipse.swt.SWT;
 import net.haspamelodica.swt.helper.gcs.GeneralGC;
 import net.haspamelodica.swt.helper.swtobjectwrappers.Point;
 import net.haspamelodica.swt.helper.swtobjectwrappers.Rectangle;
-import net.mograsim.logic.model.model.ViewModel;
-import net.mograsim.logic.model.model.components.GUIComponent;
+import net.mograsim.logic.model.model.LogicModel;
+import net.mograsim.logic.model.model.components.ModelComponent;
 import net.mograsim.logic.model.model.wires.Pin;
+import net.mograsim.preferences.Preferences;
 
 public class LogicUIRenderer
 {
 	private static final boolean DRAW_PINS = false;
 
-	private final ViewModel model;
+	private final LogicModel model;
 
-	public LogicUIRenderer(ViewModel model)
+	public LogicUIRenderer(LogicModel model)
 	{
 		this.model = model;
 	}
@@ -24,8 +25,8 @@ public class LogicUIRenderer
 	{
 		gc.setAntialias(SWT.ON);
 		gc.setClipping(visibleRegion);
-		gc.setLineWidth(.5);
-		model.getWires().forEach(w ->
+		gc.setLineWidth(Preferences.current().getDouble("net.mograsim.logic.model.linewidth.default"));
+		model.getWiresByName().values().forEach(w ->
 		{
 			Rectangle bounds = w.getBounds();
 			double lw = gc.getLineWidth();
@@ -35,7 +36,7 @@ public class LogicUIRenderer
 		model.getComponentsByName().values().forEach(c -> renderComponent(gc, c, visibleRegion));
 	}
 
-	private static void renderComponent(GeneralGC gc, GUIComponent component, Rectangle visibleRegion)
+	private static void renderComponent(GeneralGC gc, ModelComponent component, Rectangle visibleRegion)
 	{
 		Rectangle bounds = component.getBounds();
 		double lw = gc.getLineWidth();