X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.model%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Fserializing%2FSubmodelComponentSerializer.java;h=a062eaaaba0268dc0ee7bf3090e795e139770db7;hb=d6d5c48722671ccc034011d9eba468b23ee53e80;hp=126e2aa8d5445b844ebf35aed3986d852e5de984;hpb=853d979edee5d49d3b3c5fe08609f6cfd82d863f;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 126e2aa8..a062eaaa 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,6 +1,8 @@
 package net.mograsim.logic.model.serializing;
 
 import java.io.IOException;
+import java.util.Arrays;
+import java.util.Comparator;
 
 import com.google.gson.JsonElement;
 
@@ -8,6 +10,7 @@ import net.mograsim.logic.model.model.ViewModelModifiable;
 import net.mograsim.logic.model.model.components.submodels.SubmodelComponent;
 import net.mograsim.logic.model.model.wires.MovablePin;
 import net.mograsim.logic.model.model.wires.Pin;
+import net.mograsim.logic.model.model.wires.PinUsage;
 import net.mograsim.logic.model.serializing.SubmodelComponentParams.InterfacePinParams;
 import net.mograsim.logic.model.snippets.HighLevelStateHandler;
 import net.mograsim.logic.model.snippets.Renderer;
@@ -23,7 +26,9 @@ import net.mograsim.logic.model.util.Version;
  */
 public final class SubmodelComponentSerializer
 {
-	public static final Version CURRENT_JSON_VERSION = Version.parseSemver("0.1.4");
+	public static final Version JSON_VERSION_CURRENT_SERIALIZING = Version.parseSemver("0.1.5");
+	public static final Version JSON_VERSION_LATEST_SUPPORTED_DESERIALIZING = Version.parseSemver("0.1.5");
+	public static final Version JSON_VERSION_EARLIEST_WITH_USAGE_SERIALIZED = Version.parseSemver("0.1.5");
 	// convenience methods
 
 	/**
@@ -157,13 +162,18 @@ public final class SubmodelComponentSerializer
 	public static SubmodelComponent deserialize(ViewModelModifiable model, SubmodelComponentParams params, String name,
 			String idForSerializingOverride, JsonElement paramsForSerializingOverride)
 	{
+		Version version = params.version;
+		if (version.compareTo(JSON_VERSION_LATEST_SUPPORTED_DESERIALIZING) > 0)
+			throw new IllegalArgumentException("JSON version " + version + " not supported yet");
+		boolean hasUsageSerialized = version.compareTo(JSON_VERSION_EARLIEST_WITH_USAGE_SERIALIZED) >= 0;
 		DeserializedSubmodelComponent comp = new DeserializedSubmodelComponent(model, name, idForSerializingOverride,
 				paramsForSerializingOverride);
 		comp.setSubmodelScale(params.innerScale);
 		comp.setSize(params.width, params.height);
 		for (InterfacePinParams iPinParams : params.interfacePins)
-			comp.addSubmodelInterface(
-					new MovablePin(comp, iPinParams.name, iPinParams.logicWidth, iPinParams.location.x, iPinParams.location.y));
+			// TRISTATE because we don't have a better choice
+			comp.addSubmodelInterface(new MovablePin(comp, iPinParams.name, iPinParams.logicWidth,
+					hasUsageSerialized ? iPinParams.usage : PinUsage.TRISTATE, iPinParams.location.x, iPinParams.location.y));
 		ViewModelModifiable submodelModifiable = comp.getSubmodelModifiable();
 		ViewModelSerializer.deserialize(comp.getSubmodelModifiable(), params.submodel);
 		comp.setSymbolRenderer(SubmodelComponentSnippetSuppliers.symbolRendererSupplier.getSnippetSupplier(params.symbolRendererSnippetID)
@@ -187,7 +197,7 @@ public final class SubmodelComponentSerializer
 	 */
 	public static SubmodelComponentParams serialize(SubmodelComponent comp, IdentifierGetter idGetter)
 	{
-		SubmodelComponentParams params = new SubmodelComponentParams(CURRENT_JSON_VERSION);
+		SubmodelComponentParams params = new SubmodelComponentParams(JSON_VERSION_CURRENT_SERIALIZING);
 		params.innerScale = comp.getSubmodelScale();
 		params.submodel = ViewModelSerializer.serialize(comp.submodel, idGetter);
 
@@ -203,9 +213,11 @@ public final class SubmodelComponentSerializer
 			iPinParams.location = p.getRelPos();
 			iPinParams.name = p.name;
 			iPinParams.logicWidth = p.logicWidth;
+			iPinParams.usage = p.usage;
 			i++;
 		}
 		params.interfacePins = iPins;
+		Arrays.sort(params.interfacePins, Comparator.comparing(p -> p.name));
 
 		Renderer symbolRenderer = comp.getSymbolRenderer();
 		if (symbolRenderer != null)