X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.model.editor%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Feditor%2FEditor.java;h=c26971935f2e6b2a454450b0a8eaf22e8639e38c;hb=3a52b6bffe52db5dd5ca907b4b3dfd368a58e14f;hp=945490cb8fed1e320ec740c660286c75f3a8555e;hpb=878d036669f4aa9d0c332ced43da3a08b94655e9;p=Mograsim.git

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 945490cb..c2697193 100644
--- 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,6 +1,5 @@
 package net.mograsim.logic.model.editor;
 
-import java.io.IOException;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
@@ -13,6 +12,7 @@ import com.google.gson.JsonParser;
 import com.google.gson.JsonSyntaxException;
 
 import net.haspamelodica.swt.helper.swtobjectwrappers.Point;
+import net.mograsim.logic.model.am2900.Am2900Loader;
 import net.mograsim.logic.model.editor.handles.ComponentHandle;
 import net.mograsim.logic.model.editor.handles.Handle;
 import net.mograsim.logic.model.editor.handles.HandleManager;
@@ -20,11 +20,15 @@ import net.mograsim.logic.model.editor.handles.PinHandle;
 import net.mograsim.logic.model.editor.states.StateManager;
 import net.mograsim.logic.model.editor.ui.DialogManager;
 import net.mograsim.logic.model.editor.ui.EditorGUI;
-import net.mograsim.logic.model.model.ViewModelModifiable;
-import net.mograsim.logic.model.model.components.GUIComponent;
-import net.mograsim.logic.model.model.wires.GUIWire;
+import net.mograsim.logic.model.model.LogicModelModifiable;
+import net.mograsim.logic.model.model.components.ModelComponent;
+import net.mograsim.logic.model.model.wires.ModelWire;
 import net.mograsim.logic.model.serializing.DeserializedSubmodelComponent;
-import net.mograsim.logic.model.serializing.IndirectGUIComponentCreator;
+import net.mograsim.logic.model.serializing.IdentifyParams;
+import net.mograsim.logic.model.serializing.IndirectModelComponentCreator;
+import net.mograsim.logic.model.snippets.highlevelstatehandlers.DefaultHighLevelStateHandler;
+import net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer;
+import net.mograsim.logic.model.snippets.symbolrenderers.DefaultSymbolRenderer;
 
 public final class Editor
 {
@@ -32,7 +36,7 @@ public final class Editor
 	final Set<ComponentInfo> copyBuffer = new HashSet<>();
 	public final DeserializedSubmodelComponent toBeEdited;
 	public final HandleManager handleManager;
-	final static Map<GUIComponent, String> identifierPerComponent = new HashMap<>();
+	final static Map<ModelComponent, String> identifierPerComponent = new HashMap<>();
 	public final EditorGUI gui;
 	public final StateManager stateManager;
 	private final SaveLoadManager saveManager;
@@ -57,7 +61,7 @@ public final class Editor
 		gui.open();
 	}
 
-	public ViewModelModifiable getSubmodel()
+	public LogicModelModifiable getSubmodel()
 	{
 		return toBeEdited.getSubmodelModifiable();
 	}
@@ -123,7 +127,7 @@ public final class Editor
 		selection.clear();
 		for (ComponentInfo info : copyBuffer)
 		{
-			GUIComponent comp = addComponent(info.identifier, info.params);
+			ModelComponent comp = addComponent(info.identifier, info.params);
 			ComponentHandle h = handleManager.getHandle(comp);
 			h.reqMove(info.relX, info.relY);
 			selection.add(h);
@@ -150,13 +154,14 @@ public final class Editor
 			String selected = gui.getAddListSelected();
 			try
 			{
-				GUIComponent c = addComponent(selected, params);
+				ModelComponent c = addComponent(selected, params);
 				selection.clear();
 				selection.add(handleManager.getHandle(c));
 				moveSelection(x, y);
 				successful = true;
 			}
-			catch (@SuppressWarnings("unused") UnsupportedOperationException | JsonSyntaxException | NumberFormatException e)
+			catch (@SuppressWarnings("unused") UnsupportedOperationException | JsonSyntaxException | NumberFormatException
+					| NullPointerException e)
 			{
 				String result = DialogManager.openMultiLineTextDialog("Add component", "Create", "Cancel", "Parameters:");
 				if (result == null)
@@ -166,16 +171,18 @@ public final class Editor
 		}
 	}
 
-	private GUIComponent addComponent(String identifier, JsonElement params)
+	private ModelComponent addComponent(String identifier, JsonElement params)
 	{
-		GUIComponent comp = IndirectGUIComponentCreator.createComponent(toBeEdited.getSubmodelModifiable(), identifier, params);
+		ModelComponent comp = IndirectModelComponentCreator.createComponent(toBeEdited.getSubmodelModifiable(), identifier, params);
 		identifierPerComponent.put(comp, identifier);
 		return comp;
 	}
 
-	public static String getIdentifier(GUIComponent c)
+	public static String getIdentifier(ModelComponent c)
 	{
-		return identifierPerComponent.get(c);
+		if (identifierPerComponent.containsKey(c))
+			return identifierPerComponent.get(c);
+		return c.getIDForSerializing(new IdentifyParams());
 	}
 
 	public void duplicate()
@@ -192,8 +199,8 @@ public final class Editor
 		case OFF:
 			break;
 		case ABSOLUTE:
-			newP.x -= newP.x % snapX;
-			newP.y -= newP.y % snapY;
+			newP.x = (int) (newP.x / snapX + .5) * snapX;
+			newP.y = (int) (newP.y / snapY + .5) * snapY;
 			break;
 		default:
 			break;
@@ -218,7 +225,7 @@ public final class Editor
 	@SuppressWarnings("unused")
 	public void addWire(PinHandle a, PinHandle b)
 	{
-		new GUIWire(toBeEdited.getSubmodelModifiable(), a.getPin(), b.getPin(), new Point[0]);
+		new ModelWire(toBeEdited.getSubmodelModifiable(), a.getPin(), b.getPin(), new Point[0]);
 	}
 
 	public static enum Snapping
@@ -232,9 +239,20 @@ public final class Editor
 		}
 	}
 
-	public static void main(String[] args) throws IOException
+	public static void main(String[] args)
 	{
-		SaveLoadManager.openLoadDialog();
+		Am2900Loader.setup();
+		openNewEditor();
+//		SaveLoadManager.openLoadDialog();
+	}
+
+	public static void openNewEditor()
+	{
+		DeserializedSubmodelComponent toBeEdited = new DeserializedSubmodelComponent(new LogicModelModifiable(), null, null, null);
+		toBeEdited.setOutlineRenderer(new DefaultOutlineRenderer(toBeEdited));
+		toBeEdited.setSymbolRenderer(new DefaultSymbolRenderer(toBeEdited));
+		toBeEdited.setHighLevelStateHandler(new DefaultHighLevelStateHandler());
+		new Editor(toBeEdited);
 	}
 
 	public Snapping getSnapping()