From a9f177b980056f51da5d9e31dadc6b9b48e63d08 Mon Sep 17 00:00:00 2001 From: bancika Date: Wed, 11 Jan 2017 13:58:35 +0100 Subject: [PATCH] jack transformer --- diylc/diylc-library/lib/diylc-core.jar | Bin 232763 -> 232763 bytes .../transform/ClosedJackTransformer.java | 103 ++++++++++++++++++ diylc/diylc-swing/lib/diylc-core.jar | Bin 232763 -> 232763 bytes diylc/diylc-swing/library/main.jar | Bin 391621 -> 391602 bytes .../swing/plugins/canvas/CanvasPanel.java | 2 +- 5 files changed, 104 insertions(+), 1 deletion(-) create mode 100644 diylc/diylc-library/src/org/diylc/components/transform/ClosedJackTransformer.java diff --git a/diylc/diylc-library/lib/diylc-core.jar b/diylc/diylc-library/lib/diylc-core.jar index d60073aa77fb9d7a38784dd8bf3f51dcd2841d9d..eb2e6cb11b046482eb15bdc45662f11e39a1fa74 100644 GIT binary patch delta 3878 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 component) { + return component.getClass().equals(ClosedJack1_4.class); + } + + @Override + public boolean canMirror(IDIYComponent component) { + return component.getClass().equals(ClosedJack1_4.class); + } + + @Override + public boolean mirroringChangesCircuit() { + return true; + } + + @Override + public void rotate(IDIYComponent component, Point center, int direction) { + AffineTransform rotate = AffineTransform.getRotateInstance(Math.PI / 2 * direction, center.x, center.y); + for (int index = 0; index < component.getControlPointCount(); index++) { + Point p = new Point(component.getControlPoint(index)); + rotate.transform(p, p); + component.setControlPoint(p, index); + } + + ClosedJack1_4 jack = (ClosedJack1_4) component; + Orientation o = jack.getOrientation(); + int oValue = o.ordinal(); + oValue += direction; + if (oValue < 0) + oValue = Orientation.values().length - 1; + if (oValue >= Orientation.values().length) + oValue = 0; + o = Orientation.values()[oValue]; + jack.setOrientation(o); + } + + @Override + public void mirror(IDIYComponent component, Point center, int direction) { + ClosedJack1_4 jack = (ClosedJack1_4) component; + + if (direction == IComponentTransformer.HORIZONTAL) { + int dx = 2 * (center.x - jack.getControlPoint(0).x); + int dy = 0; + + Orientation o = jack.getOrientation(); + switch (o) { + case DEFAULT: + o = Orientation._180; + break; + case _90: + break; + case _180: + o = Orientation.DEFAULT; + break; + case _270: + break; + } + + for (int i = 0; i < jack.getControlPointCount(); i++) { + Point p = jack.getControlPoint(i); + jack.setControlPoint(new Point(p.x + dx, p.y + dy), i); + } + + jack.setOrientation(o); + } else { + int dx = 0; + int dy = 2 * (center.y - jack.getControlPoint(0).y); + + Orientation o = jack.getOrientation(); + switch (o) { + case DEFAULT: + break; + case _90: + o = Orientation._270; + break; + case _180: + break; + case _270: + o = Orientation._90; + break; + } + + for (int i = 0; i < jack.getControlPointCount(); i++) { + Point p = jack.getControlPoint(i); + jack.setControlPoint(new Point(p.x + dx, p.y + dy), i); + } + + jack.setOrientation(o); + } + } +} diff --git a/diylc/diylc-swing/lib/diylc-core.jar b/diylc/diylc-swing/lib/diylc-core.jar index d60073aa77fb9d7a38784dd8bf3f51dcd2841d9d..eb2e6cb11b046482eb15bdc45662f11e39a1fa74 100644 GIT binary patch delta 3878 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 XsMQ?X8D~=+(QDs;7Mnm8?vV0-y=DUg delta 7360 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 T18jO2zJClD@o7FLY0&-;Y$9Nl diff --git a/diylc/diylc-swing/src/org/diylc/swing/plugins/canvas/CanvasPanel.java b/diylc/diylc-swing/src/org/diylc/swing/plugins/canvas/CanvasPanel.java index b0558b22..5a789c7c 100644 --- a/diylc/diylc-swing/src/org/diylc/swing/plugins/canvas/CanvasPanel.java +++ b/diylc/diylc-swing/src/org/diylc/swing/plugins/canvas/CanvasPanel.java @@ -117,7 +117,7 @@ public class CanvasPanel extends JComponent implements Autoscroll { if (ConfigurationManager.getInstance().readBoolean(IPlugInPort.OUTLINE_KEY, false)) { drawOptions.add(DrawOption.OUTLINE_MODE); } - if (ConfigurationManager.getInstance().readBoolean(IPlugInPort.SHOW_GRID_KEY, false)) { + if (ConfigurationManager.getInstance().readBoolean(IPlugInPort.SHOW_GRID_KEY, true)) { drawOptions.add(DrawOption.GRID); } plugInPort.draw(g2d, drawOptions, null);