TheCloud/Digital
1
0
Fork 0
mirror of https://github.com/hneemann/Digital.git synced 2025-09-28 23:45:17 -04:00
Code Issues Packages Projects Releases Wiki Activity

allow toggle between rectangle and diagonal wires

Browse Source
This commit is contained in:
hneemann 2017-05-28 11:45:44 +02:00
parent c6a857670f
commit 1292f4e116
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/main/java/de/neemann/digital/gui/components/CircuitComponent.java
View File

@ -162,7 +162,9 @@ public class CircuitComponent extends JComponent implements Circuit.ChangedListe
new ToolTipAction("diagWire") {
@Override
public void actionPerformed(ActionEvent e) {
if (activeMouseController instanceof MouseControllerWireRect)
if (activeMouseController instanceof MouseControllerWireDiag)
((MouseControllerWireDiag) activeMouseController).rectangularWire();
else if (activeMouseController instanceof MouseControllerWireRect)
((MouseControllerWireRect) activeMouseController).diagonalWire();
}
}.setAccelerator("D").enableAcceleratorIn(this);
@ -1325,6 +1327,10 @@ public class CircuitComponent extends JComponent implements Circuit.ChangedListe
public void escapePressed() {
mouseNormal.activate();
}
private void rectangularWire() {
mouseWireRect.activate(wire.p1, wire.p2);
}
}
private final class MouseControllerWireRect extends MouseController {
@ -1340,11 +1346,18 @@ public class CircuitComponent extends JComponent implements Circuit.ChangedListe
}
private void activate(Vector startPos) {
activate(startPos, startPos);
selectionMade = false;
}
private void activate(Vector startPos, Vector endPos) {
super.activate();
initialPos = raster(startPos);
wire1 = new Wire(initialPos, initialPos);
wire2 = new Wire(initialPos, initialPos);
selectionMade = false;
wire1 = new Wire(startPos, endPos);
wire2 = new Wire(startPos, endPos);
selectionMade = true;
lastPosition=endPos;
setWires();
}
@Override