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

improve precision of exported files

Browse Source
This commit is contained in:
Branislav Stojkovic
2019-01-31 13:43:18 +01:00
parent 1b8a72d24a
commit 53eb70e693
15 changed files with 52 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
diylc/diylc-core/src/org/diylc/common/IPlugInPort.java
+3 -2
View File
@@ -174,9 +174,10 @@ public interface IPlugInPort extends ISelectionProcessor, IMouseProcessor, IKeyP
*
* @param g2d
* @param drawOptions specific drawing options
* @param filter
* @param filter
* @param externalZoom
*/
void draw(Graphics2D g2d, Set<DrawOption> drawOptions, IComponentFiler filter);
void draw(Graphics2D g2d, Set<DrawOption> drawOptions, IComponentFiler filter, Double externalZoom);
Double[] getAvailableZoomLevels();
diylc/diylc-core/src/org/diylc/presenter/DrawingManager.java
+13 -5
View File
@@ -27,6 +27,7 @@ import java.awt.Point;
import java.awt.Rectangle;
import java.awt.RenderingHints;
import java.awt.geom.Area;
import java.awt.geom.Line2D;
import java.awt.geom.Path2D;
import java.awt.geom.PathIterator;
import java.util.ArrayList;
@@ -122,12 +123,13 @@ public class DrawingManager {
* @param controlPointSlot
* @param componentSlot
* @param dragInProgress
* @param externalZoom
* @return
*/
public List<IDIYComponent<?>> drawProject(Graphics2D g2d, Project project, Set<DrawOption> drawOptions,
IComponentFiler filter, Rectangle selectionRect, Collection<IDIYComponent<?>> selectedComponents,
Set<IDIYComponent<?>> lockedComponents, Set<IDIYComponent<?>> groupedComponents, List<Point> controlPointSlot,
List<IDIYComponent<?>> componentSlot, boolean dragInProgress) {
List<IDIYComponent<?>> componentSlot, boolean dragInProgress, Double externalZoom) {
failedComponents.clear();
if (project == null) {
return failedComponents;
@@ -139,6 +141,9 @@ public class DrawingManager {
} else {
zoom = 1 / Constants.PIXEL_SIZE;
}
if (externalZoom != null)
zoom *= externalZoom;
G2DWrapper g2dWrapper = new G2DWrapper(g2d, zoom);
@@ -175,20 +180,23 @@ public class DrawingManager {
GridType gridType = GridType.LINES;
if (drawOptions.contains(DrawOption.GRID) && gridType != GridType.NONE) {
double zoomStep = project.getGridSpacing().convertToPixels() * zoom;
float gridThickness = (float) (1f * (zoom > 1 ? 1 : zoom));
if (gridType == GridType.CROSSHAIR) {
g2d.setStroke(new BasicStroke(1f, BasicStroke.CAP_BUTT, BasicStroke.JOIN_MITER, 10f, new float[] {
g2d.setStroke(new BasicStroke(gridThickness, BasicStroke.CAP_BUTT, BasicStroke.JOIN_MITER, 10f, new float[] {
(float) zoomStep / 2, (float) zoomStep / 2}, (float) zoomStep / 4));
} else if (gridType == GridType.DOT) {
g2d.setStroke(new BasicStroke(1f, BasicStroke.CAP_BUTT, BasicStroke.JOIN_MITER, 10f, new float[] {1f,
g2d.setStroke(new BasicStroke(gridThickness, BasicStroke.CAP_BUTT, BasicStroke.JOIN_MITER, 10f, new float[] {1f,
(float) zoomStep - 1}, 0f));
} else {
g2d.setStroke(ObjectCache.getInstance().fetchZoomableStroke(gridThickness));
}
g2dWrapper.setColor(theme.getGridColor());
for (double i = zoomStep; i < d.width; i += zoomStep) {
g2dWrapper.drawLine((int) i, 0, (int) i, d.height - 1);
g2dWrapper.draw(new Line2D.Double(i, 0, i, d.height - 1));
}
for (double j = zoomStep; j < d.height; j += zoomStep) {
g2dWrapper.drawLine(0, (int) j, d.width - 1, (int) j);
g2dWrapper.draw(new Line2D.Double(0, j, d.width - 1, j));
}
}
diylc/diylc-core/src/org/diylc/presenter/Presenter.java
+5 -2
View File
@@ -436,7 +436,7 @@ public class Presenter implements IPlugInPort {
}
@Override
public void draw(Graphics2D g2d, Set<DrawOption> drawOptions, final IComponentFiler filter) {
public void draw(Graphics2D g2d, Set<DrawOption> drawOptions, final IComponentFiler filter, Double externalZoom) {
if (currentProject == null) {
return;
}
@@ -478,7 +478,10 @@ public class Presenter implements IPlugInPort {
getLockedComponents(),
groupedComponents,
Arrays.asList(instantiationManager.getFirstControlPoint(),
instantiationManager.getPotentialControlPoint()), componentSlotToDraw, dragInProgress);
instantiationManager.getPotentialControlPoint()),
componentSlotToDraw,
dragInProgress,
externalZoom);
List<String> failedComponentNames = new ArrayList<String>();
for (IDIYComponent<?> component : failedComponents) {
failedComponentNames.add(component.getName());
diylc/diylc-library/lib/diylc-core.jar
BIN
View File
Binary file not shown.
diylc/diylc-library/src/org/diylc/components/AbstractLeadedComponent.java
+6 -6
View File
@@ -293,13 +293,13 @@ public abstract class AbstractLeadedComponent<T> extends AbstractTransparentComp
}
private void drawLeads(Graphics2D g2d, double theta, double leadLength) {
int endX = (int) Math.round(points[0].x + Math.cos(theta) * leadLength);
int endY = (int) Math.round(points[0].y + Math.sin(theta) * leadLength);
g2d.drawLine(points[0].x, points[0].y, endX, endY);
double endX = points[0].x + Math.cos(theta) * leadLength;
double endY = points[0].y + Math.sin(theta) * leadLength;
g2d.draw(new Line2D.Double(points[0].x, points[0].y, endX, endY));
endX = (int) Math.round(points[1].x + Math.cos(theta - Math.PI) * leadLength);
endY = (int) Math.round(points[1].y + Math.sin(theta - Math.PI) * leadLength);
g2d.drawLine(points[1].x, points[1].y, endX, endY);
endX = points[1].x + Math.cos(theta - Math.PI) * leadLength;
endY = points[1].y + Math.sin(theta - Math.PI) * leadLength;
g2d.draw(new Line2D.Double(points[1].x, points[1].y, endX, endY));
}
private void drawLead(Graphics2D g2d, ComponentState componentState, IDrawingObserver observer, boolean isCopperArea) {
diylc/diylc-swing/lib/diylc-core.jar
BIN
View File
Binary file not shown.
diylc/diylc-swing/lib/swing-framework.jar
BIN
View File
Binary file not shown.
diylc/diylc-swing/library/main.jar
BIN
View File
Binary file not shown.
diylc/diylc-swing/src/org/diylc/swing/gui/TemplateDialog.java
+1 -1
View File
@@ -290,7 +290,7 @@ public class TemplateDialog extends JDialog {
super.paint(g);
// Graphics2D g2d = (Graphics2D) g;
// AffineTransform transform = g2d.getTransform();
presenter.draw((Graphics2D) g, EnumSet.of(DrawOption.ZOOM, DrawOption.ANTIALIASING), null);
presenter.draw((Graphics2D) g, EnumSet.of(DrawOption.ZOOM, DrawOption.ANTIALIASING), null, null);
// g2d.setTransform(transform);
// Rectangle rect = canvasPanel.getBounds();
// BorderFactory.createEtchedBorder().paintBorder(canvasPanel,
diylc/diylc-swing/src/org/diylc/swing/plugins/canvas/CanvasPanel.java
+1 -1
View File
@@ -237,7 +237,7 @@ public class CanvasPanel extends JComponent implements Autoscroll {
if (ConfigurationManager.getInstance().readBoolean(IPlugInPort.SHOW_GRID_KEY, true)) {
drawOptions.add(DrawOption.GRID);
}
plugInPort.draw(g2d, drawOptions, null);
plugInPort.draw(g2d, drawOptions, null, null);
if (useHardwareAcceleration) {
VolatileImage volatileImage = (VolatileImage) bufferImage;
do {
diylc/diylc-swing/src/org/diylc/swing/plugins/cloud/view/UploadDialog.java
+2 -2
View File
@@ -318,8 +318,8 @@ public class UploadDialog extends ButtonDialog {
zoomRatio = rect.getHeight() / d.getHeight();
}
g2d.scale(zoomRatio, zoomRatio);
UploadDialog.this.plugInPort.draw(g2d, EnumSet.of(DrawOption.ANTIALIASING), null);
// g2d.scale(zoomRatio, zoomRatio);
UploadDialog.this.plugInPort.draw(g2d, EnumSet.of(DrawOption.ANTIALIASING), null, zoomRatio);
}
public String getKeywords() {
diylc/diylc-swing/src/org/diylc/swing/plugins/file/ProjectDrawingProvider.java
+12 -12
View File
@@ -21,15 +21,15 @@
*/
package org.diylc.swing.plugins.file;
import java.awt.Dimension;
import java.awt.Graphics;
import java.awt.Graphics2D;
import java.util.EnumSet;
import org.diylc.appframework.miscutils.ConfigurationManager;
import org.diylc.common.DrawOption;
import org.diylc.common.IPlugInPort;
import org.diylc.swingframework.IDrawingProvider;
import java.awt.Dimension;
import java.awt.Graphics;
import java.awt.Graphics2D;
import java.util.EnumSet;
import org.diylc.appframework.miscutils.ConfigurationManager;
import org.diylc.common.DrawOption;
import org.diylc.common.IPlugInPort;
import org.diylc.swingframework.IDrawingProvider;
/**
* {@link IDrawingProvider} implementation that uses {@link IPlugInPort} to draw a project onto the
@@ -51,12 +51,12 @@ public class ProjectDrawingProvider implements IDrawingProvider {
}
@Override
public Dimension getSize() {
public Dimension getSize() {
return plugInPort.getCanvasDimensions(useZoom);
}
@Override
public void draw(int page, Graphics g) {
public void draw(int page, Graphics g, double zoomFactor) {
EnumSet<DrawOption> drawOptions = EnumSet.of(DrawOption.ANTIALIASING);
if (useZoom) {
drawOptions.add(DrawOption.ZOOM);
@@ -67,7 +67,7 @@ public class ProjectDrawingProvider implements IDrawingProvider {
if (ConfigurationManager.getInstance().readBoolean(IPlugInPort.OUTLINE_KEY, false)) {
drawOptions.add(DrawOption.OUTLINE_MODE);
}
plugInPort.draw((Graphics2D) g, drawOptions, null);
plugInPort.draw((Graphics2D) g, drawOptions, null, zoomFactor);
}
@Override
diylc/diylc-swing/src/org/diylc/swing/plugins/file/ProjectPreview.java
+2 -2
View File
@@ -147,8 +147,8 @@ public class ProjectPreview extends JPanel implements PropertyChangeListener, IF
// System.out.println(x + "," + y);
// g2d.translate(x, y);
g2d.scale(zoomRatio, zoomRatio);
presenter.draw(g2d, EnumSet.noneOf(DrawOption.class), null);
// g2d.scale(zoomRatio, zoomRatio);
presenter.draw(g2d, EnumSet.noneOf(DrawOption.class), null, zoomRatio);
g2d.setColor(Color.black);
g2d.drawRect(0, 0, d.width - (int) (1 / zoomRatio), d.height - (int) (1 / zoomRatio));
diylc/diylc-swing/src/org/diylc/swing/plugins/file/TraceMaskDrawingProvider.java
+2 -2
View File
@@ -59,8 +59,8 @@ public class TraceMaskDrawingProvider implements IDrawingProvider {
}
@Override
public void draw(int page, Graphics g) {
plugInPort.draw((Graphics2D) g, EnumSet.of(DrawOption.ANTIALIASING), new PCBLayerFiler(getUsedLayers()[page]));
public void draw(int page, Graphics g, double zoomFactor) {
plugInPort.draw((Graphics2D) g, EnumSet.of(DrawOption.ANTIALIASING), new PCBLayerFiler(getUsedLayers()[page]), zoomFactor);
}
@Override
diylc/diylc-swing/update.xml
+5 -1
View File
@@ -2357,7 +2357,11 @@
</versionNumber>
<releaseDate>2019-01-28 00:00:00.000 CET</releaseDate>
<name></name>
<changes>
<changes>
<org.diylc.appframework.update.Change>
<changeType>IMPROVEMENT</changeType>
<description>Better precision when exporting to PDF and PNG files</description>
</org.diylc.appframework.update.Change>
<org.diylc.appframework.update.Change>
<changeType>BUG_FIX</changeType>
<description>"PCB Text" components are not included in trace mask exports</description>