From 7ca7d7197bd6eac9b321e5bd6ec38e1133bd3a10 Mon Sep 17 00:00:00 2001 From: hneemann Date: Mon, 3 Jul 2017 19:48:43 +0200 Subject: [PATCH] removed interactor from data shape --- .../de/neemann/digital/draw/shapes/DataShape.java | 12 +----------- .../gui/components/data/ValueTableObserver.java | 4 ++-- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/src/main/java/de/neemann/digital/draw/shapes/DataShape.java b/src/main/java/de/neemann/digital/draw/shapes/DataShape.java index 881d84c3f..19ecbb961 100644 --- a/src/main/java/de/neemann/digital/draw/shapes/DataShape.java +++ b/src/main/java/de/neemann/digital/draw/shapes/DataShape.java @@ -3,7 +3,6 @@ package de.neemann.digital.draw.shapes; import de.neemann.digital.core.Model; import de.neemann.digital.core.Observer; import de.neemann.digital.core.Signal; -import de.neemann.digital.core.element.Element; import de.neemann.digital.core.element.ElementAttributes; import de.neemann.digital.core.element.Keys; import de.neemann.digital.core.element.PinDescriptions; @@ -16,12 +15,9 @@ import de.neemann.digital.draw.graphics.Graphic; import de.neemann.digital.draw.graphics.Style; import de.neemann.digital.draw.model.ModelCreator; import de.neemann.digital.draw.model.ModelEntry; -import de.neemann.digital.gui.components.CircuitComponent; import de.neemann.digital.gui.components.OrderMerger; import de.neemann.digital.gui.components.data.ValueTableObserver; -import de.neemann.digital.gui.sync.Sync; -import java.awt.*; import java.util.ArrayList; /** @@ -54,13 +50,7 @@ public class DataShape implements Shape { @Override public Interactor applyStateMonitor(IOState ioState, Observer guiObserver) { - return new Interactor() { - @Override - public boolean clicked(CircuitComponent cc, Point pos, IOState ioState, Element element, Sync modelSync) { - logData.clear(); - return false; - } - }; + return null; } @Override diff --git a/src/main/java/de/neemann/digital/gui/components/data/ValueTableObserver.java b/src/main/java/de/neemann/digital/gui/components/data/ValueTableObserver.java index ed380493d..22b94ec70 100644 --- a/src/main/java/de/neemann/digital/gui/components/data/ValueTableObserver.java +++ b/src/main/java/de/neemann/digital/gui/components/data/ValueTableObserver.java @@ -47,9 +47,9 @@ public class ValueTableObserver implements ModelStateObserver { @Override public void handleEvent(ModelEvent event) { - if (event == ModelEvent.STARTED) { + if (event == ModelEvent.STARTED) logData.clear(); - } + if (event == ModelEvent.MANUALCHANGE && type == ModelEvent.MICROSTEP) { if (manualSample == null) manualSample = new Value[logData.getColumns()];