import net.haspamelodica.swt.helper.swtobjectwrappers.Point;
import net.haspamelodica.swt.helper.swtobjectwrappers.Rectangle;
import net.mograsim.logic.core.LogicObserver;
-import net.mograsim.logic.core.components.BitDisplay;
+import net.mograsim.logic.core.components.CoreBitDisplay;
import net.mograsim.logic.core.types.BitVectorFormatter;
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.BitDisplayAdapter;
+import net.mograsim.logic.model.serializing.IdentifyParams;
import net.mograsim.logic.model.serializing.IndirectGUIComponentCreator;
import net.mograsim.preferences.Preferences;
private static final double height = 15;
private static final double fontHeight = 5;
+ public final int logicWidth;
private final Pin inputPin;
private final LogicObserver logicObs;
- private BitDisplay bitDisplay;
+ private CoreBitDisplay bitDisplay;
- public GUIBitDisplay(ViewModelModifiable model)
+ public GUIBitDisplay(ViewModelModifiable model, int logicWidth)
{
- this(model, null);
+ this(model, logicWidth, null);
}
- public GUIBitDisplay(ViewModelModifiable model, String name)
+ public GUIBitDisplay(ViewModelModifiable model, int logicWidth, String name)
{
super(model, name);
- logicObs = (i) -> requestRedraw();
+ this.logicWidth = logicWidth;
+ logicObs = (i) -> model.requestRedraw();
setSize(width, height);
- addPin(this.inputPin = new Pin(this, "", 1, 0, height / 2));
+ addPin(this.inputPin = new Pin(this, "", logicWidth, PinUsage.INPUT, 0, height / 2));
}
@Override
public void render(GeneralGC gc, Rectangle visibleRegion)
{
- 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());
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);
}
- public void setLogicModelBinding(BitDisplay bitDisplay)
+ public void setLogicModelBinding(CoreBitDisplay bitDisplay)
{
if (this.bitDisplay != null)
this.bitDisplay.deregisterObserver(logicObs);
return bitDisplay != null;
}
- public BitDisplay getBitDisplay()
+ public CoreBitDisplay getBitDisplay()
{
return bitDisplay;
}
return inputPin;
}
+ @Override
+ public String getIDForSerializing(IdentifyParams idParams)
+ {
+ return "GUIBitDisplay";
+ }
+
+ @Override
+ public Integer getParamsForSerializing(IdentifyParams idParams)
+ {
+ return logicWidth;
+ }
+
static
{
ViewLogicModelAdapter.addComponentAdapter(new BitDisplayAdapter());
- IndirectGUIComponentCreator.setComponentSupplier(GUIBitDisplay.class.getCanonicalName(), (m, p, n) -> new GUIBitDisplay(m, n));
+ IndirectGUIComponentCreator.setComponentSupplier(GUIBitDisplay.class.getCanonicalName(),
+ (m, p, n) -> new GUIBitDisplay(m, p.getAsInt(), n));
}
}
\ No newline at end of file