TheCloud/Digital
1
0
Fork 0
mirror of https://github.com/hneemann/Digital.git synced 2025-09-26 22:41:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

removed interactor from data shape

Browse Source
This commit is contained in:
hneemann 2017-07-03 19:48:43 +02:00
parent 4ae8ec9c36
commit 7ca7d7197b
2 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/de/neemann/digital/draw/shapes/DataShape.java
View File

@ -3,7 +3,6 @@ package de.neemann.digital.draw.shapes;
import de.neemann.digital.core.Model; import de.neemann.digital.core.Model;
import de.neemann.digital.core.Observer; import de.neemann.digital.core.Observer;
import de.neemann.digital.core.Signal; 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.ElementAttributes;
import de.neemann.digital.core.element.Keys; import de.neemann.digital.core.element.Keys;
import de.neemann.digital.core.element.PinDescriptions; 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.graphics.Style;
import de.neemann.digital.draw.model.ModelCreator; import de.neemann.digital.draw.model.ModelCreator;
import de.neemann.digital.draw.model.ModelEntry; 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.OrderMerger;
import de.neemann.digital.gui.components.data.ValueTableObserver; import de.neemann.digital.gui.components.data.ValueTableObserver;
import de.neemann.digital.gui.sync.Sync;
import java.awt.*;
import java.util.ArrayList; import java.util.ArrayList;
/** /**
@ -54,13 +50,7 @@ public class DataShape implements Shape {
@Override @Override
public Interactor applyStateMonitor(IOState ioState, Observer guiObserver) { public Interactor applyStateMonitor(IOState ioState, Observer guiObserver) {
return new Interactor() { return null;
@Override
public boolean clicked(CircuitComponent cc, Point pos, IOState ioState, Element element, Sync modelSync) {
logData.clear();
return false;
}
};
} }
@Override @Override

4
src/main/java/de/neemann/digital/gui/components/data/ValueTableObserver.java
View File

@ -47,9 +47,9 @@ public class ValueTableObserver implements ModelStateObserver {
@Override @Override
public void handleEvent(ModelEvent event) { public void handleEvent(ModelEvent event) {
if (event == ModelEvent.STARTED) { if (event == ModelEvent.STARTED)
logData.clear(); logData.clear();
}
if (event == ModelEvent.MANUALCHANGE && type == ModelEvent.MICROSTEP) { if (event == ModelEvent.MANUALCHANGE && type == ModelEvent.MICROSTEP) {
if (manualSample == null) if (manualSample == null)
manualSample = new Value[logData.getColumns()]; manualSample = new Value[logData.getColumns()];