projects
/
Mograsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Vastly improved orientation calculation and implementation
[Mograsim.git]
/
net.mograsim.logic.model
/
src
/
net
/
mograsim
/
logic
/
model
/
model
/
components
/
atomic
/
GUIBitDisplay.java
diff --git
a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/GUIBitDisplay.java
b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/GUIBitDisplay.java
index
b82d526
..
12c0ee8
100644
(file)
--- a/
net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/GUIBitDisplay.java
+++ b/
net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/GUIBitDisplay.java
@@
-2,6
+2,9
@@
package net.mograsim.logic.model.model.components.atomic;
import org.eclipse.swt.graphics.Color;
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.haspamelodica.swt.helper.gcs.GeneralGC;
import net.haspamelodica.swt.helper.swtobjectwrappers.Font;
import net.haspamelodica.swt.helper.swtobjectwrappers.Point;
@@
-12,8
+15,10
@@
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.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.modeladapter.ViewLogicModelAdapter;
import net.mograsim.logic.model.modeladapter.componentadapters.BitDisplayAdapter;
+import net.mograsim.logic.model.serializing.IdentifierGetter;
import net.mograsim.logic.model.serializing.IndirectGUIComponentCreator;
import net.mograsim.preferences.Preferences;
import net.mograsim.logic.model.serializing.IndirectGUIComponentCreator;
import net.mograsim.preferences.Preferences;
@@
-23,6
+28,7
@@
public class GUIBitDisplay extends GUIComponent
private static final double height = 15;
private static final double fontHeight = 5;
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 final Pin inputPin;
private final LogicObserver logicObs;
@@
-36,10
+42,11
@@
public class GUIBitDisplay extends GUIComponent
public GUIBitDisplay(ViewModelModifiable model, int logicWidth, String name)
{
super(model, name);
public GUIBitDisplay(ViewModelModifiable model, int logicWidth, String name)
{
super(model, name);
+ this.logicWidth = logicWidth;
logicObs = (i) -> model.requestRedraw();
setSize(width, height);
logicObs = (i) -> model.requestRedraw();
setSize(width, height);
- addPin(this.inputPin = new Pin(this, "", logicWidth, 0, height / 2));
+ addPin(this.inputPin = new Pin(this, "", logicWidth,
PinUsage.INPUT,
0, height / 2));
}
@Override
}
@Override
@@
-86,6
+93,12
@@
public class GUIBitDisplay extends GUIComponent
return inputPin;
}
return inputPin;
}
+ @Override
+ public JsonElement getParamsForSerializing(IdentifierGetter idGetter)
+ {
+ return new JsonPrimitive(logicWidth);
+ }
+
static
{
ViewLogicModelAdapter.addComponentAdapter(new BitDisplayAdapter());
static
{
ViewLogicModelAdapter.addComponentAdapter(new BitDisplayAdapter());