From a0611fa72708826e8b0f37874651cd3cb8464884 Mon Sep 17 00:00:00 2001 From: bancika Date: Sat, 11 Apr 2020 17:19:16 +0200 Subject: [PATCH] fix cache for proto board and breadboard --- diylc/diylc-core/src/org/diylc/presenter/update.xml | 10 +++++++++- .../src/org/diylc/components/boards/Breadboard.java | 7 +++++++ .../src/org/diylc/components/boards/ProtoBoard.java | 7 +++++++ 3 files changed, 23 insertions(+), 1 deletion(-) diff --git a/diylc/diylc-core/src/org/diylc/presenter/update.xml b/diylc/diylc-core/src/org/diylc/presenter/update.xml index 1b3911d1..54ae581a 100644 --- a/diylc/diylc-core/src/org/diylc/presenter/update.xml +++ b/diylc/diylc-core/src/org/diylc/presenter/update.xml @@ -2941,7 +2941,15 @@ BUG_FIX Fixed the issue with "Highlight Connected Areas" not recognizing some conductive areas - + + + BUG_FIX + Fixed Proto Board and Breadboard issues with "Cache Boost" mode enabled + + + BUG_FIX + All terminals of a "Terminal Strip" were connected together by mistake + https://github.com/bancika/diy-layout-creator/releases diff --git a/diylc/diylc-library/src/org/diylc/components/boards/Breadboard.java b/diylc/diylc-library/src/org/diylc/components/boards/Breadboard.java index ff7c4cb7..6d296179 100644 --- a/diylc/diylc-library/src/org/diylc/components/boards/Breadboard.java +++ b/diylc/diylc-library/src/org/diylc/components/boards/Breadboard.java @@ -27,6 +27,7 @@ import java.awt.Composite; import java.awt.Graphics2D; import java.awt.Point; import java.awt.geom.AffineTransform; +import java.awt.geom.Rectangle2D; import org.diylc.awt.StringUtils; import org.diylc.common.HorizontalAlignment; @@ -376,6 +377,12 @@ public class Breadboard extends AbstractComponent { @Override public String getControlPointNodeName(int index) { return null; + } + + @Override + public Rectangle2D getCachingBounds() { + Point finalSecondPoint = getControlPoint(1); + return new Rectangle2D.Double(point.x, point.y, finalSecondPoint.x - point.x + 1, finalSecondPoint.y - point.y + 1); } public enum BreadboardSize { diff --git a/diylc/diylc-library/src/org/diylc/components/boards/ProtoBoard.java b/diylc/diylc-library/src/org/diylc/components/boards/ProtoBoard.java index c3c640dc..66a9e37d 100644 --- a/diylc/diylc-library/src/org/diylc/components/boards/ProtoBoard.java +++ b/diylc/diylc-library/src/org/diylc/components/boards/ProtoBoard.java @@ -25,6 +25,7 @@ import java.awt.Color; import java.awt.Graphics2D; import java.awt.Point; import java.awt.geom.AffineTransform; +import java.awt.geom.Rectangle2D; import org.diylc.awt.StringUtils; import org.diylc.common.HorizontalAlignment; @@ -694,5 +695,11 @@ public class ProtoBoard extends AbstractComponent { @Override public String getControlPointNodeName(int index) { return null; + } + + @Override + public Rectangle2D getCachingBounds() { + Point finalSecondPoint = getControlPoint(1); + return new Rectangle2D.Double(point.x, point.y, finalSecondPoint.x - point.x + 1, finalSecondPoint.y - point.y + 1); } }