X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.ui%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fui%2FLogicUICanvas.java;h=3795f64fd1016d41eb268a47f076253cbb0a602d;hb=5ece0acf049bf9af2933f513fe0206565681f622;hp=0ea2680d16705e2ceae372f5c2ce1915ee6b7000;hpb=05f3deb7ee3a0b7162c75e1963be9a739618e3df;p=Mograsim.git diff --git a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/LogicUICanvas.java b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/LogicUICanvas.java index 0ea2680d..3795f64f 100644 --- a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/LogicUICanvas.java +++ b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/LogicUICanvas.java @@ -66,7 +66,7 @@ public class LogicUICanvas extends ZoomableCanvas if (e.button == 1) { Point click = displayToWorldCoords(e.x, e.y); - for (GUIComponent component : model.getComponents()) + for (GUIComponent component : model.getComponentsByName().values()) if (component.getBounds().contains(click) && component.clicked(click.x, click.y)) { redraw(); @@ -163,10 +163,10 @@ public class LogicUICanvas extends ZoomableCanvas private void addComponentSelectorItems(List componentsByItemIndex, String base, Combo componentSelector, ViewModel model) { - for (GUIComponent c : model.getComponents()) + for (GUIComponent c : model.getComponentsByName().values()) if (!(c instanceof WireCrossPoint || c instanceof SubmodelInterface)) { - String item = base + c.getClass().getSimpleName(); + String item = base + c.name; componentsByItemIndex.add(c); componentSelector.add(item); if (c instanceof SubmodelComponent)