BDC/diy-layout-creator
2
0
Fork 0
mirror of https://github.com/bancika/diy-layout-creator synced 2026-11-07 12:24:58 +10:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/bancika/diy-layout-creator

Browse Source
This commit is contained in:
Bane Stojkovic
2026-10-27 16:50:16 +01:00
parent 201d9bb518 0514ea2262
commit 36533d46dd
2 changed files with 24 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
diylc/diylc-library/src/main/java/org/diylc/components/electromechanical/MiniToggleSwitch.java
+20
View File
@@ -171,6 +171,15 @@ public class MiniToggleSwitch extends AbstractTransparentComponent<ToggleSwitchT
new Point2D.Double(firstPoint.getX() + 4 * spacing, firstPoint.getY() + spacing),
new Point2D.Double(firstPoint.getX() + 4 * spacing, firstPoint.getY() + 2 * spacing)};
break;
case _6PDT:
case _6PDT_off:
controlPoints = new Point2D[18];
for (int i = 0; i < controlPoints.length; i++) {
controlPoints[i] = new Point2D.Double(
firstPoint.getX() + (i / 3) * spacing,
firstPoint.getY() + (i % 3) * spacing);
}
break;
}
AffineTransform xform = AffineTransform.getRotateInstance(-Math.PI / 2, firstPoint.getX(), firstPoint.getY());
if (getOrientation() == OrientationHV.HORIZONTAL) {
@@ -408,6 +417,15 @@ public class MiniToggleSwitch extends AbstractTransparentComponent<ToggleSwitchT
new RoundRectangle2D.Double(firstPoint.getX() - margin, firstPoint.getY() - margin, 2 * margin + 4 * spacing, 2
* margin + 2 * spacing, margin, margin);
break;
case _6PDT:
case _6PDT_off:
body = new RoundRectangle2D.Double(
firstPoint.getX() - margin,
firstPoint.getY() - margin,
2 * margin + 5 * spacing,
2 * margin + 2 * spacing,
margin, margin);
break;
}
if (getOrientation() == OrientationHV.HORIZONTAL) {
AffineTransform xform = AffineTransform.getRotateInstance(-Math.PI / 2, firstPoint.getX(), firstPoint.getY());
@@ -548,12 +566,14 @@ public class MiniToggleSwitch extends AbstractTransparentComponent<ToggleSwitchT
case _3PDT:
case _4PDT:
case _5PDT:
case _6PDT:
return (index2 - index1) < 3 && index1 % 3 == position && index2 % 3 == position + 1;
case SPDT_off:
case DPDT_off:
case _3PDT_off:
case _4PDT_off:
case _5PDT_off:
case _6PDT_off:
if (position == 1)
return false;
if (position == 2)
diylc/diylc-library/src/main/java/org/diylc/components/electromechanical/ToggleSwitchType.java
+4 -2
View File
@@ -37,8 +37,10 @@ public enum ToggleSwitchType {
_4PDT_ononon_1("4PDT (On/On/On Type 1)", 3),
_4PDT_ononon_2("4PDT (On/On/On Type 2)", 3),
_5PDT("5PDT", 2),
_5PDT_off("5PDT (On/Off/On)", 3);
_5PDT_off("5PDT (On/Off/On)", 3),
_6PDT("6PDT", 2),
_6PDT_off("6PDT (On/Off/On)", 3);
private String label;
private final int positionCount;