Made LogicUIPart work again
authorDaniel Kirschten <daniel.kirschten@gmx.de>
Mon, 27 May 2019 21:27:57 +0000 (23:27 +0200)
committerDaniel Kirschten <daniel.kirschten@gmx.de>
Mon, 27 May 2019 21:27:57 +0000 (23:27 +0200)
LogicUI/src/era/mi/gui/examples/RSLatchGUIExample.java
SampleERCP/src/sampleercp/parts/LogicUIPart.java

index 3665952..49dadc8 100644 (file)
@@ -15,16 +15,16 @@ public class RSLatchGUIExample
        private static final int WIRE_DELAY = 10;\r
        private static final int OR_DELAY = 50;\r
        private static final int NOT_DELAY = 50;\r
-       private static final Timeline t = new Timeline(11);\r
 \r
        public static void main(String[] args)\r
        {\r
+               Timeline t = new Timeline(11);\r
                LogicUIStandalone ui = new LogicUIStandalone(t);\r
-               addComponentsAndWires(ui.getLogicUICanvas());\r
+               addComponentsAndWires(ui.getLogicUICanvas(), t);\r
                ui.run();\r
        }\r
 \r
-       public static void addComponentsAndWires(LogicUICanvas ui)\r
+       public static void addComponentsAndWires(LogicUICanvas ui, Timeline t)\r
        {\r
                Wire r = new Wire(t, 1, WIRE_DELAY);\r
                Wire s = new Wire(t, 1, WIRE_DELAY);\r
index 481879c..f725d5b 100644 (file)
@@ -22,7 +22,7 @@ public class LogicUIPart
        {
                Timeline timeline = new Timeline(11);
                LogicUICanvas ui = new LogicUICanvas(parent, SWT.NONE);
-               RSLatchGUIExample.addComponentsAndWires(ui);
+               RSLatchGUIExample.addComponentsAndWires(ui, timeline);
                ui.addTransformListener((x, y, z) -> part.setDirty(z < 1));
                ZoomableCanvasUserInput userInput = new ZoomableCanvasUserInput(ui);
                userInput.buttonDrag = 3;