import org.eclipse.swt.graphics.Color;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonPrimitive;
+
import net.haspamelodica.swt.helper.gcs.GeneralGC;
import net.haspamelodica.swt.helper.swtobjectwrappers.Font;
import net.haspamelodica.swt.helper.swtobjectwrappers.Point;
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.wires.Pin;
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;
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();
+ logicObs = (i) -> model.requestRedraw();
setSize(width, height);
- addPin(this.outputPin = new Pin(this, "", 1, width, height / 2));
+ addPin(this.outputPin = new Pin(this, "", logicWidth, width, height / 2));
}
@Override
{
case "out":
if (logicSwitch != null)
- return logicSwitch.getValue();
+ return logicSwitch.getValues();
return null;
default:
return super.getHighLevelState(stateID);
{
case "out":
if (logicSwitch != null)
- logicSwitch.setToValueOf((Bit) newState);
+ logicSwitch.setState((BitVector) newState);
break;
default:
super.setHighLevelState(stateID, newState);
return outputPin;
}
+ @Override
+ public JsonElement getParamsForSerializing(IdentifierGetter idGetter)
+ {
+ return new JsonPrimitive(outputPin.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