Fixed a bug in Am2900; created dlatch8/80; relayouted some components

[Mograsim.git] / net.mograsim.plugin.core / src / net / mograsim / plugin / SimulationPreview.java

diff --git a/net.mograsim.plugin.core/src/net/mograsim/plugin/SimulationPreview.java b/net.mograsim.plugin.core/src/net/mograsim/plugin/SimulationPreview.java
index f669a49..5fcc168 100644 (file)
--- a/net.mograsim.plugin.core/src/net/mograsim/plugin/SimulationPreview.java
+++ b/net.mograsim.plugin.core/src/net/mograsim/plugin/SimulationPreview.java
@@ -9,14 +9,14 @@ import net.haspamelodica.swt.helper.swtobjectwrappers.Point;
 import net.mograsim.logic.core.timeline.Timeline;
 import net.mograsim.logic.model.LogicExecuter;
 import net.mograsim.logic.model.LogicUICanvas;
-import net.mograsim.logic.model.model.ViewModelModifiable;
+import net.mograsim.logic.model.model.LogicModelModifiable;
 import net.mograsim.logic.model.model.components.atomic.ModelManualSwitch;
 import net.mograsim.logic.model.model.components.atomic.ModelNotGate;
 import net.mograsim.logic.model.model.components.atomic.ModelOrGate;
 import net.mograsim.logic.model.model.wires.ModelWire;
 import net.mograsim.logic.model.model.wires.ModelWireCrossPoint;
-import net.mograsim.logic.model.modeladapter.LogicModelParameters;
-import net.mograsim.logic.model.modeladapter.ViewLogicModelAdapter;
+import net.mograsim.logic.model.modeladapter.CoreModelParameters;
+import net.mograsim.logic.model.modeladapter.LogicCoreAdapter;
 import net.mograsim.preferences.Preferences;
 
 public class SimulationPreview implements IThemePreview
@@ -36,8 +36,8 @@ public class SimulationPreview implements IThemePreview
                // TODO this will change the global preferences; so if another LogicUICanvas redraws, it will use the "new" colors too.
                Preferences.setPreferences(currentThemePreferences);
 
-               ViewModelModifiable model = new ViewModelModifiable();
-               LogicModelParameters params = new LogicModelParameters();
+               LogicModelModifiable model = new LogicModelModifiable();
+               CoreModelParameters params = new CoreModelParameters();
                params.gateProcessTime = 50;
                params.wireTravelTime = 10;
 
@@ -80,7 +80,7 @@ public class SimulationPreview implements IThemePreview
                o2.moveCenterTo(150, 72.5);
                new ModelWire(model, p2, o2);
 
-               Timeline t = ViewLogicModelAdapter.convert(model, params);
+               Timeline t = LogicCoreAdapter.convert(model, params);
                exec = new LogicExecuter(t);
 
                rIn.clicked(0, 0);