diff --git a/src/main/java/de/neemann/digital/draw/elements/Wire.java b/src/main/java/de/neemann/digital/draw/elements/Wire.java index 6f41c8bf5..6ee54b218 100644 --- a/src/main/java/de/neemann/digital/draw/elements/Wire.java +++ b/src/main/java/de/neemann/digital/draw/elements/Wire.java @@ -87,7 +87,7 @@ public class Wire implements Drawable, Movable, ObservableValueReader { style = Style.getWireStyle(value); graphic.drawLine(p1, p2, style); - if (highLight != null && graphic.isFlagSet(Graphic.Flag.tiny)) { + if (highLight == Style.ERROR && graphic.isFlagSet(Graphic.Flag.tiny)) { Vector min = Vector.min(p1, p2).add(-SIZE, -SIZE); Vector max = Vector.max(p1, p2).add(SIZE, SIZE); graphic.drawCircle(min, max, highLight); @@ -237,7 +237,7 @@ public class Wire implements Drawable, Movable, ObservableValueReader { if (p1.x == p2.x) return Orientation.vertical; if (p1.y == p2.y) - return Orientation.horzontal; + return Orientation.horizontal; return Orientation.diagonal; } @@ -359,5 +359,5 @@ public class Wire implements Drawable, Movable, ObservableValueReader { this.isConnectedToSplitter = isConnectedToSplitter; } - enum Orientation {horzontal, vertical, diagonal} + enum Orientation {horizontal, vertical, diagonal} } diff --git a/src/main/java/de/neemann/digital/draw/elements/WireConsistencyChecker.java b/src/main/java/de/neemann/digital/draw/elements/WireConsistencyChecker.java index 16db3d619..95ac3788e 100644 --- a/src/main/java/de/neemann/digital/draw/elements/WireConsistencyChecker.java +++ b/src/main/java/de/neemann/digital/draw/elements/WireConsistencyChecker.java @@ -43,13 +43,13 @@ public class WireConsistencyChecker { HashSet diagPoints = new HashSet<>(); ArrayList newWires = new ArrayList<>(); - WireMerger hori = new WireMerger(Wire.Orientation.horzontal); + WireMerger hori = new WireMerger(Wire.Orientation.horizontal); WireMerger vert = new WireMerger(Wire.Orientation.vertical); for (Wire w : wires) { if (!w.p1.equals(w.p2)) switch (w.getOrientation()) { - case horzontal: + case horizontal: hori.add(w); horiPoints.add(w.p1); horiPoints.add(w.p2); diff --git a/src/main/java/de/neemann/digital/draw/elements/WireMerger.java b/src/main/java/de/neemann/digital/draw/elements/WireMerger.java index 4503098e4..4435e7819 100644 --- a/src/main/java/de/neemann/digital/draw/elements/WireMerger.java +++ b/src/main/java/de/neemann/digital/draw/elements/WireMerger.java @@ -27,7 +27,7 @@ public class WireMerger { public WireMerger(Wire.Orientation orientation) { wireContainers = new HashMap<>(); switch (orientation) { - case horzontal: + case horizontal: handler = new OrientationHandlerHorizontal(); break; case vertical: diff --git a/src/main/resources/lang/lang_en.xml b/src/main/resources/lang/lang_en.xml index 658ccbb8e..26f0d3fe3 100644 --- a/src/main/resources/lang/lang_en.xml +++ b/src/main/resources/lang/lang_en.xml @@ -178,7 +178,7 @@ Button A simple push button which goes back to its original state when it is released. The output signal of the button. - Button + Button with LED A simple push button which goes back to its original state when it is released. The push button has an LED which can be switched via an input signal. The output signal of the button. diff --git a/src/main/resources/lang/lang_pt.xml b/src/main/resources/lang/lang_pt.xml index cf7b8abcd..65f3725d8 100644 --- a/src/main/resources/lang/lang_pt.xml +++ b/src/main/resources/lang/lang_pt.xml @@ -1070,9 +1070,9 @@ Número de polos Número de polos disponíveis. - cátodo comum + Conexão comum - Se a entrada for selecionada como cátodo comum, também será simulada. + Se a entrada for selecionada como ânodo ou cátodo comum, também será simulada. Prevenir o piscamento (flicker) Se não for possível aumentar a frequência o bastante para que o efeito de piscamento possa desaparecer. @@ -1851,4 +1851,15 @@ Portanto, o sinal 'D_out' também será avaliado para se verificar o valor desse Pular o tutorial Transição Estado + Ânodo comum. Para acender os LEDs, essa entrada deverá estar em nível alto. + Comum + Tipo da conexão comum. + Cátodo + Ânodo + Dicas sobre conexões + Se habilitada, linhas serão destacadas quando o mouse passar sobre elas. + Mostrar a caixa de diálogo com resultados + Mostrar a caixa de diálogo com resultados se tiver sido fechada manualmente. + Impossível criar definições de entrada e de saída automaticamente. + Favor verificar as configurações| diff --git a/src/main/resources/lang/lang_pt_ref.xml b/src/main/resources/lang/lang_pt_ref.xml index 9d19c60e0..fc8eccb24 100644 --- a/src/main/resources/lang/lang_pt_ref.xml +++ b/src/main/resources/lang/lang_pt_ref.xml @@ -1075,9 +1075,9 @@ Pole count Number of poles available. - Common cathode + Common Connection - If selected the common cathode input is also simulated. + If selected, a common cathode or anode input is also simulated. Avoid Flicker It is not possible to increase the frequency so much that the flickering disappears. @@ -1864,4 +1864,15 @@ Therefore, the signal 'D_out' is also available to check the value in this case. Skip Tutorial Transition State + Common anode. To turn on the LEDs, this input needs to be high. + Common + Kind of common connection. + Cathode + Anode + Wire tool tips + If set, lines are highlighted when the mouse hovers over them. + Show results dialog + Shows the results dialog again if it was closed manually. + Input and output definitions could not be created automatically. + Please check the settings! diff --git a/src/test/java/de/neemann/digital/draw/elements/WireMergerTest.java b/src/test/java/de/neemann/digital/draw/elements/WireMergerTest.java index c630f8bde..e925d0144 100644 --- a/src/test/java/de/neemann/digital/draw/elements/WireMergerTest.java +++ b/src/test/java/de/neemann/digital/draw/elements/WireMergerTest.java @@ -38,7 +38,7 @@ public class WireMergerTest extends TestCase { } public void testMerge1() { - WireMerger wm = new WireMerger(Wire.Orientation.horzontal); + WireMerger wm = new WireMerger(Wire.Orientation.horizontal); wm.add(new Wire(new Vector(1, 3), new Vector(5, 3))); wm.add(new Wire(new Vector(5, 3), new Vector(8, 3))); wm.add(new Wire(new Vector(1, 4), new Vector(5, 4))); @@ -66,7 +66,7 @@ public class WireMergerTest extends TestCase { } public void testMerge2() { - WireMerger wm = new WireMerger(Wire.Orientation.horzontal); + WireMerger wm = new WireMerger(Wire.Orientation.horizontal); wm.add(new Wire(new Vector(1, 3), new Vector(3, 3))); wm.add(new Wire(new Vector(6, 3), new Vector(8, 3))); wm.add(new Wire(new Vector(2, 3), new Vector(7, 3)));