From 925ca60aa4ad4cdffd42d8aeca5c912af782f5f6 Mon Sep 17 00:00:00 2001
From: Nico Mack <nico.mack@list.lu>
Date: Mon, 9 Nov 2020 10:45:10 +0100
Subject: [PATCH] Minor performance improvements by removing unnecessary shape
 operations.

---
 .../dkd/tui/widget/corona/CoxcombSlice.java   | 76 +++++--------------
 1 file changed, 20 insertions(+), 56 deletions(-)

diff --git a/CPS/src/lu/list/itis/dkd/tui/widget/corona/CoxcombSlice.java b/CPS/src/lu/list/itis/dkd/tui/widget/corona/CoxcombSlice.java
index 9d19345..528ade5 100644
--- a/CPS/src/lu/list/itis/dkd/tui/widget/corona/CoxcombSlice.java
+++ b/CPS/src/lu/list/itis/dkd/tui/widget/corona/CoxcombSlice.java
@@ -93,7 +93,6 @@ public class CoxcombSlice extends ValueCorona implements InformationProvider<Obj
 
     private double normalizedValue;
     private double correctedAngle;
-    private Area outer;
     private Area inner;
     private Area slice;
     private Area face;
@@ -267,7 +266,6 @@ public class CoxcombSlice extends ValueCorona implements InformationProvider<Obj
     // ---------------------------------------------------------------------------
 
     private void buildFromProperties() {
-        // double diameter;
 
         FontRenderContext renderingContext = new FontRenderContext(null, true, true);
         metrics = textFont.getLineMetrics(label, renderingContext);
@@ -279,60 +277,23 @@ public class CoxcombSlice extends ValueCorona implements InformationProvider<Obj
 
         this.updateSlice();
 
-        // correctedAngle = AngleUtils.moduloThreeSixty(AngleUtils.THREE_SIXTY - startAngle -
-        // arcSpan);
-        //
-        // diameter = 2 * innerRadius;
-        // inner = new Area(new Ellipse2D.Double(-innerRadius, -innerRadius, diameter, diameter));
-        //
-        // diameter = 2 * lowerBoundRadius;
-        // outer = new Area(new Ellipse2D.Double(-lowerBoundRadius, -lowerBoundRadius, diameter,
-        // diameter));
-        //
-        // Shape sector = new Arc2D.Double(-lowerBoundRadius, -lowerBoundRadius, diameter, diameter,
-        // correctedAngle, arcSpan, Arc2D.PIE);
-        // Area initial = new Area(sector);
-        // initial.subtract(inner);
-        // outer.subtract(inner);
-        // shape = initial;
-        //
-        // diameter = 2 * upperBoundRadius;
-        // sector = new Arc2D.Double(-upperBoundRadius, -upperBoundRadius, diameter, diameter,
-        // correctedAngle, arcSpan, Arc2D.PIE);
-        // face = new Area(sector);
-        // face.subtract(inner);
-        // outer.subtract(inner);
-
         borderStroke = (strokeWidth > 0) ? new BasicStroke(strokeWidth) : null;
 
-        // int availableWidth;
-        //
-        // if (wrapToFit) {
-        // if (!radialLayout) {
-        // double arcLength = Math.PI * ((upperBoundRadius + lowerBoundRadius) / 2) * (arcSpan /
-        // AngleUtils.ONE_EIGHTY);
-        // availableWidth = (int) arcLength - 2 * insetBorder;
-        // } else {
-        // availableWidth = (int) (upperBoundRadius - lowerBoundRadius - 2 * insetBorder);
-        // }
-        // lines = StringUtils.wrapToFit(label, availableWidth, textFont);
-        // } else {
-        // lines = new ArrayList<>();
-        // lines.add(label);
-        // }
-        //
-        // if (!radialLayout) {
-        // labelShape = this.buildCircularText(lines, metrics);
-        // } else {
-        // labelShape = this.buildRadialText(lines, metrics, correctedAngle);
-        // }
-
         this.setInformation(this.variable.getValue());
         this.setSelected(this.isSelected);
     }
 
     // ---------------------------------------------------------------------------
 
+    private Shape buildSector(double radius, double diameter) {
+        Shape sector = (arcSpan < AngleUtils.THREE_SIXTY)
+                        ? new Arc2D.Double(-radius, -radius, diameter, diameter, correctedAngle, arcSpan, Arc2D.PIE)
+                        : new Ellipse2D.Double(-radius, -radius, diameter, diameter);
+        return sector;
+    }
+
+    // ---------------------------------------------------------------------------
+
     private void updateSlice() {
         double diameter;
         List<String> lines;
@@ -342,20 +303,22 @@ public class CoxcombSlice extends ValueCorona implements InformationProvider<Obj
         diameter = 2 * innerRadius;
         inner = new Area(new Ellipse2D.Double(-innerRadius, -innerRadius, diameter, diameter));
 
-        diameter = 2 * lowerBoundRadius;
-        outer = new Area(new Ellipse2D.Double(-lowerBoundRadius, -lowerBoundRadius, diameter, diameter));
+        Shape sector = buildSector(lowerBoundRadius, diameter);
+
+        // Shape sector = (arcSpan < AngleUtils.THREE_SIXTY) ? new Arc2D.Double(-lowerBoundRadius,
+        // -lowerBoundRadius, diameter, diameter, correctedAngle, arcSpan, Arc2D.PIE);
+        // : new Ellipse2D.Double(-lowerBoundRadius, -lowerBoundRadius, diameter, diameter);
 
-        Shape sector = new Arc2D.Double(-lowerBoundRadius, -lowerBoundRadius, diameter, diameter, correctedAngle, arcSpan, Arc2D.PIE);
         Area initial = new Area(sector);
         initial.subtract(inner);
-        outer.subtract(inner);
         shape = initial;
 
         diameter = 2 * upperBoundRadius;
-        sector = new Arc2D.Double(-upperBoundRadius, -upperBoundRadius, diameter, diameter, correctedAngle, arcSpan, Arc2D.PIE);
+        // sector = new Arc2D.Double(-upperBoundRadius, -upperBoundRadius, diameter, diameter,
+        // correctedAngle, arcSpan, Arc2D.PIE);
+        sector = buildSector(upperBoundRadius, diameter);
         face = new Area(sector);
         face.subtract(inner);
-        outer.subtract(inner);
 
         int availableWidth;
 
@@ -462,10 +425,11 @@ public class CoxcombSlice extends ValueCorona implements InformationProvider<Obj
             }
 
             double diameter = 2 * radius;
-            Shape sector = new Arc2D.Double(-radius, -radius, diameter, diameter, correctedAngle, arcSpan, Arc2D.PIE);
+            // Shape sector = new Arc2D.Double(-radius, -radius, diameter, diameter, correctedAngle,
+            // arcSpan, Arc2D.PIE);
+            Shape sector = buildSector(radius, diameter);
             slice = new Area(sector);
             slice.subtract(inner);
-            outer.subtract(inner);
             shape = slice;
         }
     }
-- 
GitLab