X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.model%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Fserializing%2FSubmodelComponentSerializer.java;h=077c591a9a80d72a92cd3678595ae10c039c54d1;hb=62467eaf4814d04961cca4ec7a88ddc5530a4ac4;hp=7c002a091b9abee7777b46e28d2fc8223090b95a;hpb=a3f31d6bf39eb747172a6db329de72c803903c2e;p=Mograsim.git diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/serializing/SubmodelComponentSerializer.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/serializing/SubmodelComponentSerializer.java index 7c002a09..077c591a 100644 --- a/net.mograsim.logic.model/src/net/mograsim/logic/model/serializing/SubmodelComponentSerializer.java +++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/serializing/SubmodelComponentSerializer.java @@ -1,18 +1,16 @@ package net.mograsim.logic.model.serializing; import java.io.IOException; +import java.util.Collection; import java.util.HashMap; -import java.util.List; import java.util.Map; import java.util.function.Function; -import com.google.gson.Gson; import com.google.gson.JsonElement; import net.haspamelodica.swt.helper.swtobjectwrappers.Point; import net.mograsim.logic.model.model.ViewModelModifiable; import net.mograsim.logic.model.model.components.GUIComponent; -import net.mograsim.logic.model.model.components.submodels.SimpleRectangularSubmodelComponent; import net.mograsim.logic.model.model.components.submodels.SubmodelComponent; import net.mograsim.logic.model.model.wires.GUIWire; import net.mograsim.logic.model.model.wires.MovablePin; @@ -22,8 +20,9 @@ import net.mograsim.logic.model.serializing.SubmodelComponentParams.SubmodelPara import net.mograsim.logic.model.serializing.SubmodelComponentParams.SubmodelParameters.InnerComponentParams; import net.mograsim.logic.model.serializing.SubmodelComponentParams.SubmodelParameters.InnerWireParams; import net.mograsim.logic.model.serializing.SubmodelComponentParams.SubmodelParameters.InnerWireParams.InnerPinParams; +import net.mograsim.logic.model.snippets.HighLevelStateHandler; +import net.mograsim.logic.model.snippets.Renderer; import net.mograsim.logic.model.snippets.SubmodelComponentSnippetSuppliers; -import net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer.SimpleRectangularLikeParams; import net.mograsim.logic.model.util.JsonHandler; /** @@ -134,20 +133,20 @@ public final class SubmodelComponentSerializer * * @author Daniel Kirschten */ - public static void serialize(SubmodelComponent comp, Function getIdentifier, String targetPath) throws IOException + public static void serialize(SubmodelComponent comp, IdentifierGetter idGetter, String targetPath) throws IOException { - JsonHandler.writeJson(serialize(comp, getIdentifier), targetPath); + JsonHandler.writeJson(serialize(comp, idGetter), targetPath); } /** - * {@link #serialize(SubmodelComponent, Function)} using "class:" concatenated with a component's complete (canonical) - * class name for the ID of a component. + * {@link #serialize(SubmodelComponent, Function)} using a default {@link IdentifierGetter} (see IdentifierGetter's + * {@link IdentifierGetter#IdentifierGetter() default constructor}) * * @author Daniel Kirschten */ public static SubmodelComponentParams serialize(SubmodelComponent comp) { - return serialize(comp, c -> "class:" + c.getClass().getCanonicalName()); + return serialize(comp, new IdentifierGetter()); } // "core" methods @@ -170,12 +169,6 @@ public final class SubmodelComponentSerializer DeserializedSubmodelComponent comp = new DeserializedSubmodelComponent(model, name, idForSerializingOverride, paramsForSerializingOverride); comp.setSubmodelScale(params.submodel.innerScale); - comp.setOutlineRenderer(SubmodelComponentSnippetSuppliers.outlineRendererSupplier - .getSnippetSupplier(params.outlineRendererSnippetID).create(comp, params.outlineRendererParams)); - comp.setSymbolRenderer(SubmodelComponentSnippetSuppliers.symbolRendererSupplier.getSnippetSupplier(params.symbolRendererSnippetID) - .create(comp, params.symbolRendererParams)); - comp.setHighLevelStateHandler(SubmodelComponentSnippetSuppliers.highLevelStateHandlerSupplier - .getSnippetSupplier(params.highLevelStateHandlerSnippetID).create(comp, params.highLevelStateHandlerParams)); comp.setSize(params.width, params.height); for (InterfacePinParams iPinParams : params.interfacePins) comp.addSubmodelInterface( @@ -194,9 +187,15 @@ public final class SubmodelComponentSerializer for (int i = 0; i < submodelParams.innerWires.length; i++) { InnerWireParams innerWire = submodelParams.innerWires[i]; - new GUIWire(submodelModifiable, componentsByName.get(innerWire.pin1.compName).getPin(innerWire.pin1.pinName), + new GUIWire(submodelModifiable, innerWire.name, componentsByName.get(innerWire.pin1.compName).getPin(innerWire.pin1.pinName), componentsByName.get(innerWire.pin2.compName).getPin(innerWire.pin2.pinName), innerWire.path); } + comp.setSymbolRenderer(SubmodelComponentSnippetSuppliers.symbolRendererSupplier.getSnippetSupplier(params.symbolRendererSnippetID) + .create(comp, params.symbolRendererParams)); + comp.setOutlineRenderer(SubmodelComponentSnippetSuppliers.outlineRendererSupplier + .getSnippetSupplier(params.outlineRendererSnippetID).create(comp, params.outlineRendererParams)); + comp.setHighLevelStateHandler(SubmodelComponentSnippetSuppliers.highLevelStateHandlerSupplier + .getSnippetSupplier(params.highLevelStateHandlerSnippetID).create(comp, params.highLevelStateHandlerParams)); return comp; } @@ -209,61 +208,64 @@ public final class SubmodelComponentSerializer * component's {@link DeserializedSubmodelComponent#paramsForSerializingOverride paramsForSerializingOverride} are written.
* If this case doesn't apply (e.g. if the subcomponent is not a SubmodelComponent; or it is a * SubmodelComponent, but hasn't been deserialized; or it has no - * {@link DeserializedSubmodelComponent#idForSerializingOverride idForSerializingOverride} set), the ID returned by - * getIdentifier and the params obtained by {@link GUIComponent#getParamsForSerializing() getParams()} are written. + * {@link DeserializedSubmodelComponent#idForSerializingOverride idForSerializingOverride} set), the ID defined by idGetter + * and the params obtained by {@link GUIComponent#getParamsForSerializing() getParams()} are written.
+ * CodeSnippets are serialized using the ID defined by idGetter and the params obtained by the respective + * getParamsForSerializing methods ({@link Renderer#getParamsForSerializing()}). * * @author Fabian Stemmler * @author Daniel Kirschten */ - public static SubmodelComponentParams serialize(SubmodelComponent comp, Function getIdentifier) + public static SubmodelComponentParams serialize(SubmodelComponent comp, IdentifierGetter idGetter) { SubmodelParameters submodelParams = new SubmodelParameters(); submodelParams.innerScale = comp.getSubmodelScale(); Map components = new HashMap<>(comp.submodel.getComponentsByName()); components.remove(SubmodelComponent.SUBMODEL_INTERFACE_NAME); - InnerComponentParams[] comps = new InnerComponentParams[components.size()]; + InnerComponentParams[] componentParams = new InnerComponentParams[components.size()]; int i1 = 0; - for (GUIComponent innerComp : components.values()) + for (GUIComponent innerComponent : components.values()) { - InnerComponentParams innerParams = new InnerComponentParams(); - comps[i1] = innerParams; - innerParams.pos = new Point(innerComp.getPosX(), innerComp.getPosY()); + InnerComponentParams innerComponentParams = new InnerComponentParams(); + componentParams[i1] = innerComponentParams; + innerComponentParams.pos = new Point(innerComponent.getPosX(), innerComponent.getPosY()); DeserializedSubmodelComponent innerCompCasted; - if (innerComp instanceof DeserializedSubmodelComponent - && (innerCompCasted = (DeserializedSubmodelComponent) innerComp).idForSerializingOverride != null) + if (innerComponent instanceof DeserializedSubmodelComponent + && (innerCompCasted = (DeserializedSubmodelComponent) innerComponent).idForSerializingOverride != null) { - innerParams.id = innerCompCasted.idForSerializingOverride; - innerParams.params = innerCompCasted.paramsForSerializingOverride; + innerComponentParams.id = innerCompCasted.idForSerializingOverride; + innerComponentParams.params = innerCompCasted.paramsForSerializingOverride; } else { - innerParams.id = getIdentifier.apply(innerComp); - innerParams.params = innerComp.getParamsForSerializing(); + innerComponentParams.id = idGetter.componentIDs.apply(innerComponent); + innerComponentParams.params = innerComponent.getParamsForSerializing(idGetter); } - innerParams.name = innerComp.name; + innerComponentParams.name = innerComponent.name; i1++; } - submodelParams.subComps = comps; + submodelParams.subComps = componentParams; - List wireList = comp.submodel.getWires(); - InnerWireParams wires[] = new InnerWireParams[wireList.size()]; + Collection wires = comp.submodel.getWiresByName().values(); + InnerWireParams wireParams[] = new InnerWireParams[wires.size()]; i1 = 0; - for (GUIWire wire : wireList) + for (GUIWire innerWire : wires) { - InnerWireParams inner = new InnerWireParams(); - wires[i1] = inner; + InnerWireParams innerWireParams = new InnerWireParams(); + wireParams[i1] = innerWireParams; InnerPinParams pin1Params = new InnerPinParams(), pin2Params = new InnerPinParams(); - pin1Params.pinName = wire.getPin1().name; - pin1Params.compName = wire.getPin1().component.name; - pin2Params.pinName = wire.getPin2().name; - pin2Params.compName = wire.getPin2().component.name; - inner.pin1 = pin1Params; - inner.pin2 = pin2Params; - inner.path = wire.getPath(); + pin1Params.pinName = innerWire.getPin1().name; + pin1Params.compName = innerWire.getPin1().component.name; + pin2Params.pinName = innerWire.getPin2().name; + pin2Params.compName = innerWire.getPin2().component.name; + innerWireParams.name = innerWire.name; + innerWireParams.pin1 = pin1Params; + innerWireParams.pin2 = pin2Params; + innerWireParams.path = innerWire.getPath(); i1++; } - submodelParams.innerWires = wires; + submodelParams.innerWires = wireParams; SubmodelComponentParams params = new SubmodelComponentParams(); params.submodel = submodelParams; @@ -284,20 +286,25 @@ public final class SubmodelComponentSerializer } params.interfacePins = iPins; - // TODO does this code belong here? - if (comp instanceof SimpleRectangularSubmodelComponent) + Renderer symbolRenderer = comp.getSymbolRenderer(); + if (symbolRenderer != null) { - SimpleRectangularSubmodelComponent compCasted = (SimpleRectangularSubmodelComponent) comp; + params.symbolRendererSnippetID = idGetter.symbolRendererIDs.apply(symbolRenderer); + params.symbolRendererParams = symbolRenderer.getParamsForSerializingJSON(idGetter); + } - SimpleRectangularLikeParams symbolRendererParams = new SimpleRectangularLikeParams(); - symbolRendererParams.centerText = compCasted.label; - symbolRendererParams.centerTextHeight = SimpleRectangularSubmodelComponent.labelFontHeight; - symbolRendererParams.horizontalComponentCenter = compCasted.getWidth() / 2; - symbolRendererParams.pinLabelHeight = SimpleRectangularSubmodelComponent.pinNameFontHeight; - symbolRendererParams.pinLabelMargin = SimpleRectangularSubmodelComponent.pinNameMargin; + Renderer outlineRenderer = comp.getOutlineRenderer(); + if (outlineRenderer != null) + { + params.outlineRendererSnippetID = idGetter.outlineRendererIDs.apply(outlineRenderer); + params.outlineRendererParams = outlineRenderer.getParamsForSerializingJSON(idGetter); + } - params.symbolRendererSnippetID = "SimpleRectangularLikeSymbolRenderer"; - params.symbolRendererParams = new Gson().toJsonTree(symbolRendererParams); + HighLevelStateHandler highLevelStateHandler = comp.getHighLevelStateHandler(); + if (highLevelStateHandler != null) + { + params.highLevelStateHandlerSnippetID = idGetter.highLevelStateHandlerIDs.apply(highLevelStateHandler); + params.highLevelStateHandlerParams = highLevelStateHandler.getParamsForSerializingJSON(idGetter); } return params;