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

add center-off switch types

Browse Source
This commit is contained in:
Branislav Stojkovic
2019-02-16 16:05:15 +01:00
parent 2727276a09
commit 45404aaabd
2 changed files with 44 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
diylc/diylc-library/src/org/diylc/components/electromechanical/MiniToggleSwitch.java
+36 -13
View File
@@ -89,12 +89,14 @@ public class MiniToggleSwitch extends AbstractTransparentComponent<ToggleSwitchT
case SPST: case SPST:
controlPoints = new Point[] {firstPoint, new Point(firstPoint.x, firstPoint.y + spacing)}; controlPoints = new Point[] {firstPoint, new Point(firstPoint.x, firstPoint.y + spacing)};
break; break;
case SPDT: case SPDT:
case SPDT_off:
controlPoints = controlPoints =
new Point[] {firstPoint, new Point(firstPoint.x, firstPoint.y + spacing), new Point[] {firstPoint, new Point(firstPoint.x, firstPoint.y + spacing),
new Point(firstPoint.x, firstPoint.y + 2 * spacing)}; new Point(firstPoint.x, firstPoint.y + 2 * spacing)};
break; break;
case DPDT: case DPDT:
case DPDT_off:
controlPoints = controlPoints =
new Point[] {firstPoint, new Point(firstPoint.x, firstPoint.y + spacing), new Point[] {firstPoint, new Point(firstPoint.x, firstPoint.y + spacing),
new Point(firstPoint.x, firstPoint.y + 2 * spacing), new Point(firstPoint.x + spacing, firstPoint.y), new Point(firstPoint.x, firstPoint.y + 2 * spacing), new Point(firstPoint.x + spacing, firstPoint.y),
@@ -112,7 +114,8 @@ public class MiniToggleSwitch extends AbstractTransparentComponent<ToggleSwitchT
new Point(firstPoint.x + spacing, firstPoint.y + 2 * spacing), new Point(firstPoint.x + spacing, firstPoint.y + 2 * spacing),
new Point(firstPoint.x + spacing, firstPoint.y + 3 * spacing)}; new Point(firstPoint.x + spacing, firstPoint.y + 3 * spacing)};
break; break;
case _3PDT: case _3PDT:
case _3PDT_off:
controlPoints = controlPoints =
new Point[] {firstPoint, new Point(firstPoint.x, firstPoint.y + spacing), new Point[] {firstPoint, new Point(firstPoint.x, firstPoint.y + spacing),
new Point(firstPoint.x, firstPoint.y + 2 * spacing), new Point(firstPoint.x + spacing, firstPoint.y), new Point(firstPoint.x, firstPoint.y + 2 * spacing), new Point(firstPoint.x + spacing, firstPoint.y),
@@ -122,7 +125,8 @@ public class MiniToggleSwitch extends AbstractTransparentComponent<ToggleSwitchT
new Point(firstPoint.x + 2 * spacing, firstPoint.y + spacing), new Point(firstPoint.x + 2 * spacing, firstPoint.y + spacing),
new Point(firstPoint.x + 2 * spacing, firstPoint.y + 2 * spacing)}; new Point(firstPoint.x + 2 * spacing, firstPoint.y + 2 * spacing)};
break; break;
case _4PDT: case _4PDT:
case _4PDT_off:
controlPoints = controlPoints =
new Point[] {firstPoint, new Point(firstPoint.x, firstPoint.y + spacing), new Point[] {firstPoint, new Point(firstPoint.x, firstPoint.y + spacing),
new Point(firstPoint.x, firstPoint.y + 2 * spacing), new Point(firstPoint.x + spacing, firstPoint.y), new Point(firstPoint.x, firstPoint.y + 2 * spacing), new Point(firstPoint.x + spacing, firstPoint.y),
@@ -135,7 +139,8 @@ public class MiniToggleSwitch extends AbstractTransparentComponent<ToggleSwitchT
new Point(firstPoint.x + 3 * spacing, firstPoint.y + spacing), new Point(firstPoint.x + 3 * spacing, firstPoint.y + spacing),
new Point(firstPoint.x + 3 * spacing, firstPoint.y + 2 * spacing)}; new Point(firstPoint.x + 3 * spacing, firstPoint.y + 2 * spacing)};
break; break;
case _5PDT: case _5PDT:
case _5PDT_off:
controlPoints = controlPoints =
new Point[] {firstPoint, new Point(firstPoint.x, firstPoint.y + spacing), new Point[] {firstPoint, new Point(firstPoint.x, firstPoint.y + spacing),
new Point(firstPoint.x, firstPoint.y + 2 * spacing), new Point(firstPoint.x + spacing, firstPoint.y), new Point(firstPoint.x, firstPoint.y + 2 * spacing), new Point(firstPoint.x + spacing, firstPoint.y),
@@ -302,12 +307,14 @@ public class MiniToggleSwitch extends AbstractTransparentComponent<ToggleSwitchT
new RoundRectangle2D.Double(firstPoint.x - margin, firstPoint.y - margin, 2 * margin, 2 * margin new RoundRectangle2D.Double(firstPoint.x - margin, firstPoint.y - margin, 2 * margin, 2 * margin
+ spacing, margin, margin); + spacing, margin, margin);
break; break;
case SPDT: case SPDT:
case SPDT_off:
body = body =
new RoundRectangle2D.Double(firstPoint.x - margin, firstPoint.y - margin, 2 * margin, 2 * margin + 2 new RoundRectangle2D.Double(firstPoint.x - margin, firstPoint.y - margin, 2 * margin, 2 * margin + 2
* spacing, margin, margin); * spacing, margin, margin);
break; break;
case DPDT: case DPDT:
case DPDT_off:
body = body =
new RoundRectangle2D.Double(firstPoint.x - margin, firstPoint.y - margin, 2 * margin + spacing, 2 new RoundRectangle2D.Double(firstPoint.x - margin, firstPoint.y - margin, 2 * margin + spacing, 2
* margin + 2 * spacing, margin, margin); * margin + 2 * spacing, margin, margin);
@@ -317,17 +324,20 @@ public class MiniToggleSwitch extends AbstractTransparentComponent<ToggleSwitchT
new RoundRectangle2D.Double(firstPoint.x - margin, firstPoint.y - margin, 2 * margin + spacing, 2 new RoundRectangle2D.Double(firstPoint.x - margin, firstPoint.y - margin, 2 * margin + spacing, 2
* margin + 3 * spacing, margin, margin); * margin + 3 * spacing, margin, margin);
break; break;
case _3PDT: case _3PDT:
case _3PDT_off:
body = body =
new RoundRectangle2D.Double(firstPoint.x - margin, firstPoint.y - margin, 2 * margin + 2 * spacing, 2 new RoundRectangle2D.Double(firstPoint.x - margin, firstPoint.y - margin, 2 * margin + 2 * spacing, 2
* margin + 2 * spacing, margin, margin); * margin + 2 * spacing, margin, margin);
break; break;
case _4PDT: case _4PDT:
case _4PDT_off:
body = body =
new RoundRectangle2D.Double(firstPoint.x - margin, firstPoint.y - margin, 2 * margin + 3 * spacing, 2 new RoundRectangle2D.Double(firstPoint.x - margin, firstPoint.y - margin, 2 * margin + 3 * spacing, 2
* margin + 2 * spacing, margin, margin); * margin + 2 * spacing, margin, margin);
break; break;
case _5PDT: case _5PDT:
case _5PDT_off:
body = body =
new RoundRectangle2D.Double(firstPoint.x - margin, firstPoint.y - margin, 2 * margin + 4 * spacing, 2 new RoundRectangle2D.Double(firstPoint.x - margin, firstPoint.y - margin, 2 * margin + 4 * spacing, 2
* margin + 2 * spacing, margin, margin); * margin + 2 * spacing, margin, margin);
@@ -398,7 +408,12 @@ public class MiniToggleSwitch extends AbstractTransparentComponent<ToggleSwitchT
case _4PDT: case _4PDT:
case _5PDT: case _5PDT:
return 2; return 2;
case _DP3T_mustang: case _DP3T_mustang:
case SPDT_off:
case DPDT_off:
case _3PDT_off:
case _4PDT_off:
case _5PDT_off:
return 3; return 3;
} }
return 2; return 2;
@@ -406,20 +421,28 @@ public class MiniToggleSwitch extends AbstractTransparentComponent<ToggleSwitchT
@Override @Override
public String getPositionName(int position) { public String getPositionName(int position) {
return Integer.toString(position); if (switchType.name().endsWith("_off") && position == 2)
return "OFF";
return "ON" + Integer.toString(position + 1);
} }
@Override @Override
public boolean arePointsConnected(int index1, int index2, int position) { public boolean arePointsConnected(int index1, int index2, int position) {
switch (switchType) { switch (switchType) {
case SPST: case SPST:
return position == 1; return position == 0;
case SPDT: case SPDT:
case DPDT: case DPDT:
case _3PDT: case _3PDT:
case _4PDT: case _4PDT:
case _5PDT: case _5PDT:
return (index2 - index1) < 3 && index1 % 3 == position && index2 % 3 == position + 1; 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:
return position != 2 && (index2 - index1) < 3 && index1 % 3 == position && index2 % 3 == position + 1;
case _DP3T_mustang: case _DP3T_mustang:
return (index2 - index1) < 3 && index1 % 3 == 0 && index2 % 3 == position + 1; return (index2 - index1) < 3 && index1 % 3 == 0 && index2 % 3 == position + 1;
} }
diylc/diylc-library/src/org/diylc/components/electromechanical/ToggleSwitchType.java
+8 -2
View File
@@ -23,10 +23,16 @@ package org.diylc.components.electromechanical;
public enum ToggleSwitchType { public enum ToggleSwitchType {
SPST, SPDT, DPDT, _DP3T_mustang, _3PDT, _4PDT, _5PDT; SPST, SPDT, DPDT, _DP3T_mustang, _3PDT, _4PDT, _5PDT, SPDT_off, DPDT_off, _3PDT_off, _4PDT_off, _5PDT_off;
@Override @Override
public String toString() { public String toString() {
return name().replace("_", ""); String name = name();
if (name.startsWith("_"))
name = name.substring(1);
name = name.replace("_", " ");
name = name.replace("mustang", "");
name = name.replace("off", " (Center OFF)");
return name;
} }
} }