diff --git a/diylc/diylc-core/src/org/diylc/presenter/update.xml b/diylc/diylc-core/src/org/diylc/presenter/update.xml index 123e4a80..d8381726 100644 --- a/diylc/diylc-core/src/org/diylc/presenter/update.xml +++ b/diylc/diylc-core/src/org/diylc/presenter/update.xml @@ -3757,5 +3757,25 @@ https://github.com/bancika/diy-layout-creator/releases + + + 4 + 22 + 1 + + 2022-03-03 00:00:00.000 CET + + + + BUG_FIX + Fixed backwards compatibility issue with older files failing to open because of an issue with 'Tape Measure' component serialization + + + BUG_FIX + Fixed display issue with Trace layer showing up as Wiring in the menu + + + https://github.com/bancika/diy-layout-creator/releases + diff --git a/diylc/diylc-library/lib/diylc-core.jar b/diylc/diylc-library/lib/diylc-core.jar index 69aca455..eaf5ff75 100644 Binary files a/diylc/diylc-library/lib/diylc-core.jar and b/diylc/diylc-library/lib/diylc-core.jar differ diff --git a/diylc/diylc-library/src/org/diylc/components/shapes/TapeMeasure.java b/diylc/diylc-library/src/org/diylc/components/shapes/TapeMeasure.java index 78a51387..28df53b6 100644 --- a/diylc/diylc-library/src/org/diylc/components/shapes/TapeMeasure.java +++ b/diylc/diylc-library/src/org/diylc/components/shapes/TapeMeasure.java @@ -65,8 +65,7 @@ public class TapeMeasure extends AbstractLeadedComponent { protected LineStyle style = LineStyle.SOLID; private Size thickness = new Size(1d, SizeUnit.px); private Size arrowSize = new Size(5d, SizeUnit.px); - private Polygon arrow = null; - private AffineTransform arrowTx = new AffineTransform(); + private transient Polygon arrow = null; private boolean arrowStart = true; private boolean arrowEnd = true; private SizeUnit unit = SizeUnit.mm; @@ -116,6 +115,7 @@ public class TapeMeasure extends AbstractLeadedComponent { Point2D startPoint = new Point2D.Double(first.getX(), first.getY()); Point2D endPoint = new Point2D.Double(second.getX(), second.getY()); + AffineTransform arrowTx = new AffineTransform(); if (arrowStart) { arrowTx.setToIdentity(); double angle = Math.atan2(getControlPoint(1).getY() - getControlPoint(0).getY(), getControlPoint(1).getX() - getControlPoint(0).getX()); @@ -155,8 +155,6 @@ public class TapeMeasure extends AbstractLeadedComponent { int y = -metrics.getHeight() / 2 + metrics.getAscent(); int legLength = (int) (getPoints()[0].distance(getPoints()[1]) - strWidth) / 2 - 6; - - System.out.println(strWidth + " " + legLength); // draw legs around the enter text g2d.drawLine((int)startPoint.getX(), (int)startPoint.getY(), diff --git a/diylc/diylc-swing/dict.txt b/diylc/diylc-swing/dict.txt index 9d7a1bf2..c454aeca 100644 --- a/diylc/diylc-swing/dict.txt +++ b/diylc/diylc-swing/dict.txt @@ -26,6 +26,7 @@ A-O-I REGULATOR AWG And C-B-E BJT +CP1 Check Trace Proximity D-G-S JFET D-G-S MOSFET @@ -77,6 +78,7 @@ PCB PNP Panel Português +RECTC1 Rev log S-G-D JFET S-G-D MOSFET @@ -85,6 +87,7 @@ SPDT SPDT (Center OFF) SPST Srpski +TM2 Tick Width Ticks Wiring diff --git a/diylc/diylc-swing/lib/diylc-core.jar b/diylc/diylc-swing/lib/diylc-core.jar index 69aca455..eaf5ff75 100644 Binary files a/diylc/diylc-swing/lib/diylc-core.jar and b/diylc/diylc-swing/lib/diylc-core.jar differ diff --git a/diylc/diylc-swing/library/main.jar b/diylc/diylc-swing/library/main.jar index dea3d3c7..3e2e31c8 100644 Binary files a/diylc/diylc-swing/library/main.jar and b/diylc/diylc-swing/library/main.jar differ