From 34564f49afd5e2667fbec27924e0a9dfe1304264 Mon Sep 17 00:00:00 2001
From: hneemann <helmut.neemann@arcor.de>
Date: Sat, 27 May 2017 10:59:14 +0200
Subject: [PATCH] added a flip shortcut

---
 distribution/ReleaseNotes.txt                 |  3 ++
 .../gui/components/CircuitComponent.java      | 34 ++++++++++++++-----
 2 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/distribution/ReleaseNotes.txt b/distribution/ReleaseNotes.txt
index 33935220c..860a70f51 100644
--- a/distribution/ReleaseNotes.txt
+++ b/distribution/ReleaseNotes.txt
@@ -8,6 +8,9 @@ Planned as v0.12
   Up to now only a view 74xx circuits are available.
 - Add some functions to make it easier to create 74xx circuits.
 - Added undo/redo functions
+- New wire drawing mode: If a wire is added it is rectangular by default.
+  Pressing ESC switches to diagonal mode, pressing ESC again aborts the wire operation.
+  In rectangular mode the key "F" flips the wire.
 
 v0.11.1, released on 02. May 2017
 - Added the possibility to open a circuit from the command line.
diff --git a/src/main/java/de/neemann/digital/gui/components/CircuitComponent.java b/src/main/java/de/neemann/digital/gui/components/CircuitComponent.java
index 357b2bca7..38b85d994 100644
--- a/src/main/java/de/neemann/digital/gui/components/CircuitComponent.java
+++ b/src/main/java/de/neemann/digital/gui/components/CircuitComponent.java
@@ -148,6 +148,14 @@ public class CircuitComponent extends JComponent implements Circuit.ChangedListe
             }
         }.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0)).enableAcceleratorIn(this);
 
+        new ToolTipAction("flipWire") {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                if (activeMouseController instanceof MouseControllerWireRect)
+                    ((MouseControllerWireRect) activeMouseController).flipWire();
+            }
+        }.setAccelerator(KeyStroke.getKeyStroke("F")).enableAcceleratorIn(this);
+
         new ToolTipAction(Lang.get("menu_programDiode")) {
             @Override
             public void actionPerformed(ActionEvent e) {
@@ -1200,8 +1208,9 @@ public class CircuitComponent extends JComponent implements Circuit.ChangedListe
         private Wire wire1;
         private Wire wire2;
         private boolean selectionMade;
-        private boolean firstHori;
+        private boolean firstHorizontal;
         private Vector initialPos;
+        private Vector lastPosition;
 
         private MouseControllerWireRect(Cursor cursor) {
             super(cursor);
@@ -1217,25 +1226,28 @@ public class CircuitComponent extends JComponent implements Circuit.ChangedListe
 
         @Override
         void moved(MouseEvent e) {
-            Vector p = raster(getPosVector(e));
+            lastPosition = raster(getPosVector(e));
             if (!selectionMade) {
-                Vector delta = p.sub(initialPos);
+                Vector delta = lastPosition.sub(initialPos);
                 boolean dx = Math.abs(delta.x) > DRAG_DISTANCE;
                 boolean dy = Math.abs(delta.y) > DRAG_DISTANCE;
                 if (dx || dy) {
-                    firstHori = dx;
+                    firstHorizontal = dx;
                     selectionMade = true;
                 }
             }
+            setWires();
+        }
 
+        private void setWires() {
             Vector pm;
-            if (firstHori)
-                pm = new Vector(p.x, wire1.p1.y);
+            if (firstHorizontal)
+                pm = new Vector(lastPosition.x, wire1.p1.y);
             else
-                pm = new Vector(wire1.p1.x, p.y);
+                pm = new Vector(wire1.p1.x, lastPosition.y);
             wire1.setP2(pm);
             wire2.setP1(pm);
-            wire2.setP2(p);
+            wire2.setP2(lastPosition);
             repaint();
         }
 
@@ -1270,6 +1282,12 @@ public class CircuitComponent extends JComponent implements Circuit.ChangedListe
             mouseWireDiag.activate(initialPos, wire2.p2);
             repaint();
         }
+
+        private void flipWire() {
+            selectionMade = true;
+            firstHorizontal = !firstHorizontal;
+            setWires();
+        }
     }