projects
/
Mograsim.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
78f503a
)
Adjusted editor to changes made in logic.model
author
Daniel Kirschten
<daniel.kirschten@gmx.de>
Mon, 15 Jul 2019 14:35:55 +0000
(16:35 +0200)
committer
Daniel Kirschten
<daniel.kirschten@gmx.de>
Mon, 15 Jul 2019 14:35:55 +0000
(16:35 +0200)
net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/EditableSubmodelComponent.java
patch
|
blob
|
history
net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/Editor.java
patch
|
blob
|
history
net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/SaveLoadManager.java
patch
|
blob
|
history
net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/handles/ComponentHandle.java
patch
|
blob
|
history
net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/ui/EditorCanvas.java
patch
|
blob
|
history
net.mograsim.logic.model/src/net/mograsim/logic/model/serializing/DeserializedSubmodelComponent.java
patch
|
blob
|
history
diff --git
a/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/EditableSubmodelComponent.java
b/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/EditableSubmodelComponent.java
index
fac2304
..
42e2a92
100644
(file)
--- a/
net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/EditableSubmodelComponent.java
+++ b/
net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/EditableSubmodelComponent.java
@@
-20,7
+20,7
@@
public class EditableSubmodelComponent extends DeserializedSubmodelComponent
public EditableSubmodelComponent(ViewModelModifiable model, String label)
{
public EditableSubmodelComponent(ViewModelModifiable model, String label)
{
- super(model, label); //TODO: set name properly
+ super(model, label
, null, null
); //TODO: set name properly
this.label = label;
setSubmodelScale(0.2);
addSubmodelInterface(new MovablePin(this, "A Pin", 1, 0, 10));
this.label = label;
setSubmodelScale(0.2);
addSubmodelInterface(new MovablePin(this, "A Pin", 1, 0, 10));
diff --git
a/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/Editor.java
b/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/Editor.java
index
37efbae
..
e4c9292
100644
(file)
--- a/
net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/Editor.java
+++ b/
net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/Editor.java
@@
-1,5
+1,6
@@
package net.mograsim.logic.model.editor;
package net.mograsim.logic.model.editor;
+import java.io.IOException;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
@@
-225,7
+226,7
@@
public final class Editor
}
}
}
}
- public static void main(String[] args)
+ public static void main(String[] args)
throws IOException
{
SaveLoadManager.openLoadDialog();
}
{
SaveLoadManager.openLoadDialog();
}
diff --git
a/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/SaveLoadManager.java
b/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/SaveLoadManager.java
index
f4a2eca
..
5b19d3d
100644
(file)
--- a/
net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/SaveLoadManager.java
+++ b/
net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/SaveLoadManager.java
@@
-5,8
+5,7
@@
import java.io.IOException;
import net.mograsim.logic.model.editor.ui.DialogManager;
import net.mograsim.logic.model.model.ViewModelModifiable;
import net.mograsim.logic.model.serializing.DeserializedSubmodelComponent;
import net.mograsim.logic.model.editor.ui.DialogManager;
import net.mograsim.logic.model.model.ViewModelModifiable;
import net.mograsim.logic.model.serializing.DeserializedSubmodelComponent;
-import net.mograsim.logic.model.serializing.SubmodelComponentDeserializer;
-import net.mograsim.logic.model.util.JsonHandler;
+import net.mograsim.logic.model.serializing.SubmodelComponentSerializer;
public class SaveLoadManager
{
public class SaveLoadManager
{
@@
-40,12
+39,12
@@
public class SaveLoadManager
{
try
{
{
try
{
-
JsonHandler.writeJson(editor.toBeEdited.calculateParams(
c ->
+
SubmodelComponentSerializer.serialize(editor.toBeEdited,
c ->
{
if (Editor.identifierPerComponent.containsKey(c))
return Editor.identifierPerComponent.get(c);
return "class:" + c.getClass().getCanonicalName();
{
if (Editor.identifierPerComponent.containsKey(c))
return Editor.identifierPerComponent.get(c);
return "class:" + c.getClass().getCanonicalName();
- }
)
, savePath);
+ }, savePath);
} catch (IOException e)
{
savePath = null;
} catch (IOException e)
{
savePath = null;
@@
-54,13
+53,12
@@
public class SaveLoadManager
}
}
}
}
- public static void openLoadDialog()
+ public static void openLoadDialog()
throws IOException
{
String[] result = DialogManager.openMultiTextDialog("Load Component...", "Load", "Cancel", "Path");
if(result != null)
{
{
String[] result = DialogManager.openMultiTextDialog("Load Component...", "Load", "Cancel", "Path");
if(result != null)
{
- new Editor((DeserializedSubmodelComponent) SubmodelComponentDeserializer
- .create(new ViewModelModifiable(), result[0]));
+ new Editor((DeserializedSubmodelComponent) SubmodelComponentSerializer.deserialize(new ViewModelModifiable(), result[0]));
}
}
}
}
}
}
diff --git
a/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/handles/ComponentHandle.java
b/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/handles/ComponentHandle.java
index
52b634d
..
04b925d
100644
(file)
--- a/
net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/handles/ComponentHandle.java
+++ b/
net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/handles/ComponentHandle.java
@@
-85,7
+85,7
@@
public class ComponentHandle extends Handle
public Optional<ComponentInfo> reqCopy(Point refPoint)
{
return Optional.of(new ComponentInfo(parent.getPosX() - refPoint.x, parent.getPosY() - refPoint.y,
public Optional<ComponentInfo> reqCopy(Point refPoint)
{
return Optional.of(new ComponentInfo(parent.getPosX() - refPoint.x, parent.getPosY() - refPoint.y,
- Editor.getIdentifier(parent), parent.getParams()));
+ Editor.getIdentifier(parent), parent.getParams
ForSerializing
()));
}
@Override
}
@Override
diff --git
a/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/ui/EditorCanvas.java
b/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/ui/EditorCanvas.java
index
357e88f
..
ac37e76
100644
(file)
--- a/
net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/ui/EditorCanvas.java
+++ b/
net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/ui/EditorCanvas.java
@@
-36,7
+36,7
@@
public class EditorCanvas extends LogicUICanvas
// canvas
TranslatedGC tgc = new TranslatedGC(gc, 0.0d, 0.0d, 1 / editor.toBeEdited.getSubmodelScale(), false);
// canvas
TranslatedGC tgc = new TranslatedGC(gc, 0.0d, 0.0d, 1 / editor.toBeEdited.getSubmodelScale(), false);
- editor.toBeEdited.
outlineRenderer
.render(tgc, new Rectangle(-offX / zoom, -offY / zoom, gW / zoom, gH / zoom));
+ editor.toBeEdited.
getOutlineRenderer()
.render(tgc, new Rectangle(-offX / zoom, -offY / zoom, gW / zoom, gH / zoom));
handles.forEach(h -> h.render(gc, visibleRegion));
});
handles.forEach(h -> h.render(gc, visibleRegion));
});
diff --git
a/net.mograsim.logic.model/src/net/mograsim/logic/model/serializing/DeserializedSubmodelComponent.java
b/net.mograsim.logic.model/src/net/mograsim/logic/model/serializing/DeserializedSubmodelComponent.java
index
8109a37
..
5f7b084
100644
(file)
--- a/
net.mograsim.logic.model/src/net/mograsim/logic/model/serializing/DeserializedSubmodelComponent.java
+++ b/
net.mograsim.logic.model/src/net/mograsim/logic/model/serializing/DeserializedSubmodelComponent.java
@@
-73,16
+73,31
@@
public class DeserializedSubmodelComponent extends SubmodelComponent
this.outlineRenderer = outlineRenderer;
}
this.outlineRenderer = outlineRenderer;
}
+ public Renderer getOutlineRenderer()
+ {
+ return outlineRenderer;
+ }
+
public void setSymbolRenderer(Renderer symbolRenderer)
{
this.symbolRenderer = symbolRenderer;
}
public void setSymbolRenderer(Renderer symbolRenderer)
{
this.symbolRenderer = symbolRenderer;
}
+ public Renderer getSymbolRenderer()
+ {
+ return symbolRenderer;
+ }
+
public void setHighLevelStateHandler(HighLevelStateHandler highLevelStateHandler)
{
this.highLevelStateHandler = highLevelStateHandler;
}
public void setHighLevelStateHandler(HighLevelStateHandler highLevelStateHandler)
{
this.highLevelStateHandler = highLevelStateHandler;
}
+ public HighLevelStateHandler getHighLevelStateHandler()
+ {
+ return highLevelStateHandler;
+ }
+
public ViewModelModifiable getSubmodelModifiable()
{
return submodelModifiable;
public ViewModelModifiable getSubmodelModifiable()
{
return submodelModifiable;