This is how it might look later

[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 9426f2c..42fada8 100644 (file)
--- a/net.mograsim.plugin.core/src/net/mograsim/plugin/SimulationPreview.java
+++ b/net.mograsim.plugin.core/src/net/mograsim/plugin/SimulationPreview.java
@@ -6,37 +6,44 @@ import org.eclipse.ui.themes.ITheme;
 import org.eclipse.ui.themes.IThemePreview;
 
 import net.haspamelodica.swt.helper.swtobjectwrappers.Point;
-import net.haspamelodica.swt.helper.zoomablecanvas.helper.ZoomableCanvasUserInput;
 import net.mograsim.logic.core.timeline.Timeline;
-import net.mograsim.logic.ui.LogicExecuter;
-import net.mograsim.logic.ui.LogicUICanvas;
-import net.mograsim.logic.ui.model.ViewModelModifiable;
-import net.mograsim.logic.ui.model.components.GUIManualSwitch;
-import net.mograsim.logic.ui.model.components.GUINotGate;
-import net.mograsim.logic.ui.model.components.GUIOrGate;
-import net.mograsim.logic.ui.model.wires.GUIWire;
-import net.mograsim.logic.ui.model.wires.WireCrossPoint;
-import net.mograsim.logic.ui.modeladapter.LogicModelParameters;
-import net.mograsim.logic.ui.modeladapter.ViewLogicModelAdapter;
+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.components.atomic.GUIManualSwitch;
+import net.mograsim.logic.model.model.components.atomic.GUINotGate;
+import net.mograsim.logic.model.model.components.atomic.GUIOrGate;
+import net.mograsim.logic.model.model.wires.GUIWire;
+import net.mograsim.logic.model.model.wires.WireCrossPoint;
+import net.mograsim.logic.model.modeladapter.LogicModelParameters;
+import net.mograsim.logic.model.modeladapter.ViewLogicModelAdapter;
+import net.mograsim.preferences.Preferences;
 
 public class SimulationPreview implements IThemePreview
 {
-
        private LogicUICanvas ui;
        private LogicExecuter exec;
+       private Preferences oldPreferences;
+       private Preferences currentThemePreferences;
 
        @Override
        @SuppressWarnings("unused")
        public void createControl(Composite parent, ITheme currentTheme)
        {
+               oldPreferences = Preferences.current();
+
+               currentThemePreferences = new ThemePreferences(currentTheme);
+               // 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();
                params.gateProcessTime = 50;
                params.wireTravelTime = 10;
 
-               GUIManualSwitch rIn = new GUIManualSwitch(model);
+               GUIManualSwitch rIn = new GUIManualSwitch(model, 1);
                rIn.moveTo(10, 10);
-               GUIManualSwitch sIn = new GUIManualSwitch(model);
+               GUIManualSwitch sIn = new GUIManualSwitch(model, 1);
                sIn.moveTo(10, 70);
 
                GUIOrGate or1 = new GUIOrGate(model, 1);
@@ -79,26 +86,18 @@ public class SimulationPreview implements IThemePreview
                rIn.clicked(0, 0);
 
                ui = new LogicUICanvas(parent, SWT.NONE, model);
-               ZoomableCanvasUserInput userInput = new ZoomableCanvasUserInput(ui);
-               userInput.buttonDrag = 3;
-               userInput.buttonZoom = 2;
-               userInput.enableUserInput();
-               update(currentTheme);
-               currentTheme.getColorRegistry().addListener(e -> update(currentTheme));
-
-               ui.zoomSteps(12, 10, 10);
+
+               ui.zoom(3.5, 10, 10);
                exec.startLiveExecution();
-       }
 
-       private void update(ITheme currentTheme)
-       {
-               ui.setBackground(currentTheme.getColorRegistry().get("net.mograsim.plugin.sim_backgound"));
-               ui.setForeground(currentTheme.getColorRegistry().get("net.mograsim.plugin.sim_text_color"));
+               currentTheme.addPropertyChangeListener(e -> ui.redraw());
        }
 
        @Override
        public void dispose()
        {
                exec.stopLiveExecution();
+               if (Preferences.current() == currentThemePreferences)
+                       Preferences.setPreferences(oldPreferences);
        }
 }