X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.ui%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fui%2Fmodel%2Fcomponents%2FSimpleRectangularSubmodelComponent.java;h=da8bd4855d13ab14c5fb4408a451cda214330857;hb=82cc1d386820c179be331790fa3c1fae22bada76;hp=3373553026cf30a83d9dfc1c457a7c60e33588a2;hpb=b2f3d0b16783289fab229c667c18d61f84119bbd;p=Mograsim.git

diff --git a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/SimpleRectangularSubmodelComponent.java b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/SimpleRectangularSubmodelComponent.java
index 33735530..da8bd485 100644
--- a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/SimpleRectangularSubmodelComponent.java
+++ b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/SimpleRectangularSubmodelComponent.java
@@ -3,17 +3,21 @@ package net.mograsim.logic.ui.model.components;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
 
 import net.haspamelodica.swt.helper.gcs.GeneralGC;
 import net.haspamelodica.swt.helper.swtobjectwrappers.Font;
 import net.haspamelodica.swt.helper.swtobjectwrappers.Point;
 import net.haspamelodica.swt.helper.swtobjectwrappers.Rectangle;
 import net.mograsim.logic.ui.model.ViewModelModifiable;
-import net.mograsim.logic.ui.model.components.params.RectComponentParams;
+import net.mograsim.logic.ui.model.components.params.SubmodelComponentParams;
 import net.mograsim.logic.ui.model.wires.Pin;
 
 public class SimpleRectangularSubmodelComponent extends SubmodelComponent
 {
+	public static String kLabel = "label", kInCount = "input_count", kOutCount = "output_count", kLogicWidth = "logic_width";
+
 	private static final double width = 35;
 	private static final double pinDistance = 10;
 	private static final double fontHeight = 5;
@@ -124,14 +128,17 @@ public class SimpleRectangularSubmodelComponent extends SubmodelComponent
 		gc.drawRectangle(getBounds());
 	}
 
-	public RectComponentParams calculateRectParams()
+	@Override
+	public SubmodelComponentParams calculateParams()
 	{
-		RectComponentParams params = new RectComponentParams();
-		params.displayName = label;
-		params.inputCount = inputSupermodelPins.size();
-		params.outputCount = outputSubmodelPins.size();
-		params.logicWidth = logicWidth;
-		params.composition = calculateCompositionParams();
-		return params;
+		SubmodelComponentParams ret = super.calculateParams();
+		ret.type = SimpleRectangularSubmodelComponent.class.getSimpleName();
+		Map<String, Object> m = new TreeMap<>();
+		m.put(kLabel, label);
+		m.put(kInCount, inputSupermodelPins.size());
+		m.put(kOutCount, outputSupermodelPins.size());
+		m.put(kLogicWidth, logicWidth);
+		ret.specialized = m;
+		return ret;
 	}
 }
\ No newline at end of file