Ability to rotate tube sockets for arbitrary angle

diylc/diylc-core/src/org/diylc/components/transform/DefaultTransformer.java

@@ -0,0 +1,33 @@
+package org.diylc.components.transform;
+
+import java.awt.Point;
+
+import org.diylc.common.IComponentTransformer;
+import org.diylc.core.IDIYComponent;
+
+public class DefaultTransformer implements IComponentTransformer {
+
+  @Override
+  public boolean canRotate(IDIYComponent<?> component) {
+    return false;
+  }
+
+  @Override
+  public boolean canMirror(IDIYComponent<?> component) {
+    return false;
+  }
+  
+  @Override
+  public boolean mirroringChangesCircuit() {   
+    return false;
+  }
+
+  @Override
+  public void rotate(IDIYComponent<?> component, Point center, int direction) {
+  }
+
+  @Override
+  public void mirror(IDIYComponent<?> component, Point center, int direction) {
+  }
+
+}

diylc/diylc-core/src/org/diylc/components/transform/LeadedComponentTransformer.java

@@ -0,0 +1,48 @@
+package org.diylc.components.transform;
+
+import java.awt.Point;
+import java.awt.geom.AffineTransform;
+
+import org.diylc.common.IComponentTransformer;
+import org.diylc.core.IDIYComponent;
+
+public class LeadedComponentTransformer implements IComponentTransformer {
+
+  @Override
+  public boolean canRotate(IDIYComponent<?> component) {
+    return true;
+  }
+
+  @Override
+  public boolean canMirror(IDIYComponent<?> component) {
+    return true;
+  }
+  
+  @Override
+  public boolean mirroringChangesCircuit() {   
+    return false;
+  }
+
+  @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);
+    }
+  }
+
+  @Override
+  public void mirror(IDIYComponent<?> component, Point center, int direction) {
+    for (int i = 0; i < component.getControlPointCount(); i++) {
+      Point p = component.getControlPoint(i);
+      if (direction == IComponentTransformer.HORIZONTAL) {
+        component.setControlPoint(new Point(p.x - 2 * (p.x - center.x), p.y), i);
+      } else {
+        component.setControlPoint(new Point(p.x, p.y - 2 * (p.y - center.y)), i);
+      }
+    }
+  }
+
+}

diylc/diylc-library/src/org/diylc/components/tube/TubeSocket.java

@@ -34,7 +34,7 @@ public class TubeSocket extends AbstractTransparentComponent<String> {
 
   private static final long serialVersionUID = 1L;
 
-  private static Color BODY_COLOR = Color.decode("#FFFFE0");
+  private static Color BODY_COLOR = Color.decode("#F7F7EF");
   private static Color BORDER_COLOR = Color.decode("#8E8E38");
   public static Color PIN_COLOR = Color.decode("#00B2EE");
   public static Color PIN_BORDER_COLOR = PIN_COLOR.darker();
@@ -44,8 +44,9 @@ public class TubeSocket extends AbstractTransparentComponent<String> {
 
   private Base base = Base.B9A;
   private String type = "";
-  private Orientation orientation = Orientation.DEFAULT;
+  private Orientation orientation;
   // private Mount mount = Mount.CHASSIS;
+  private int angle;
 
   private Point[] controlPoints = new Point[] {new Point(0, 0)};
 
@@ -67,14 +68,41 @@ public class TubeSocket extends AbstractTransparentComponent<String> {
     // Reset body shape
     body = null;
   }
+//
+//  @EditableProperty
+//  public Orientation getOrientation() {
+//    return orientation;
+//  }
+//
+//  public void setOrientation(Orientation orientation) {
+//    this.orientation = orientation;
+//    updateControlPoints();
+//    // Reset body shape
+//    body = null;
+//  }
 
   @EditableProperty
-  public Orientation getOrientation() {
+  @SuppressWarnings("incomplete-switch")
-    return orientation;
+  public int getAngle() {
+    if (orientation != null) {
+      switch (orientation) {
+        case _90:
+          angle = 90;
+          break;
+        case _180:
+          angle = 180;
+          break;
+        case _270:
+          angle = 270;
+          break;
+      }
+      orientation = null;
+    }
+    return angle;
   }
 
-  public void setOrientation(Orientation orientation) {
+  public void setAngle(int angle) {
-    this.orientation = orientation;
+    this.angle = angle;
     updateControlPoints();
     // Reset body shape
     body = null;
@@ -115,31 +143,15 @@ public class TubeSocket extends AbstractTransparentComponent<String> {
     }
     double angleIncrement = Math.PI * 2 / (hasEmptySpace ? (pinCount + 1) : pinCount);
     double initialAngleOffset = hasEmptySpace ? angleIncrement : (angleIncrement / 2);
-    double initialAngle;
+
-    switch (orientation) {
-      case DEFAULT:
-        initialAngle = Math.PI / 2 + initialAngleOffset;
-        break;
-      case _90:
-        initialAngle = Math.PI + initialAngleOffset;
-        break;
-      case _180:
-        initialAngle = 3 * Math.PI / 2 + initialAngleOffset;
-        break;
-      case _270:
-        initialAngle = initialAngleOffset;
-        break;
-      default:
-        throw new RuntimeException("Unexpected orientation: " + orientation);
-    }
     controlPoints = new Point[pinCount + 1];
-    double angle = initialAngle;
+    double theta = initialAngleOffset + Math.toRadians(getAngle());
     controlPoints[0] = firstPoint;
     for (int i = 0; i < pinCount; i++) {
       controlPoints[i + 1] =
-          new Point((int) (firstPoint.getX() + Math.cos(angle) * pinCircleDiameter / 2),
+          new Point((int) (firstPoint.getX() + Math.cos(theta) * pinCircleDiameter / 2),
-              (int) (firstPoint.getY() + Math.sin(angle) * pinCircleDiameter / 2));
+              (int) (firstPoint.getY() + Math.sin(theta) * pinCircleDiameter / 2));
-      angle += angleIncrement;
+      theta += angleIncrement;
     }
   }
 
@@ -168,23 +180,9 @@ public class TubeSocket extends AbstractTransparentComponent<String> {
           / 2, holeSize, holeSize)));
       if (base == Base.OCTAL) {
         int tickSize = getClosestOdd(TICK_SIZE.convertToPixels());
-        double angle = 0;
+        double theta = Math.toRadians(getAngle());
-        switch (orientation) {
+        int centerX = (int) (controlPoints[0].x + Math.cos(theta) * holeSize / 2);
-          case DEFAULT:
+        int centerY = (int) (controlPoints[0].y + Math.sin(theta) * holeSize / 2);
-            angle = Math.PI / 2;
-            break;
-          case _90:
-            angle = Math.PI;
-            break;
-          case _180:
-            angle = 3 * Math.PI / 2;
-            break;
-          case _270:
-            angle = 0;
-            break;
-        }
-        int centerX = (int) (controlPoints[0].x + Math.cos(angle) * holeSize / 2);
-        int centerY = (int) (controlPoints[0].y + Math.sin(angle) * holeSize / 2);
         bodyArea.subtract(new Area(new Ellipse2D.Double(centerX - tickSize / 2, centerY - tickSize / 2, tickSize,
             tickSize)));
       }

diylc/diylc-swing/update.xml

@@ -1561,14 +1561,18 @@
 				<org.diylc.appframework.update.Change>
 					<changeType>NEW_FEATURE</changeType>
 					<description>Show/hide the grid</description>
-				</org.diylc.appframework.update.Change>							
+				</org.diylc.appframework.update.Change>		
+				<org.diylc.appframework.update.Change>
+					<changeType>IMPROVEMENT</changeType>
+					<description>Ability to rotate tube sockets for arbitrary angle</description>
+				</org.diylc.appframework.update.Change>					
 				<org.diylc.appframework.update.Change>
 					<changeType>IMPROVEMENT</changeType>
 					<description>Applying a template shouldn't affect component placement</description>
 				</org.diylc.appframework.update.Change>
 				<org.diylc.appframework.update.Change>
 					<changeType>IMPROVEMENT</changeType>
-					<description>Improved rotation and mirroring of multiple components</description>
+					<description>Improved rotation and mirroring of multiple components at the same time</description>
 				</org.diylc.appframework.update.Change>
 			</changes>
 			<url>https://github.com/bancika/diy-layout-creator/releases</url>