X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.ui%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fui%2Fmodel%2Fcomponents%2FGUICustomComponentCreator.java;h=02b022a9e70a96714d54e51a0d06fb9659285693;hb=19ee1a7fdb06a1df65cd7df78fed935124496707;hp=9d0409252e9d17dc43bc73a8c4828ac09d447cc7;hpb=29948edc1851d17311c50c7eff34070a0dc36ceb;p=Mograsim.git diff --git a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/GUICustomComponentCreator.java b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/GUICustomComponentCreator.java index 9d040925..02b022a9 100644 --- a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/GUICustomComponentCreator.java +++ b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/GUICustomComponentCreator.java @@ -85,13 +85,13 @@ public final class GUICustomComponentCreator int inputCount = ((Number) m.get(SimpleRectangularSubmodelComponent.kInCount)).intValue(); String[] inputNames = new String[inputCount]; for (int i = 0; i < inputCount; i++) - inputNames[i] = "Input pin #" + i; + inputNames[i] = params.interfacePins[i].name; rect.setInputPins(inputNames); int outputCount = ((Number) m.get(SimpleRectangularSubmodelComponent.kOutCount)).intValue(); String[] outputPins = new String[outputCount]; for (int i = 0; i < outputCount; i++) - outputPins[i] = "Output pin #" + i; + outputPins[i] = params.interfacePins[inputCount + i].name; rect.setOutputPins(outputPins); return rect; @@ -145,9 +145,8 @@ public final class GUICustomComponentCreator { InnerWireParams innerWire = params.innerWires[i]; new GUIWire(comp.submodelModifiable, - comp.submodelModifiable.getComponents().get(innerWire.pin1.compId).getPins().get(innerWire.pin1.pinIndex), - comp.submodelModifiable.getComponents().get(innerWire.pin2.compId).getPins().get(innerWire.pin2.pinIndex), - innerWire.path); + comp.submodelModifiable.getComponents().get(innerWire.pin1.compId).getPin(innerWire.pin1.pinName), + comp.submodelModifiable.getComponents().get(innerWire.pin2.compId).getPin(innerWire.pin2.pinName), innerWire.path); } } catch (InstantiationException | IllegalAccessException | InvocationTargetException | NoSuchMethodException | SecurityException