X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.model%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Fmodel%2Fcomponents%2Fatomic%2FGUIManualSwitch.java;h=e9853a1e1bc6e38518cdc372f601441cbd2ac36f;hb=8604106a28c3de0b93e46b406a74dc3611e7bca5;hp=b79ec2fd962840be8af5b6dbfd5a5b0439e59b37;hpb=6f717d2b76148b0d49c342f9ab937ba87d81dddb;p=Mograsim.git diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/GUIManualSwitch.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/GUIManualSwitch.java index b79ec2fd..e9853a1e 100644 --- a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/GUIManualSwitch.java +++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/GUIManualSwitch.java @@ -6,17 +6,18 @@ import net.haspamelodica.swt.helper.gcs.GeneralGC; import net.haspamelodica.swt.helper.swtobjectwrappers.Font; import net.haspamelodica.swt.helper.swtobjectwrappers.Point; import net.haspamelodica.swt.helper.swtobjectwrappers.Rectangle; -import net.mograsim.logic.core.LogicObservable; import net.mograsim.logic.core.LogicObserver; import net.mograsim.logic.core.components.ManualSwitch; import net.mograsim.logic.core.types.Bit; +import net.mograsim.logic.core.types.BitVector; import net.mograsim.logic.core.types.BitVectorFormatter; -import net.mograsim.logic.core.wires.Wire.ReadEnd; import net.mograsim.logic.model.model.ViewModelModifiable; import net.mograsim.logic.model.model.components.GUIComponent; import net.mograsim.logic.model.model.wires.Pin; +import net.mograsim.logic.model.model.wires.PinUsage; import net.mograsim.logic.model.modeladapter.ViewLogicModelAdapter; import net.mograsim.logic.model.modeladapter.componentadapters.ManualSwitchAdapter; +import net.mograsim.logic.model.serializing.IdentifierGetter; import net.mograsim.logic.model.serializing.IndirectGUIComponentCreator; import net.mograsim.preferences.Preferences; @@ -25,55 +26,79 @@ public class GUIManualSwitch extends GUIComponent private static final double width = 20; private static final double height = 15; private static final double fontHeight = 5; + private static final double heightMiniButtons = 4; // 0 is disabled + public final int logicWidth; private final Pin outputPin; private final LogicObserver logicObs; private ManualSwitch logicSwitch; - private ReadEnd end; - public GUIManualSwitch(ViewModelModifiable model) + public GUIManualSwitch(ViewModelModifiable model, int logicWidth) { - this(model, null); + this(model, logicWidth, null); } - public GUIManualSwitch(ViewModelModifiable model, String name) + public GUIManualSwitch(ViewModelModifiable model, int logicWidth, String name) { super(model, name); - logicObs = (i) -> requestRedraw(); + this.logicWidth = logicWidth; + logicObs = (i) -> model.requestRedraw(); setSize(width, height); - addPin(this.outputPin = new Pin(this, "", 1, width, height / 2)); + addPin(this.outputPin = new Pin(this, "", logicWidth, PinUsage.OUTPUT, width, height / 2)); } @Override public void render(GeneralGC gc, Rectangle visibleRegion) { - // TODO maybe draw switch state too? - Color foreground = Preferences.current().getColor("net.mograsim.logic.ui.color.foreground"); + Color foreground = Preferences.current().getColor("net.mograsim.logic.model.color.foreground"); if (foreground != null) gc.setForeground(foreground); gc.drawRectangle(getBounds()); - String label = BitVectorFormatter.formatValueAsString(end); + String label = BitVectorFormatter.formatAsString(logicSwitch == null ? null : logicSwitch.getValues()); Font oldFont = gc.getFont(); Font labelFont = new Font(oldFont.getName(), fontHeight, oldFont.getStyle()); gc.setFont(labelFont); Point textExtent = gc.textExtent(label); - Color textColor = Preferences.current().getColor("net.mograsim.logic.ui.color.text"); + Color textColor = Preferences.current().getColor("net.mograsim.logic.model.color.text"); if (textColor != null) gc.setForeground(textColor); gc.drawText(label, getPosX() + (width - textExtent.x) / 2, getPosY() + (height - textExtent.y) / 2, true); gc.setFont(oldFont); + + if (logicSwitch != null && logicWidth > 1 && heightMiniButtons > 0 && visibleRegion.y < getPosY() + heightMiniButtons) + { + double x = getPosX(); + double y = getPosY(); + gc.drawLine(x, y + heightMiniButtons, x + width, y + heightMiniButtons); + Color c = gc.getBackground(); + gc.setBackground(gc.getForeground()); + BitVector bv = logicSwitch.getValues(); + double part = width / bv.length(); + for (int i = 0; i < bv.length(); i++) + { + double start = x + part * i; + if (i != 0) + gc.drawLine(start, y, start, y + heightMiniButtons); + if (bv.getMSBit(i) == Bit.ONE) + { +// gc.fillRectangle(start, y, part, heightMiniButtons); // alternative, but not always visible what Bit is where + gc.drawLine(start, y, start + part, y + heightMiniButtons); + gc.drawLine(start + part, y, start, y + heightMiniButtons); + } + } + gc.setBackground(c); + } } - public void setLogicModelBinding(ManualSwitch logicSwitch, ReadEnd end) + public void setLogicModelBinding(ManualSwitch logicSwitch) { - deregisterLogicObs(this.end); - deregisterLogicObs(this.logicSwitch); + if (this.logicSwitch != null) + this.logicSwitch.deregisterObserver(logicObs); this.logicSwitch = logicSwitch; - this.end = end; - registerLogicObs(end); - registerLogicObs(logicSwitch); + if (logicSwitch != null) + logicSwitch.registerObserver(logicObs); } public boolean hasLogicModelBinding() @@ -88,7 +113,7 @@ public class GUIManualSwitch extends GUIComponent { case "out": if (logicSwitch != null) - return logicSwitch.getValue(); + return logicSwitch.getValues(); return null; default: return super.getHighLevelState(stateID); @@ -102,7 +127,7 @@ public class GUIManualSwitch extends GUIComponent { case "out": if (logicSwitch != null) - logicSwitch.setToValueOf((Bit) newState); + logicSwitch.setState((BitVector) newState); break; default: super.setHighLevelState(stateID, newState); @@ -110,23 +135,20 @@ public class GUIManualSwitch extends GUIComponent } } - private void registerLogicObs(LogicObservable observable) - { - if (observable != null) - observable.registerObserver(logicObs); - } - - private void deregisterLogicObs(LogicObservable observable) - { - if (observable != null) - observable.deregisterObserver(logicObs); - } - @Override public boolean clicked(double x, double y) { if (logicSwitch != null) - logicSwitch.toggle(); + { + if (heightMiniButtons > 0 && y - getPosY() < heightMiniButtons) + { + int part = (int) ((x - getPosX()) * logicWidth / width); + logicSwitch.setState(logicSwitch.getValues().withBitChanged(part, Bit::not)); + } else + { + logicSwitch.toggle(); + } + } return true; } @@ -140,9 +162,16 @@ public class GUIManualSwitch extends GUIComponent return outputPin; } + @Override + public Integer getParamsForSerializing(IdentifierGetter idGetter) + { + return logicWidth; + } + static { ViewLogicModelAdapter.addComponentAdapter(new ManualSwitchAdapter()); - IndirectGUIComponentCreator.setComponentSupplier(GUIManualSwitch.class.getName(), (m, p, n) -> new GUIManualSwitch(m, n)); + IndirectGUIComponentCreator.setComponentSupplier(GUIManualSwitch.class.getName(), + (m, p, n) -> new GUIManualSwitch(m, p.getAsInt(), n)); } } \ No newline at end of file