From 6ab8014cf6bb882187ab4d22fdf460dc0adbc2ab Mon Sep 17 00:00:00 2001 From: Daniel Kirschten Date: Mon, 27 May 2019 23:27:57 +0200 Subject: [PATCH] Made LogicUIPart work again --- LogicUI/src/era/mi/gui/examples/RSLatchGUIExample.java | 6 +++--- SampleERCP/src/sampleercp/parts/LogicUIPart.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/LogicUI/src/era/mi/gui/examples/RSLatchGUIExample.java b/LogicUI/src/era/mi/gui/examples/RSLatchGUIExample.java index cb5f1780..dc6091f6 100644 --- a/LogicUI/src/era/mi/gui/examples/RSLatchGUIExample.java +++ b/LogicUI/src/era/mi/gui/examples/RSLatchGUIExample.java @@ -15,16 +15,16 @@ public class RSLatchGUIExample private static final int WIRE_DELAY = 10; private static final int OR_DELAY = 50; private static final int NOT_DELAY = 50; - private static final Timeline t = new Timeline(11); public static void main(String[] args) { + Timeline t = new Timeline(11); LogicUIStandalone ui = new LogicUIStandalone(t); - addComponentsAndWires(ui.getLogicUICanvas()); + addComponentsAndWires(ui.getLogicUICanvas(), t); ui.run(); } - public static void addComponentsAndWires(LogicUICanvas ui) + public static void addComponentsAndWires(LogicUICanvas ui, Timeline t) { Wire r = new Wire(t, 1, WIRE_DELAY); Wire s = new Wire(t, 1, WIRE_DELAY); diff --git a/SampleERCP/src/sampleercp/parts/LogicUIPart.java b/SampleERCP/src/sampleercp/parts/LogicUIPart.java index 481879c6..f725d5b6 100644 --- a/SampleERCP/src/sampleercp/parts/LogicUIPart.java +++ b/SampleERCP/src/sampleercp/parts/LogicUIPart.java @@ -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; -- 2.17.1