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

improve node names for pot

Browse Source
This commit is contained in:
Bane Stojkovic
2026-08-06 14:30:09 +02:00
parent 757b2fe79f
commit fb4727578d
2 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
diylc/diylc-core/src/main/resources/update.xml
+8
View File
@@ -369,6 +369,10 @@
<releaseDate>2026-07-30 00:00:00.000 CET</releaseDate>
<name></name>
<changes>
<org.diylc.appframework.update.Change>
<changeType>NEW_FEATURE</changeType>
<description>Added two new view perspectives to Potentiometer component - Terminals Up and Terminals down</description>
</org.diylc.appframework.update.Change>
<org.diylc.appframework.update.Change>
<changeType>NEW_FEATURE</changeType>
<description>Use either username of email to log into DIYLC cloud</description>
@@ -377,6 +381,10 @@
<changeType>IMPROVEMENT</changeType>
<description>Improved comparison logic of the 'Compare With..' tool</description>
</org.diylc.appframework.update.Change>
<org.diylc.appframework.update.Change>
<changeType>IMPROVEMENT</changeType>
<description>Align Potentiometer 1-2-3 markings with circuit analysis node labels; it used to be mixed up in some cases</description>
</org.diylc.appframework.update.Change>
</changes>
<url>https://github.com/bancika/diy-layout-creator/releases</url>
</org.diylc.appframework.update.Version>
diylc/diylc-library/src/main/java/org/diylc/components/passive/PotentiometerPanel.java
+12 -10
View File
@@ -516,7 +516,6 @@ public class PotentiometerPanel extends AbstractPotentiometer implements ILayere
double markerOffset = MARKER_OFFSET.convertToPixels() + 5;
for (int i = 0; i < 3; i++) {
Point2D lugPoint = controlPoints[i];
int markerNumber = i + 1;
double mx = lugPoint.getX();
double my = lugPoint.getY();
@@ -530,7 +529,7 @@ public class PotentiometerPanel extends AbstractPotentiometer implements ILayere
my += (dy / dist) * markerOffset;
}
StringUtils.drawCenteredText(g2d, Integer.toString(markerNumber), mx, my,
StringUtils.drawCenteredText(g2d, getControlPointNodeName(i), mx, my,
HorizontalAlignment.CENTER, VerticalAlignment.CENTER);
}
} else {
@@ -545,8 +544,6 @@ public class PotentiometerPanel extends AbstractPotentiometer implements ILayere
double markerDistance = radius - markerOffset;
// Draw markers "1", "2", "3" along radial line from center to each lug, close to circle edge
// Reverse numbering when view is ShaftDown
boolean reverseOrder = getView() == View.ShaftDown;
for (int i = 0; i < 3; i++) {
Point2D lugPoint = controlPoints[i];
@@ -565,10 +562,7 @@ public class PotentiometerPanel extends AbstractPotentiometer implements ILayere
double markerX = centerX + unitX * markerDistance;
double markerY = centerY + unitY * markerDistance;
// Determine marker number based on view
int markerNumber = reverseOrder ? (3 - i) : (i + 1);
StringUtils.drawCenteredText(g2d, Integer.toString(markerNumber), markerX, markerY,
StringUtils.drawCenteredText(g2d, getControlPointNodeName(i), markerX, markerY,
HorizontalAlignment.CENTER, VerticalAlignment.CENTER);
}
}
@@ -769,14 +763,22 @@ public class PotentiometerPanel extends AbstractPotentiometer implements ILayere
this.bodyDepth = bodyDepth;
body = null;
}
@Override
public String getControlPointNodeName(int index) {
if (getView() == View.ShaftUp || getView() == View.TerminalsUp) {
return Integer.toString(index + 1);
}
return Integer.toString(3 - index);
}
@Override
public String getInternalLinkName(int index1, int index2) {
if (index1 > index2)
return getInternalLinkName(index2, index1);
if (index2 - index1 == 1)
return (index1 + 1) + "-" + (index2 + 1);
return getControlPointNodeName(index1) + "-" + getControlPointNodeName(index2);
return null;
}