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

Merge branch 'master' into feature/multimeter3

Browse Source
This commit is contained in:
Branislav Stojkovic
2025-03-25 13:18:37 +01:00
parent e8a4c488e0 a4bcbcc761
commit ed11ec22a6
80 changed files with 1036 additions and 864 deletions
Download Patch File Download Diff File Expand all files Collapse all files
diylc/diylc-library/.classpath
-16
View File
@@ -1,16 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="test"/>
<classpathentry kind="lib" path="lib/log4j-1.2.15.jar"/>
<classpathentry kind="lib" path="lib/app-framework.jar"/>
<classpathentry kind="lib" path="lib/jep-2.4.1.jar"/>
<classpathentry kind="lib" path="lib/poi-3.5-FINAL-20090928.jar"/>
<classpathentry kind="lib" path="lib/svgSalamander-1.1.2.4.jar"/>
<classpathentry kind="lib" path="lib/xstream-1.4.19.jar"/>
<classpathentry kind="lib" path="lib/gerber-writer-api-1.0.0.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/diylc-core"/>
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diylc/diylc-library/.project
-34
View File
@@ -1,34 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>diylc-library</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
<filteredResources>
<filter>
<id>1741597247360</id>
<name></name>
<type>30</type>
<matcher>
<id>org.eclipse.core.resources.regexFilterMatcher</id>
<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
</matcher>
</filter>
</filteredResources>
</projectDescription>
diylc/diylc-library/src/main/java/org/diylc/components/AbstractLeadedComponent.java
+6 -1
View File
@@ -441,7 +441,11 @@ public abstract class AbstractLeadedComponent<T> extends AbstractLabeledComponen
stroke = ObjectCache.getInstance().fetchStroke(thickness, new float[] {thickness / 4, thickness * 4}, 0, BasicStroke.CAP_ROUND);
break;
}
Composite oldComposite = g2d.getComposite();
if (getAlpha() < MAX_ALPHA) {
g2d.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 1f * getAlpha() / MAX_ALPHA));
}
if (shouldShadeLeads()) {
Shape lineShape = stroke.createStrokedShape(line);
@@ -463,6 +467,7 @@ public abstract class AbstractLeadedComponent<T> extends AbstractLabeledComponen
if (isCopperArea)
observer.stopTrackingContinuityArea();
}
g2d.setComposite(oldComposite);
}
protected LineStyle getStyle() {
diylc/diylc-library/src/main/java/org/diylc/components/boards/AbstractBoard.java
+119 -74
View File
@@ -35,7 +35,9 @@ import org.diylc.common.IPlugInPort;
import org.diylc.common.ObjectCache;
import org.diylc.common.VerticalAlignment;
import org.diylc.components.AbstractTransparentComponent;
import org.diylc.core.BoardUndersideDisplay;
import org.diylc.core.ComponentState;
import org.diylc.core.IBoard;
import org.diylc.core.IDrawingObserver;
import org.diylc.core.Project;
import org.diylc.core.VisibilityPolicy;
@@ -43,9 +45,10 @@ import org.diylc.core.annotations.EditableProperty;
import org.diylc.core.measures.Size;
import org.diylc.core.measures.SizeUnit;
public abstract class AbstractBoard extends AbstractTransparentComponent<String> {
public abstract class AbstractBoard extends AbstractTransparentComponent<String> implements IBoard {
private static final long serialVersionUID = 1L;
public static final Size DEFAULT_UNDERSIDE_OFFSET = new Size(0.1, SizeUnit.in);
public static Color BORDER_COLOR = PHENOLIC_COLOR.darker();
public static Color COORDINATE_COLOR = Color.gray.brighter();
@@ -56,7 +59,7 @@ public abstract class AbstractBoard extends AbstractTransparentComponent<String>
protected String value = "";
// two control points used for controlling the position
protected Point2D[] controlPoints = new Point2D[] {new Point2D.Double(0, 0),
new Point2D.Double(DEFAULT_WIDTH.convertToPixels(), DEFAULT_HEIGHT.convertToPixels())};
new Point2D.Double(DEFAULT_WIDTH.convertToPixels(), DEFAULT_HEIGHT.convertToPixels())};
// top-left and bottom-right points
protected Point2D.Double firstPoint = new Point2D.Double();
protected Point2D.Double secondPoint = new Point2D.Double();
@@ -69,17 +72,20 @@ public abstract class AbstractBoard extends AbstractTransparentComponent<String>
protected CoordinateOrigin coordinateOrigin = CoordinateOrigin.Top_Left;
protected CoordinateDisplay coordinateDisplay = CoordinateDisplay.One_Side;
protected CoordinateType yType = CoordinateType.Letters;
protected Size length;
protected Size width;
protected BoardSizingMode mode = BoardSizingMode.TwoPoints;
protected BoardUndersideDisplay boardUndersideDisplay = BoardUndersideDisplay.NONE;
protected Size undersideOffset = DEFAULT_UNDERSIDE_OFFSET;
@Override
public void draw(Graphics2D g2d, ComponentState componentState, boolean outlineMode, Project project,
IDrawingObserver drawingObserver) {
IDrawingObserver drawingObserver) {
g2d.setStroke(ObjectCache.getInstance().fetchBasicStroke(1));
Point2D finalSecondPoint = getFinalSecondPoint();
Point2D finalSecondPoint = getFinalSecondPoint();
Composite oldComposite = g2d.getComposite();
// render as transparent when dragging
@@ -90,64 +96,64 @@ public abstract class AbstractBoard extends AbstractTransparentComponent<String>
g2d.setColor(boardColor);
g2d.fillRect((int)firstPoint.getX(), (int)firstPoint.getY(), (int)(finalSecondPoint.getX() - firstPoint.getX()), (int)(finalSecondPoint.getY() - firstPoint.getY()));
g2d.setComposite(oldComposite);
// Do not track any changes that follow because the whole board has been
// tracked so far.
drawingObserver.stopTracking();
g2d.setColor(componentState == ComponentState.SELECTED || componentState == ComponentState.DRAGGING ? SELECTION_COLOR
: borderColor);
: borderColor);
g2d.drawRect((int)firstPoint.getX(), (int)firstPoint.getY(), (int)(finalSecondPoint.getX() - firstPoint.getX()), (int)(finalSecondPoint.getY() - firstPoint.getY()));
}
protected Point2D getFinalSecondPoint() {
Point2D finalSecondPoint;
if (getMode() == BoardSizingMode.TwoPoints)
finalSecondPoint = secondPoint;
else
finalSecondPoint = new Point2D.Double(firstPoint.getX() + getLength().convertToPixels(),
firstPoint.getY() + getWidth().convertToPixels());
finalSecondPoint = new Point2D.Double(firstPoint.getX() + getLength().convertToPixels(),
firstPoint.getY() + getWidth().convertToPixels());
return finalSecondPoint;
}
protected void drawCoordinates(Graphics2D g2d, double spacing, Project project) {
g2d.setColor(coordinateColor);
g2d.setFont(project.getFont().deriveFont(COORDINATE_FONT_SIZE));
// The half space is used to do rounding when calculating the range.
double halfSpace = spacing / 2;
CoordinateOrigin origin = getCoordinateOrigin();
Point2D finalSecondPoint = getFinalSecondPoint();
if (getCoordinateDisplay() != CoordinateDisplay.None) {
int range;
double yOffset;
CoordinateType yType = getyType();
double y = firstPoint.getY();
if (origin == CoordinateOrigin.Top_Left || origin == CoordinateOrigin.Top_Right) {
range = (int) ((finalSecondPoint.getY() - firstPoint.getY() + halfSpace) / spacing);
yOffset = spacing;
range = (int) ((finalSecondPoint.getY() - firstPoint.getY() + halfSpace) / spacing);
yOffset = spacing;
} else {
range = (int) ((finalSecondPoint.getY() - firstPoint.getY() + halfSpace) / spacing);
yOffset = -spacing;
y = finalSecondPoint.getY();
range = (int) ((finalSecondPoint.getY() - firstPoint.getY() + halfSpace) / spacing);
yOffset = -spacing;
y = finalSecondPoint.getY();
}
for (int c = 1; c < range; c++) {
int xOffset = (yType == CoordinateType.Numbers && c >= 10) || (yType == CoordinateType.Letters && c >= 27) ? 0 : 2;
String label = yType == CoordinateType.Letters ? getCoordinateLabel(c) : Integer.toString(c);
y += yOffset;
StringUtils.drawCenteredText(g2d, label,
firstPoint.getX() + xOffset, y,
HorizontalAlignment.LEFT, VerticalAlignment.CENTER);
if (getCoordinateDisplay() == CoordinateDisplay.Both_Sides) {
StringUtils.drawCenteredText(g2d, label,
finalSecondPoint.getX() - xOffset, y,
HorizontalAlignment.RIGHT, VerticalAlignment.CENTER);
}
int xOffset = (yType == CoordinateType.Numbers && c >= 10) || (yType == CoordinateType.Letters && c >= 27) ? 0 : 2;
String label = yType == CoordinateType.Letters ? getCoordinateLabel(c) : Integer.toString(c);
y += yOffset;
StringUtils.drawCenteredText(g2d, label,
firstPoint.getX() + xOffset, y,
HorizontalAlignment.LEFT, VerticalAlignment.CENTER);
if (getCoordinateDisplay() == CoordinateDisplay.Both_Sides) {
StringUtils.drawCenteredText(g2d, label,
finalSecondPoint.getX() - xOffset, y,
HorizontalAlignment.RIGHT, VerticalAlignment.CENTER);
}
}
}
@@ -155,8 +161,8 @@ public abstract class AbstractBoard extends AbstractTransparentComponent<String>
int range;
double xOffset;
CoordinateType xType = getxType();
double x = firstPoint.getX();
double x = firstPoint.getX();
if (origin == CoordinateOrigin.Top_Left || origin == CoordinateOrigin.Bottom_Left) {
range = (int) ((finalSecondPoint.getX() - firstPoint.getX() + halfSpace) / spacing);
xOffset = spacing;
@@ -165,19 +171,19 @@ public abstract class AbstractBoard extends AbstractTransparentComponent<String>
xOffset = -spacing;
x = finalSecondPoint.getX();
}
for (int c = 1; c < range; c++) {
String label = xType == CoordinateType.Letters ? getCoordinateLabel(c) : Integer.toString(c);
x += xOffset;
StringUtils.drawCenteredText(g2d, label,
x, firstPoint.getY() + 2,
HorizontalAlignment.CENTER, VerticalAlignment.BOTTOM);
StringUtils.drawCenteredText(g2d, label,
x, firstPoint.getY() + 2,
HorizontalAlignment.CENTER, VerticalAlignment.BOTTOM);
if (getCoordinateDisplay() == CoordinateDisplay.Both_Sides) {
StringUtils.drawCenteredText(g2d, label,
x, (int) (finalSecondPoint.getY() - COORDINATE_FONT_SIZE),
HorizontalAlignment.CENTER, VerticalAlignment.BOTTOM);
StringUtils.drawCenteredText(g2d, label,
x, (int) (finalSecondPoint.getY() - COORDINATE_FONT_SIZE),
HorizontalAlignment.CENTER, VerticalAlignment.BOTTOM);
}
}
}
@@ -225,7 +231,7 @@ public abstract class AbstractBoard extends AbstractTransparentComponent<String>
public void setBorderColor(Color borderColor) {
this.borderColor = borderColor;
}
@EditableProperty(name = "X")
public CoordinateType getxType() {
if (xType == null)
@@ -250,15 +256,15 @@ public abstract class AbstractBoard extends AbstractTransparentComponent<String>
@EditableProperty(name = "Coordinate Origin")
public CoordinateOrigin getCoordinateOrigin() {
if (coordinateOrigin == null)
coordinateOrigin = CoordinateOrigin.Top_Left;
return coordinateOrigin;
if (coordinateOrigin == null)
coordinateOrigin = CoordinateOrigin.Top_Left;
return coordinateOrigin;
}
public void setCoordinateOrigin(CoordinateOrigin coordinateOrigin) {
this.coordinateOrigin = coordinateOrigin;
this.coordinateOrigin = coordinateOrigin;
}
@EditableProperty(name = "Y")
public CoordinateType getyType() {
if (yType == null)
@@ -294,9 +300,9 @@ public abstract class AbstractBoard extends AbstractTransparentComponent<String>
public void setControlPoint(Point2D point, int index) {
controlPoints[index].setLocation(point);
firstPoint.setLocation(Math.min(controlPoints[0].getX(), controlPoints[1].getX()),
Math.min(controlPoints[0].getY(), controlPoints[1].getY()));
Math.min(controlPoints[0].getY(), controlPoints[1].getY()));
secondPoint.setLocation(Math.max(controlPoints[0].getX(), controlPoints[1].getX()),
Math.max(controlPoints[0].getY(), controlPoints[1].getY()));
Math.max(controlPoints[0].getY(), controlPoints[1].getY()));
}
@EditableProperty
@@ -309,13 +315,13 @@ public abstract class AbstractBoard extends AbstractTransparentComponent<String>
public void setValue(String value) {
this.value = value;
}
private SizeUnit getDefaultUnit() {
if (ConfigurationManager.getInstance().readBoolean(IPlugInPort.METRIC_KEY, true))
return SizeUnit.mm;
return SizeUnit.in;
return SizeUnit.in;
}
@EditableProperty(name = "Explicit Length", validatorClass = BoardModeValidator.class)
public Size getLength() {
if (getMode() == BoardSizingMode.TwoPoints) {
@@ -327,12 +333,12 @@ public abstract class AbstractBoard extends AbstractTransparentComponent<String>
public void setLength(Size length) {
if (getMode() == BoardSizingMode.Explicit && length != null && width != null) {
setControlPoint(firstPoint, 0);
setControlPoint(firstPoint, 0);
Point2D second = new Point2D.Double(firstPoint.getX() + length.convertToPixels(),
firstPoint.getY() + width.convertToPixels());
setControlPoint(second, 1);
firstPoint.getY() + width.convertToPixels());
setControlPoint(second, 1);
}
this.length = length;
this.length = length;
}
@EditableProperty(name = "Explicit Width", validatorClass = BoardModeValidator.class)
@@ -352,7 +358,7 @@ public abstract class AbstractBoard extends AbstractTransparentComponent<String>
}
this.width = width;
}
@EditableProperty(name = "Dimension Mode")
public BoardSizingMode getMode() {
if (mode == null)
@@ -363,27 +369,66 @@ public abstract class AbstractBoard extends AbstractTransparentComponent<String>
public void setMode(BoardSizingMode mode) {
this.mode = mode;
}
@EditableProperty(name = "Underside Display")
@Override
public BoardUndersideDisplay getBoardUndersideDisplay() {
if (this.boardUndersideDisplay == null) {
this.boardUndersideDisplay = BoardUndersideDisplay.NONE;
}
return this.boardUndersideDisplay;
}
public void setBoardUndersideDisplay(BoardUndersideDisplay boardUndersideDisplay) {
this.boardUndersideDisplay = boardUndersideDisplay;
}
@EditableProperty(name = "Underside Offset")
@Override
public Size getUndersideOffset() {
if (undersideOffset == null) {
undersideOffset = DEFAULT_UNDERSIDE_OFFSET;
}
return undersideOffset;
}
public void setUndersideOffset(Size undersideOffset) {
this.undersideOffset = undersideOffset;
}
@Override
public Rectangle2D getBoardRectangle() {
Point2D finalSecondPoint = getFinalSecondPoint();
return new Rectangle2D.Double(firstPoint.getX(), firstPoint.getY(),
finalSecondPoint.getX() - firstPoint.getX(), finalSecondPoint.getY() - firstPoint.getY());
}
@Override
public boolean shouldExportToGerber() {
return false;
}
@Override
public Rectangle2D getCachingBounds() {
Point2D finalSecondPoint = getFinalSecondPoint();
return new Rectangle2D.Double(Math.min(firstPoint.getX(), finalSecondPoint.getX()) - 2, Math.min(firstPoint.getY(), finalSecondPoint.getY()) - 2,
Math.abs(finalSecondPoint.getX() - firstPoint.getX()) + 4, Math.abs(finalSecondPoint.getY() - firstPoint.getY()) + 4);
Point2D finalSecondPoint = getFinalSecondPoint();
return new Rectangle2D.Double(Math.min(firstPoint.getX(), finalSecondPoint.getX()) - 2, Math.min(firstPoint.getY(), finalSecondPoint.getY()) - 2,
Math.abs(finalSecondPoint.getX() - firstPoint.getX()) + 4, Math.abs(finalSecondPoint.getY() - firstPoint.getY()) + 4);
}
public static enum CoordinateType {
Letters, Numbers
}
public static enum CoordinateDisplay {
None, One_Side, Both_Sides;
@Override
public String toString() {
return super.toString().replace('_', ' ');
};
}
public static enum CoordinateOrigin {
Top_Left, Top_Right, Bottom_Right, Bottom_Left;
@@ -392,19 +437,19 @@ public abstract class AbstractBoard extends AbstractTransparentComponent<String>
return super.toString().replace('_', ' ');
};
}
public static enum BoardSizingMode {
TwoPoints("Opposing Points"), Explicit("Explicit Dimensions");
private String label;
private BoardSizingMode(String label) {
this.label = label;
}
@Override
public String toString() {
return label;
}
}
}
}
}
diylc/diylc-library/src/main/java/org/diylc/components/boards/BlankBoard.java
+17 -21
View File
@@ -38,12 +38,11 @@ import org.diylc.core.Project;
import org.diylc.core.annotations.BomPolicy;
import org.diylc.core.annotations.ComponentDescriptor;
import org.diylc.core.annotations.EditableProperty;
import org.diylc.core.gerber.IGerberBoard;
@ComponentDescriptor(name = "Blank Board", category = "Boards", author = "Branislav Stojkovic",
zOrder = IDIYComponent.BOARD, instanceNamePrefix = "Board", description = "Blank circuit board",
bomPolicy = BomPolicy.SHOW_ONLY_TYPE_NAME, autoEdit = false, transformer = SimpleComponentTransformer.class)
public class BlankBoard extends AbstractBoard implements IGerberBoard {
zOrder = IDIYComponent.BOARD, instanceNamePrefix = "Board", description = "Blank circuit board",
bomPolicy = BomPolicy.SHOW_ONLY_TYPE_NAME, autoEdit = false, transformer = SimpleComponentTransformer.class)
public class BlankBoard extends AbstractBoard {
private static final long serialVersionUID = 1L;
@@ -60,14 +59,14 @@ public class BlankBoard extends AbstractBoard implements IGerberBoard {
@Override
public void draw(Graphics2D g2d, ComponentState componentState, boolean outlineMode, Project project,
IDrawingObserver drawingObserver) {
Point2D finalSecondPoint = getFinalSecondPoint();
IDrawingObserver drawingObserver) {
Point2D finalSecondPoint = getFinalSecondPoint();
Shape clip = g2d.getClip();
if (checkPointsClipped(clip) && !clip.contains(firstPoint.getX(), finalSecondPoint.getY())
&& !clip.contains(finalSecondPoint.getX(), firstPoint.getY())) {
&& !clip.contains(finalSecondPoint.getX(), firstPoint.getY())) {
return;
}
}
g2d.setStroke(ObjectCache.getInstance().fetchBasicStroke(1));
if (componentState != ComponentState.DRAGGING) {
@@ -86,13 +85,13 @@ public class BlankBoard extends AbstractBoard implements IGerberBoard {
// tracked so far.
drawingObserver.stopTracking();
g2d.setColor(componentState == ComponentState.SELECTED || componentState == ComponentState.DRAGGING ? SELECTION_COLOR
: borderColor);
: borderColor);
if (getType() == Type.SQUARE)
g2d.drawRect((int)firstPoint.getX(), (int)firstPoint.getY(), (int)(finalSecondPoint.getX() - firstPoint.getX()), (int)(finalSecondPoint.getY() - firstPoint.getY()));
else
g2d.drawOval((int)firstPoint.getX(), (int)firstPoint.getY(), (int)(finalSecondPoint.getX() - firstPoint.getX()), (int)(finalSecondPoint.getY() - firstPoint.getY()));
}
@Override
public CoordinateType getxType() {
// Override to prevent editing.
@@ -128,12 +127,17 @@ public class BlankBoard extends AbstractBoard implements IGerberBoard {
public void setType(Type type) {
this.type = type;
}
@Override
public String getControlPointNodeName(int index) {
return null;
}
@Override
public boolean shouldExportToGerber() {
return true;
}
static enum Type {
ROUND, SQUARE;
@@ -142,12 +146,4 @@ public class BlankBoard extends AbstractBoard implements IGerberBoard {
return name().substring(0, 1) + name().substring(1).toLowerCase();
}
}
@Override
public Rectangle2D getBoardRectangle() {
Point2D finalSecondPoint = getFinalSecondPoint();
return new Rectangle2D.Double(firstPoint.getX(), firstPoint.getY(),
finalSecondPoint.getX() - firstPoint.getX(), finalSecondPoint.getY() - firstPoint.getY());
}
}
}
diylc/diylc-library/src/main/java/org/diylc/components/connectivity/CopperTrace.java
-5
View File
@@ -133,11 +133,6 @@ public class CopperTrace extends AbstractLeadedComponent<Void> implements ILayer
return super.getBorderColor();
}
@Override
public Byte getAlpha() {
return super.getAlpha();
}
@Override
public Size getLength() {
return super.getLength();
diylc/diylc-library/src/main/java/org/diylc/components/connectivity/CurvedTrace.java
-5
View File
@@ -111,11 +111,6 @@ public class CurvedTrace extends AbstractCurvedComponent<Void> implements ILayer
@Override
public void setValue(Void value) {}
@Override
public Byte getAlpha() {
return super.getAlpha();
}
@Override
public void setAlpha(Byte alpha) {
super.setAlpha(alpha);
diylc/diylc-library/src/main/java/org/diylc/components/connectivity/Eyelet.java
+11 -3
View File
@@ -21,13 +21,13 @@
*/
package org.diylc.components.connectivity;
import java.awt.Color;
import java.awt.Graphics2D;
import java.awt.*;
import java.awt.geom.Point2D;
import java.awt.geom.Rectangle2D;
import org.diylc.common.ObjectCache;
import org.diylc.components.AbstractComponent;
import org.diylc.components.AbstractTransparentComponent;
import org.diylc.components.transform.SimpleComponentTransformer;
import org.diylc.core.ComponentState;
import org.diylc.core.IDIYComponent;
@@ -49,7 +49,7 @@ import org.diylc.utils.Constants;
zOrder = IDIYComponent.TRACE + 0.1, bomPolicy = BomPolicy.SHOW_ONLY_TYPE_NAME, autoEdit = false,
keywordPolicy = KeywordPolicy.SHOW_TYPE_NAME, transformer = SimpleComponentTransformer.class,
enableCache = true)
public class Eyelet extends AbstractComponent<String> {
public class Eyelet extends AbstractTransparentComponent<String> {
private static final long serialVersionUID = 1L;
@@ -71,6 +71,12 @@ public class Eyelet extends AbstractComponent<String> {
}
int diameter = getClosestOdd((int) size.convertToPixels());
int holeDiameter = getClosestOdd((int) holeSize.convertToPixels());
Composite oldComposite = g2d.getComposite();
if (getAlpha() < MAX_ALPHA) {
g2d.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 1f * getAlpha() / MAX_ALPHA));
}
g2d.setStroke(ObjectCache.getInstance().fetchBasicStroke(1f));
g2d.setColor(color);
drawingObserver.startTrackingContinuityArea(true);
@@ -84,6 +90,8 @@ public class Eyelet extends AbstractComponent<String> {
g2d.setColor(componentState == ComponentState.SELECTED || componentState == ComponentState.DRAGGING ? SELECTION_COLOR
: color.darker());
g2d.drawOval((int)(point.getX() - holeDiameter / 2), (int)(point.getY() - holeDiameter / 2), holeDiameter, holeDiameter);
g2d.setComposite(oldComposite);
}
@Override
diylc/diylc-library/src/main/java/org/diylc/components/connectivity/GroundFill.java
+9 -3
View File
@@ -21,8 +21,7 @@
*/
package org.diylc.components.connectivity;
import java.awt.Color;
import java.awt.Graphics2D;
import java.awt.*;
import java.awt.geom.Point2D;
import java.util.Arrays;
import java.util.EnumSet;
@@ -33,6 +32,7 @@ import com.bancika.gerberwriter.GerberFunctions;
import org.diylc.common.ObjectCache;
import org.diylc.common.PCBLayer;
import org.diylc.components.AbstractComponent;
import org.diylc.components.AbstractTransparentComponent;
import org.diylc.components.transform.SimpleComponentTransformer;
import org.diylc.core.ComponentState;
import org.diylc.core.IDIYComponent;
@@ -52,7 +52,8 @@ import org.diylc.core.measures.SizeUnit;
@ComponentDescriptor(name = "Ground Fill", author = "Branislav Stojkovic", category = "Connectivity",
instanceNamePrefix = "GF", description = "Polygonal ground fill area", zOrder = IDIYComponent.TRACE,
bomPolicy = BomPolicy.NEVER_SHOW, autoEdit = false, transformer = SimpleComponentTransformer.class)
public class GroundFill extends AbstractComponent<Void> implements ILayeredComponent, IGerberComponentSimple {
public class GroundFill extends AbstractTransparentComponent<Void>
implements ILayeredComponent, IGerberComponentSimple {
private static final long serialVersionUID = 1L;
@@ -83,7 +84,12 @@ public class GroundFill extends AbstractComponent<Void> implements ILayeredCompo
yPoints[i] = (int)controlPoints[i].getY();
}
drawingObserver.startTrackingContinuityArea(true);
Composite oldComposite = g2d.getComposite();
if (getAlpha() < MAX_ALPHA) {
g2d.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 1f * getAlpha() / MAX_ALPHA));
}
g2d.fillPolygon(xPoints, yPoints, controlPoints.length);
g2d.setComposite(oldComposite);
drawingObserver.stopTrackingContinuityArea();
// Do not track any changes that follow because the whole board has been
// tracked so far.
diylc/diylc-library/src/main/java/org/diylc/components/connectivity/Jumper.java
-5
View File
@@ -103,11 +103,6 @@ public class Jumper extends AbstractLeadedComponent<Void> implements IContinuity
return super.getBorderColor();
}
@Override
public Byte getAlpha() {
return super.getAlpha();
}
@Override
public Size getLength() {
return super.getLength();
diylc/diylc-library/src/main/java/org/diylc/components/connectivity/Line.java
-5
View File
@@ -233,11 +233,6 @@ public class Line extends AbstractLeadedComponent<Void> {
return super.getBorderColor();
}
@Override
public Byte getAlpha() {
return super.getAlpha();
}
@Override
public Size getLength() {
return super.getLength();
diylc/diylc-library/src/main/java/org/diylc/components/connectivity/SolderPad.java
+10 -3
View File
@@ -17,8 +17,7 @@
*/
package org.diylc.components.connectivity;
import java.awt.Color;
import java.awt.Graphics2D;
import java.awt.*;
import java.awt.geom.Ellipse2D;
import java.awt.geom.Point2D;
import java.awt.geom.Rectangle2D;
@@ -29,6 +28,7 @@ import com.bancika.gerberwriter.GerberFunctions;
import org.diylc.common.PCBLayer;
import org.diylc.components.AbstractComponent;
import org.diylc.components.AbstractTransparentComponent;
import org.diylc.components.transform.SimpleComponentTransformer;
import org.diylc.core.ComponentState;
import org.diylc.core.IDIYComponent;
@@ -55,7 +55,8 @@ import org.diylc.utils.Constants;
zOrder = IDIYComponent.TRACE + 0.1, bomPolicy = BomPolicy.NEVER_SHOW, autoEdit = false,
keywordPolicy = KeywordPolicy.SHOW_TAG, keywordTag = "PCB",
transformer = SimpleComponentTransformer.class, enableCache = true)
public class SolderPad extends AbstractComponent<Void> implements ILayeredComponent, IGerberComponentCustom {
public class SolderPad extends AbstractTransparentComponent<Void>
implements ILayeredComponent, IGerberComponentCustom {
private static final long serialVersionUID = 1L;
@@ -90,6 +91,11 @@ public class SolderPad extends AbstractComponent<Void> implements ILayeredCompon
gerberDrawingObserver.startGerberOutput(gerberCopperLayer, GerberFunctions.CONNECTOR_PAD, false);
gerberDrawingObserver.startGerberOutput(org.diylc.core.gerber.GerberLayer.SolderMaskBot, "Material", false);
}
Composite oldComposite = g2d.getComposite();
if (getAlpha() < MAX_ALPHA) {
g2d.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 1f * getAlpha() / MAX_ALPHA));
}
if (type == Type.ROUND) {
g2d.fill(new Ellipse2D.Double(point.getX() - diameter / 2, point.getY() - diameter / 2,
diameter, diameter));
@@ -116,6 +122,7 @@ public class SolderPad extends AbstractComponent<Void> implements ILayeredCompon
g2d.fill(new Ellipse2D.Double(point.getX() - holeDiameter / 2,
point.getY() - holeDiameter / 2, holeDiameter, holeDiameter));
}
g2d.setComposite(oldComposite);
if (gerberDrawingObserver != null)
gerberDrawingObserver.stopGerberOutput();
}
diylc/diylc-library/src/main/java/org/diylc/components/connectivity/TraceCut.java
+8 -3
View File
@@ -21,14 +21,14 @@
*/
package org.diylc.components.connectivity;
import java.awt.Color;
import java.awt.Graphics2D;
import java.awt.*;
import java.awt.geom.Point2D;
import java.awt.geom.Rectangle2D;
import org.diylc.common.ObjectCache;
import org.diylc.common.OrientationHV;
import org.diylc.components.AbstractComponent;
import org.diylc.components.AbstractTransparentComponent;
import org.diylc.components.boards.AbstractBoard;
import org.diylc.components.boards.VeroBoard;
import org.diylc.components.transform.SimpleComponentTransformer;
@@ -49,7 +49,7 @@ import org.diylc.utils.Constants;
description = "Designates the place where a trace on the vero board needs to be cut", instanceNamePrefix = "Cut",
zOrder = IDIYComponent.BOARD + 1, bomPolicy = BomPolicy.NEVER_SHOW, autoEdit = false,
transformer = SimpleComponentTransformer.class, enableCache = true)
public class TraceCut extends AbstractComponent<Void> implements ILayeredComponent {
public class TraceCut extends AbstractTransparentComponent<Void> implements ILayeredComponent {
private static final long serialVersionUID = 1L;
@@ -79,6 +79,10 @@ public class TraceCut extends AbstractComponent<Void> implements ILayeredCompone
if (checkPointsClipped(g2d.getClip())) {
return;
}
Composite oldComposite = g2d.getComposite();
if (getAlpha() < MAX_ALPHA) {
g2d.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 1f * getAlpha() / MAX_ALPHA));
}
g2d.setStroke(ObjectCache.getInstance().fetchZoomableStroke(1f));
int size = getClosestOdd((int) this.size.convertToPixels());
int cutWidth = getClosestOdd((int) CUT_WIDTH.convertToPixels());
@@ -105,6 +109,7 @@ public class TraceCut extends AbstractComponent<Void> implements ILayeredCompone
g2d.setColor(getBoardColor().darker());
g2d.drawOval((int)(point.getX() - holeSize / 2), (int)(point.getY() - holeSize / 2), holeSize, holeSize);
}
g2d.setComposite(oldComposite);
}
@Override
diylc/diylc-library/src/main/java/org/diylc/components/connectivity/Turret.java
+8 -3
View File
@@ -21,13 +21,13 @@
*/
package org.diylc.components.connectivity;
import java.awt.Color;
import java.awt.Graphics2D;
import java.awt.*;
import java.awt.geom.Point2D;
import java.awt.geom.Rectangle2D;
import org.diylc.common.ObjectCache;
import org.diylc.components.AbstractComponent;
import org.diylc.components.AbstractTransparentComponent;
import org.diylc.components.transform.SimpleComponentTransformer;
import org.diylc.core.ComponentState;
import org.diylc.core.IDIYComponent;
@@ -47,7 +47,7 @@ import org.diylc.utils.Constants;
zOrder = IDIYComponent.TRACE + 0.1, bomPolicy = BomPolicy.SHOW_ONLY_TYPE_NAME, autoEdit = false,
keywordPolicy = KeywordPolicy.SHOW_TYPE_NAME, transformer = SimpleComponentTransformer.class,
enableCache = true)
public class Turret extends AbstractComponent<String> {
public class Turret extends AbstractTransparentComponent<String> {
private static final long serialVersionUID = 1L;
@@ -67,6 +67,10 @@ public class Turret extends AbstractComponent<String> {
if (checkPointsClipped(g2d.getClip())) {
return;
}
Composite oldComposite = g2d.getComposite();
if (getAlpha() < MAX_ALPHA) {
g2d.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 1f * getAlpha() / MAX_ALPHA));
}
int diameter = getClosestOdd((int) size.convertToPixels());
int holeDiameter = getClosestOdd((int) holeSize.convertToPixels());
g2d.setColor(color);
@@ -82,6 +86,7 @@ public class Turret extends AbstractComponent<String> {
g2d.setColor(componentState == ComponentState.SELECTED || componentState == ComponentState.DRAGGING ? SELECTION_COLOR
: color.darker());
g2d.drawOval((int)(point.getX() - holeDiameter / 2), (int)(point.getY() - holeDiameter / 2), holeDiameter, holeDiameter);
g2d.setComposite(oldComposite);
}
@Override
diylc/diylc-library/src/main/java/org/diylc/components/guitar/Freeway3x3_03.java
+2 -1
View File
@@ -304,7 +304,8 @@ public class Freeway3x3_03 extends AbstractTransparentComponent<Void> implements
if (svgDiagram == null) {
try {
byte[] data =
IOUtils.toByteArray(Freeway3x3_03.class.getResourceAsStream("/freeway_3x3-03.svg"));
IOUtils.toByteArray(Freeway3x3_03.class.getResourceAsStream(
"/component-drawings/freeway_3x3-03.svg"));
ByteArrayInputStream bis = new ByteArrayInputStream(data);
SVGUniverse universe = new SVGUniverse();
URI url = universe.loadSVG(bis,
diylc/diylc-library/src/main/java/org/diylc/components/misc/Image.java
+2 -3
View File
@@ -40,7 +40,6 @@ import org.diylc.awt.ImageUtils;
import org.diylc.common.ObjectCache;
import org.diylc.common.Orientation;
import org.diylc.components.AbstractTransparentComponent;
import org.diylc.components.boards.AbstractBoard;
import org.diylc.components.transform.ImageTransformer;
import org.diylc.core.ComponentState;
import org.diylc.core.IDIYComponent;
@@ -72,7 +71,7 @@ public class Image extends AbstractTransparentComponent<Void> {
private Orientation orientation;
static {
String name = "/image.png";
String name = "/diylc-library-images/image.png";
try (InputStream inputStream = Image.class.getResourceAsStream(name)) {
if (inputStream != null) {
ICON = new ImageIcon(inputStream.readAllBytes(), name);
@@ -99,7 +98,7 @@ public class Image extends AbstractTransparentComponent<Void> {
public Image() {
try {
data = IOUtils.toByteArray(Image.class.getResourceAsStream("/image.png"));
data = IOUtils.toByteArray(Image.class.getResourceAsStream("/diylc-library-images/image.png"));
} catch (IOException e) {
e.printStackTrace();
}
diylc/diylc-library/src/main/java/org/diylc/components/misc/SVGImage.java
+2 -1
View File
@@ -81,7 +81,8 @@ public class SVGImage extends AbstractTransparentComponent<Void> {
public SVGImage() {
try {
data = IOUtils.toByteArray(SVGImage.class.getResourceAsStream("/diylc.svg"));
data = IOUtils.toByteArray(SVGImage.class.getResourceAsStream(
"/diylc-library-images/diylc.svg"));
} catch (IOException e) {
e.printStackTrace();
}
diylc/diylc-library/src/main/java/org/diylc/components/transform/CliffJackTransformer.java
+1 -1
View File
@@ -43,7 +43,7 @@ public class CliffJackTransformer implements IComponentTransformer {
@Override
public boolean mirroringChangesCircuit() {
return true;
return false;
}
@Override
diylc/diylc-library/src/main/java/org/diylc/components/transform/MiniToggleSwitchTransformer.java
+42 -7
View File
@@ -48,14 +48,26 @@ public class MiniToggleSwitchTransformer implements IComponentTransformer {
@Override
public void rotate(IDIYComponent<?> component, Point2D center, int direction) {
AffineTransform rotate = AffineTransform.getRotateInstance(Math.PI / 2 * direction, center.getX(), center.getY());
for (int index = 0; index < component.getControlPointCount(); index++) {
Point2D p = new Point2D.Double();
rotate.transform(component.getControlPoint(index), p);
component.setControlPoint(p, index);
}
MiniToggleSwitch sw = (MiniToggleSwitch) component;
// Calculate center of all control points
double sumX = 0, sumY = 0;
for (int i = 0; i < sw.getControlPointCount(); i++) {
Point2D p = sw.getControlPoint(i);
sumX += p.getX();
sumY += p.getY();
}
Point2D controlCenter = new Point2D.Double(
sumX / sw.getControlPointCount(),
sumY / sw.getControlPointCount()
);
// Calculate where control center should end up after rotation
Point2D targetCenter = new Point2D.Double();
AffineTransform rotate = AffineTransform.getRotateInstance(Math.PI / 2 * direction, center.getX(), center.getY());
rotate.transform(controlCenter, targetCenter);
// Update orientation first - this will rotate points around first point
OrientationHV o = sw.getOrientation();
int oValue = o.ordinal();
oValue += direction;
@@ -65,6 +77,29 @@ public class MiniToggleSwitchTransformer implements IComponentTransformer {
oValue = 0;
o = OrientationHV.values()[oValue];
sw.setOrientation(o);
// Recalculate current control center after orientation change
sumX = 0;
sumY = 0;
for (int i = 0; i < sw.getControlPointCount(); i++) {
Point2D p = sw.getControlPoint(i);
sumX += p.getX();
sumY += p.getY();
}
Point2D newControlCenter = new Point2D.Double(
sumX / sw.getControlPointCount(),
sumY / sw.getControlPointCount()
);
// Calculate and apply translation to move control center to target position
double dx = targetCenter.getX() - newControlCenter.getX();
double dy = targetCenter.getY() - newControlCenter.getY();
// Apply translation to all points
for (int i = 0; i < sw.getControlPointCount(); i++) {
Point2D p = sw.getControlPoint(i);
sw.setControlPoint(new Point2D.Double(p.getX() + dx, p.getY() + dy), i);
}
}
@Override
diylc/diylc-library/src/main/resources/freeway_3x3-03.svg → diylc/diylc-library/src/main/resources/component-drawings/freeway_3x3-03.svg
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 20 KiB

After

Width:  |  Height:  |  Size: 20 KiB

diylc/diylc-library/src/main/resources/AxialElectrolyticCapacitor.datasheet → diylc/diylc-library/src/main/resources/datasheets/AxialElectrolyticCapacitor.datasheet
View File
diylc/diylc-library/src/main/resources/AxialFilmCapacitor.datasheet → diylc/diylc-library/src/main/resources/datasheets/AxialFilmCapacitor.datasheet
View File
diylc/diylc-library/src/main/resources/RadialElectrolytic.datasheet → diylc/diylc-library/src/main/resources/datasheets/RadialElectrolytic.datasheet
View File
diylc/diylc-library/src/main/resources/RadialFilmCapacitor.datasheet → diylc/diylc-library/src/main/resources/datasheets/RadialFilmCapacitor.datasheet
View File
diylc/diylc-library/src/main/resources/RadialMicaCapacitor.datasheet → diylc/diylc-library/src/main/resources/datasheets/RadialMicaCapacitor.datasheet
View File
diylc/diylc-library/src/main/resources/diylc.svg → diylc/diylc-library/src/main/resources/diylc-library-images/diylc.svg
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 18 KiB

diylc/diylc-library/src/main/resources/image.png → diylc/diylc-library/src/main/resources/diylc-library-images/image.png
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB