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

Potentiometer bodies are no longer considered as conductive surfaces to avoid unwanted shorts

Browse Source
This commit is contained in:
Bane Stojkovic
2022-11-26 11:20:00 +01:00
parent 0e5dad5412
commit 45b9532e66
77 changed files with 717 additions and 865 deletions
Download Patch File Download Diff File Expand all files Collapse all files
diylc/diylc-library/lib/diylc-core.jar
BIN
View File
Binary file not shown.
diylc/diylc-library/src/org/diylc/components/electromechanical/MiniToggleSwitch.java
+13 -7
View File
@@ -40,6 +40,7 @@ import org.diylc.components.transform.MiniToggleSwitchTransformer;
import org.diylc.core.ComponentState;
import org.diylc.core.IDIYComponent;
import org.diylc.core.IDrawingObserver;
import org.diylc.core.ILayer;
import org.diylc.core.ISwitch;
import org.diylc.core.Project;
import org.diylc.core.Theme;
@@ -54,7 +55,7 @@ import org.diylc.utils.Constants;
@ComponentDescriptor(name = "Mini Toggle Switch", category = "Electro-Mechanical", author = "Branislav Stojkovic",
description = "Panel mounted mini toggle switch", zOrder = IDIYComponent.COMPONENT,
instanceNamePrefix = "SW", autoEdit = false, enableCache = true, transformer = MiniToggleSwitchTransformer.class)
public class MiniToggleSwitch extends AbstractTransparentComponent<ToggleSwitchType> implements ISwitch {
public class MiniToggleSwitch extends AbstractTransparentComponent<ToggleSwitchType> implements ISwitch, ILayer {
private static final long serialVersionUID = 1L;
@@ -309,10 +310,10 @@ public class MiniToggleSwitch extends AbstractTransparentComponent<ToggleSwitchT
for (Point2D p : controlPoints) {
if (outlineMode) {
g2d.setColor(Constants.TRANSPARENT_COLOR);
drawingObserver.startTrackingContinuityArea(true);
g2d.fillRect((int)(p.getX() - lugWidth / 2), (int)(p.getY() - lugHeight / 2), lugWidth, lugHeight);
drawingObserver.stopTrackingContinuityArea();
// g2d.setColor(Constants.TRANSPARENT_COLOR);
// drawingObserver.startTrackingContinuityArea(true);
// g2d.fillRect((int)(p.getX() - lugWidth / 2), (int)(p.getY() - lugHeight / 2), lugWidth, lugHeight);
// drawingObserver.stopTrackingContinuityArea();
g2d.setColor(theme.getOutlineColor());
g2d.drawRect((int)(p.getX() - lugWidth / 2), (int)(p.getY() - lugHeight / 2), lugWidth, lugHeight);
@@ -320,9 +321,9 @@ public class MiniToggleSwitch extends AbstractTransparentComponent<ToggleSwitchT
g2d.setColor(CIRCLE_COLOR);
g2d.fillOval((int)(p.getX() - circleDiameter / 2), (int)(p.getY() - circleDiameter / 2), circleDiameter, circleDiameter);
g2d.setColor(METAL_COLOR);
drawingObserver.startTrackingContinuityArea(true);
// drawingObserver.startTrackingContinuityArea(true);
g2d.fillRect((int)(p.getX() - lugWidth / 2), (int)(p.getY() - lugHeight / 2), lugWidth, lugHeight);
drawingObserver.stopTrackingContinuityArea();
// drawingObserver.stopTrackingContinuityArea();
}
}
}
@@ -514,5 +515,10 @@ public class MiniToggleSwitch extends AbstractTransparentComponent<ToggleSwitchT
int margin = 20;
Rectangle2D bounds = getBody().getBounds2D();
return new Rectangle2D.Double(bounds.getX() - margin, bounds.getY() - margin, bounds.getWidth() + 2 * margin, bounds.getHeight() + 2 * margin);
}
@Override
public int getLayerId() {
return hashCode();
}
}
diylc/diylc-library/src/org/diylc/components/passive/PotentiometerPanel.java
+11 -5
View File
@@ -42,6 +42,7 @@ import org.diylc.core.ComponentState;
import org.diylc.core.CreationMethod;
import org.diylc.core.IDIYComponent;
import org.diylc.core.IDrawingObserver;
import org.diylc.core.ILayer;
import org.diylc.core.Project;
import org.diylc.core.Theme;
import org.diylc.core.annotations.ComponentDescriptor;
@@ -54,7 +55,7 @@ import org.diylc.utils.Constants;
creationMethod = CreationMethod.SINGLE_CLICK, instanceNamePrefix = "VR",
description = "Panel mount potentiometer with solder lugs", zOrder = IDIYComponent.COMPONENT,
transformer = PotentiometerTransformer.class, enableCache = true)
public class PotentiometerPanel extends AbstractPotentiometer {
public class PotentiometerPanel extends AbstractPotentiometer implements ILayer {
private static final long serialVersionUID = 1L;
@@ -279,11 +280,11 @@ public class PotentiometerPanel extends AbstractPotentiometer {
g2d.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 1f * alpha / MAX_ALPHA));
}
if (!outlineMode) {
if (i >= 3 && i <= 6)
drawingObserver.startTrackingContinuityArea(true);
// if (i >= 3 && i <= 6)
// drawingObserver.startTrackingContinuityArea(true);
g2d.fill(shape);
if (i >= 3 && i <= 6)
drawingObserver.stopTrackingContinuityArea();
// if (i >= 3 && i <= 6)
// drawingObserver.stopTrackingContinuityArea();
}
g2d.setComposite(oldComposite);
Color finalBorderColor;
@@ -502,6 +503,11 @@ public class PotentiometerPanel extends AbstractPotentiometer {
@Override
public boolean canPointMoveFreely(int pointIndex) {
return false;
}
@Override
public int getLayerId() {
return hashCode();
}
public enum Type {