projects
/
Mograsim.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
ac9de1a
)
Made GUIMerger and GUISplitter serializable
author
Daniel Kirschten
<daniel.kirschten@gmx.de>
Sun, 18 Aug 2019 12:44:55 +0000
(14:44 +0200)
committer
Daniel Kirschten
<daniel.kirschten@gmx.de>
Sun, 18 Aug 2019 12:58:04 +0000
(14:58 +0200)
net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/GUIMerger.java
patch
|
blob
|
history
net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/GUISplitter.java
patch
|
blob
|
history
diff --git
a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/GUIMerger.java
b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/GUIMerger.java
index
509e575
..
287e437
100644
(file)
--- a/
net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/GUIMerger.java
+++ b/
net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/GUIMerger.java
@@
-1,5
+1,8
@@
package net.mograsim.logic.model.model.components.atomic;
\r
\r
package net.mograsim.logic.model.model.components.atomic;
\r
\r
+import com.google.gson.JsonElement;
\r
+import com.google.gson.JsonPrimitive;
\r
+
\r
import net.haspamelodica.swt.helper.gcs.GeneralGC;
\r
import net.haspamelodica.swt.helper.swtobjectwrappers.Rectangle;
\r
import net.mograsim.logic.core.types.BitVectorFormatter;
\r
import net.haspamelodica.swt.helper.gcs.GeneralGC;
\r
import net.haspamelodica.swt.helper.swtobjectwrappers.Rectangle;
\r
import net.mograsim.logic.core.types.BitVectorFormatter;
\r
@@
-9,6
+12,8
@@
import net.mograsim.logic.model.model.components.GUIComponent;
import net.mograsim.logic.model.model.wires.Pin;
\r
import net.mograsim.logic.model.modeladapter.ViewLogicModelAdapter;
\r
import net.mograsim.logic.model.modeladapter.componentadapters.MergerAdapter;
\r
import net.mograsim.logic.model.model.wires.Pin;
\r
import net.mograsim.logic.model.modeladapter.ViewLogicModelAdapter;
\r
import net.mograsim.logic.model.modeladapter.componentadapters.MergerAdapter;
\r
+import net.mograsim.logic.model.serializing.IdentifierGetter;
\r
+import net.mograsim.logic.model.serializing.IndirectGUIComponentCreator;
\r
import net.mograsim.preferences.ColorDefinition;
\r
import net.mograsim.preferences.ColorManager;
\r
import net.mograsim.preferences.Preferences;
\r
import net.mograsim.preferences.ColorDefinition;
\r
import net.mograsim.preferences.ColorManager;
\r
import net.mograsim.preferences.Preferences;
\r
@@
-56,6
+61,12
@@
public class GUIMerger extends GUIComponent
gc.drawLine(posX + width / 2, posY + heightPerPin * logicWidth / 2, posX + width, posY + heightPerPin * logicWidth / 2);
\r
}
\r
\r
gc.drawLine(posX + width / 2, posY + heightPerPin * logicWidth / 2, posX + width, posY + heightPerPin * logicWidth / 2);
\r
}
\r
\r
+ @Override
\r
+ public JsonElement getParamsForSerializing(IdentifierGetter idGetter)
\r
+ {
\r
+ return new JsonPrimitive(logicWidth);
\r
+ }
\r
+
\r
public void setLogicModelBinding(ReadEnd[] inputEnds, ReadEnd outputEnd)
\r
{
\r
this.inputEnds = inputEnds;
\r
public void setLogicModelBinding(ReadEnd[] inputEnds, ReadEnd outputEnd)
\r
{
\r
this.inputEnds = inputEnds;
\r
@@
-65,5
+76,7
@@
public class GUIMerger extends GUIComponent
static
\r
{
\r
ViewLogicModelAdapter.addComponentAdapter(new MergerAdapter());
\r
static
\r
{
\r
ViewLogicModelAdapter.addComponentAdapter(new MergerAdapter());
\r
+ IndirectGUIComponentCreator.setComponentSupplier(GUIMerger.class.getCanonicalName(),
\r
+ (m, p, n) -> new GUIMerger(m, p.getAsInt(), n));
\r
}
\r
}
\ No newline at end of file
}
\r
}
\ No newline at end of file
diff --git
a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/GUISplitter.java
b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/GUISplitter.java
index
8643eb3
..
856eed9
100644
(file)
--- a/
net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/GUISplitter.java
+++ b/
net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/GUISplitter.java
@@
-1,5
+1,8
@@
package net.mograsim.logic.model.model.components.atomic;
\r
\r
package net.mograsim.logic.model.model.components.atomic;
\r
\r
+import com.google.gson.JsonElement;
\r
+import com.google.gson.JsonPrimitive;
\r
+
\r
import net.haspamelodica.swt.helper.gcs.GeneralGC;
\r
import net.haspamelodica.swt.helper.swtobjectwrappers.Rectangle;
\r
import net.mograsim.logic.core.types.BitVectorFormatter;
\r
import net.haspamelodica.swt.helper.gcs.GeneralGC;
\r
import net.haspamelodica.swt.helper.swtobjectwrappers.Rectangle;
\r
import net.mograsim.logic.core.types.BitVectorFormatter;
\r
@@
-9,6
+12,8
@@
import net.mograsim.logic.model.model.components.GUIComponent;
import net.mograsim.logic.model.model.wires.Pin;
\r
import net.mograsim.logic.model.modeladapter.ViewLogicModelAdapter;
\r
import net.mograsim.logic.model.modeladapter.componentadapters.SplitterAdapter;
\r
import net.mograsim.logic.model.model.wires.Pin;
\r
import net.mograsim.logic.model.modeladapter.ViewLogicModelAdapter;
\r
import net.mograsim.logic.model.modeladapter.componentadapters.SplitterAdapter;
\r
+import net.mograsim.logic.model.serializing.IdentifierGetter;
\r
+import net.mograsim.logic.model.serializing.IndirectGUIComponentCreator;
\r
import net.mograsim.preferences.ColorDefinition;
\r
import net.mograsim.preferences.ColorManager;
\r
import net.mograsim.preferences.Preferences;
\r
import net.mograsim.preferences.ColorDefinition;
\r
import net.mograsim.preferences.ColorManager;
\r
import net.mograsim.preferences.Preferences;
\r
@@
-56,6
+61,12
@@
public class GUISplitter extends GUIComponent
}
\r
}
\r
\r
}
\r
}
\r
\r
+ @Override
\r
+ public JsonElement getParamsForSerializing(IdentifierGetter idGetter)
\r
+ {
\r
+ return new JsonPrimitive(logicWidth);
\r
+ }
\r
+
\r
public void setLogicModelBinding(ReadEnd inputEnd, ReadEnd[] outputEnds)
\r
{
\r
this.inputEnd = inputEnd;
\r
public void setLogicModelBinding(ReadEnd inputEnd, ReadEnd[] outputEnds)
\r
{
\r
this.inputEnd = inputEnd;
\r
@@
-65,5
+76,7
@@
public class GUISplitter extends GUIComponent
static
\r
{
\r
ViewLogicModelAdapter.addComponentAdapter(new SplitterAdapter());
\r
static
\r
{
\r
ViewLogicModelAdapter.addComponentAdapter(new SplitterAdapter());
\r
+ IndirectGUIComponentCreator.setComponentSupplier(GUISplitter.class.getCanonicalName(),
\r
+ (m, p, n) -> new GUISplitter(m, p.getAsInt(), n));
\r
}
\r
}
\ No newline at end of file
}
\r
}
\ No newline at end of file