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=8a2ef4e3f6491aea83a54f60c7509820cf52f1d8;hpb=b6235ae81c28ddf0ddb585a21236df1541d1e7fb;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 8a2ef4e3..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,8 +5,8 @@ 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; @@ -14,9 +14,9 @@ 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; } @@ -25,7 +25,7 @@ public class LogicUIRenderer { gc.setAntialias(SWT.ON); gc.setClipping(visibleRegion); - gc.setLineWidth(Preferences.current().getDouble("net.mograsim.logic.model.linewidth")); + gc.setLineWidth(Preferences.current().getDouble("net.mograsim.logic.model.linewidth.default")); model.getWiresByName().values().forEach(w -> { Rectangle bounds = w.getBounds(); @@ -36,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();