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=0c0bf301e61bf408666f2ae326e31a87bf2f533b;hb=19ee1a7fdb06a1df65cd7df78fed935124496707;hp=da8bd4855d13ab14c5fb4408a451cda214330857;hpb=2322c2da8893d16273c16a9c3db3b4298ada4895;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 da8bd485..0c0bf301 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 @@ -1,7 +1,9 @@ package net.mograsim.logic.ui.model.components; import java.util.ArrayList; +import java.util.Arrays; import java.util.Collections; +import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.TreeMap; @@ -11,7 +13,6 @@ 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.SubmodelComponentParams; import net.mograsim.logic.ui.model.wires.Pin; public class SimpleRectangularSubmodelComponent extends SubmodelComponent @@ -20,92 +21,73 @@ public class SimpleRectangularSubmodelComponent extends SubmodelComponent private static final double width = 35; private static final double pinDistance = 10; - private static final double fontHeight = 5; + private static final double pinNameMargin = .5; + private static final double labelFontHeight = 5; + private static final double pinNameFontHeight = 3.5; private final String label; protected final int logicWidth; - private final List inputSupermodelPins; - private final List inputSupermodelPinsUnmodifiable; - private final List outputSupermodelPins; - private final List outputSupermodelPinsUnmodifiable; - private final List inputSubmodelPins; - private final List inputSubmodelPinsUnmodifiable; - private final List outputSubmodelPins; - private final List outputSubmodelPinsUnmodifiable; + private final List inputPinNames; + private final List inputPinNamesUnmodifiable; + private final List outputPinNames; + private final List outputPinNamesUnmodifiable; protected SimpleRectangularSubmodelComponent(ViewModelModifiable model, int logicWidth, String label) { super(model); this.label = label; this.logicWidth = logicWidth; - this.inputSupermodelPins = new ArrayList<>(); - this.inputSupermodelPinsUnmodifiable = Collections.unmodifiableList(inputSupermodelPins); - this.outputSupermodelPins = new ArrayList<>(); - this.outputSupermodelPinsUnmodifiable = Collections.unmodifiableList(outputSupermodelPins); - this.inputSubmodelPins = new ArrayList<>(); - this.inputSubmodelPinsUnmodifiable = Collections.unmodifiableList(inputSubmodelPins); - this.outputSubmodelPins = new ArrayList<>(); - this.outputSubmodelPinsUnmodifiable = Collections.unmodifiableList(outputSubmodelPins); + this.inputPinNames = new ArrayList<>(); + this.inputPinNamesUnmodifiable = Collections.unmodifiableList(inputPinNames); + this.outputPinNames = new ArrayList<>(); + this.outputPinNamesUnmodifiable = Collections.unmodifiableList(outputPinNames); } - protected void setInputCount(int inputCount) + protected void setInputPins(String... pinNames) { - int oldInputCount = inputSupermodelPins.size(); - double height = Math.max(inputCount, outputSupermodelPins.size()) * pinDistance; - setSize(width, height); - if (oldInputCount > inputCount) - while (inputSupermodelPins.size() > inputCount) - { - inputSubmodelPins.remove(inputCount); - removePin(inputSupermodelPins.remove(inputCount)); - } - else if (oldInputCount < inputCount) - for (int i = oldInputCount; i < inputCount; i++) - { - Pin submodelPin = addSubmodelInterface(logicWidth, 0, pinDistance / 2 + i * pinDistance); - inputSubmodelPins.add(submodelPin); - inputSupermodelPins.add(getSupermodelPin(submodelPin)); - } + setIOPins(0, inputPinNames, outputPinNames, pinNames); } - protected void setOutputCount(int outputCount) + protected void setOutputPins(String... pinNames) { - int oldOutputCount = outputSupermodelPins.size(); - setSize(width, Math.max(inputSupermodelPins.size(), outputCount) * pinDistance); - if (oldOutputCount > outputCount) - while (outputSupermodelPins.size() > outputCount) - { - outputSubmodelPins.remove(outputCount); - removePin(outputSupermodelPins.get(outputCount)); - } - else if (oldOutputCount < outputCount) - for (int i = oldOutputCount; i < outputCount; i++) - { - Pin submodelPin = addSubmodelInterface(logicWidth, width, pinDistance / 2 + i * pinDistance); - outputSubmodelPins.add(submodelPin); - outputSupermodelPins.add(getSupermodelPin(submodelPin)); - } + setIOPins(width, outputPinNames, inputPinNames, pinNames); } - public List getInputPins() + private void setIOPins(double relX, List pinNamesListThisSide, List pinNamesListOtherSide, String... newPinNames) { - return inputSupermodelPinsUnmodifiable; + int inputCount = newPinNames.length; + List newPinNamesList = Arrays.asList(newPinNames); + if (new HashSet<>(newPinNamesList).size() != inputCount) + throw new IllegalArgumentException("Pin names contain duplicates"); + for (String pinName : newPinNamesList) + if (pinNamesListOtherSide.contains(pinName)) + throw new IllegalArgumentException("Can't add pin. There is a pin on the other side with the same name: " + pinName); + super.setSize(width, Math.max(inputCount, pinNamesListOtherSide.size()) * pinDistance); + for (int i = 0; i < inputCount; i++) + { + String pinName = newPinNames[i]; + int oldPinIndex = pinNamesListThisSide.indexOf(pinName); + if (oldPinIndex == -1) + super.addSubmodelInterface(pinName, logicWidth, relX, pinDistance / 2 + i * pinDistance); + else + getSupermodelMovablePin(pinName).setRelPos(relX, pinDistance / 2 + i * pinDistance); + } + for (String pinName : pinNamesListThisSide) + if (!newPinNamesList.contains(pinName)) + super.removeSubmodelInterface(pinName); + pinNamesListThisSide.clear(); + pinNamesListThisSide.addAll(newPinNamesList); } - public List getOutputPins() + public List getInputPinNames() { - return outputSupermodelPinsUnmodifiable; + return inputPinNamesUnmodifiable; } - protected List getInputSubmodelPins() + public List getOutputPinNames() { - return inputSubmodelPinsUnmodifiable; - } - - protected List getOutputSubmodelPins() - { - return outputSubmodelPinsUnmodifiable; + return outputPinNamesUnmodifiable; } @Override @@ -115,10 +97,23 @@ public class SimpleRectangularSubmodelComponent extends SubmodelComponent double posY = getBounds().y; Font oldFont = gc.getFont(); - Font labelFont = new Font(oldFont.getName(), fontHeight, oldFont.getStyle()); - gc.setFont(labelFont); + gc.setFont(new Font(oldFont.getName(), labelFontHeight, oldFont.getStyle())); Point textExtent = gc.textExtent(label); gc.drawText(label, posX + (getBounds().width - textExtent.x) / 2, posY + (getBounds().height - textExtent.y) / 2, true); + gc.setFont(new Font(oldFont.getName(), pinNameFontHeight, oldFont.getStyle())); + for (int i = 0; i < inputPinNames.size(); i++) + { + String pinName = inputPinNames.get(i); + textExtent = gc.textExtent(pinName); + gc.drawText(pinName, posX + pinNameMargin, posY + i * pinDistance + (pinDistance - textExtent.y) / 2, true); + } + for (int i = 0; i < outputPinNames.size(); i++) + { + String pinName = outputPinNames.get(i); + textExtent = gc.textExtent(pinName); + gc.drawText(pinName, posX + width - textExtent.x - pinNameMargin, posY + i * pinDistance + (pinDistance - textExtent.y) / 2, + true); + } gc.setFont(oldFont); } @@ -135,10 +130,31 @@ public class SimpleRectangularSubmodelComponent extends SubmodelComponent ret.type = SimpleRectangularSubmodelComponent.class.getSimpleName(); Map m = new TreeMap<>(); m.put(kLabel, label); - m.put(kInCount, inputSupermodelPins.size()); - m.put(kOutCount, outputSupermodelPins.size()); + m.put(kInCount, inputPinNames.size()); + m.put(kOutCount, outputPinNames.size()); m.put(kLogicWidth, logicWidth); ret.specialized = m; return ret; } + + @Override + protected Pin addSubmodelInterface(String name, int logicWidth, double relX, double relY) + { + throw new UnsupportedOperationException( + "Can't add submodel interfaces to a SimpleRectangularSubmodelComponent directly, call setInputPins / setOutputPins instead"); + } + + @Override + protected void removeSubmodelInterface(String name) + { + throw new UnsupportedOperationException( + "Can't remove submodel interfaces of a SimpleRectangularSubmodelComponent directly, call setInputPins / setOutputPins instead"); + } + + @Override + protected void setSize(double width, double height) + { + throw new UnsupportedOperationException( + "Can't set the size of a SimpleRectangularSubmodelComponent directly, call setInputPins / setOutputPins instead"); + } } \ No newline at end of file