Add stroke property to oval element.

johnmay · johnmay · commit a35f3cabe404 · 2019-07-31T09:50:47.000+01:00
diff --git a/display/renderawt/src/main/java/org/openscience/cdk/renderer/visitor/AWTDrawVisitor.java b/display/renderawt/src/main/java/org/openscience/cdk/renderer/visitor/AWTDrawVisitor.java
@@ -215,6 +215,22 @@ private void visit(OvalElement oval) {
             this.graphics.fillOval(transformX(oval.xCoord) - radius, transformY(oval.yCoord) - radius, diameter,
                     diameter);
         } else {
+            Stroke savedStroke = this.graphics.getStroke();
+
+            // scale the stroke by zoom + scale (both included in the AffineTransform)
+            float width = (float) (oval.stroke * transform.getScaleX());
+            if (width < minStroke) width = minStroke;
+
+            int key = (int) (width * 4); // store 2.25, 2.5, 2.75 etc to separate keys
+
+            if (strokeCache && strokeMap.containsKey(key)) {
+                this.graphics.setStroke(strokeMap.get(key));
+            } else {
+                BasicStroke stroke = new BasicStroke(width, BasicStroke.CAP_ROUND, BasicStroke.JOIN_ROUND);
+                this.graphics.setStroke(stroke);
+                strokeMap.put(key, stroke);
+            }
+
             this.graphics.drawOval(transformX(oval.xCoord) - radius, transformY(oval.yCoord) - radius, diameter,
                     diameter);
         }
diff --git a/display/renderbasic/src/main/java/org/openscience/cdk/renderer/elements/OvalElement.java b/display/renderbasic/src/main/java/org/openscience/cdk/renderer/elements/OvalElement.java
@@ -36,7 +36,10 @@ public class OvalElement implements IRenderingElement {
     public final double  yCoord;
 
     /** The radius of the oval. **/
-    public final double  radius; // TODO : width AND height
+    public final double  radius;
+
+    /** The stroke width. */
+    public final double stroke;
 
     /** If true, draw the oval as filled. **/
     public final boolean fill;
@@ -76,10 +79,22 @@ public OvalElement(double xCoord, double yCoord, double radius, Color color) {
      * @param fill if true, fill the oval when drawing
      * @param color the color of the oval
      */
-    public OvalElement(double xCoord, double yCoord, double radius, boolean fill, Color color) {
+    public OvalElement(double xCoord, double yCoord, double radius, double stroke,
+                       boolean fill, Color color) {
+        this.xCoord = xCoord;
+        this.yCoord = yCoord;
+        this.radius = radius;
+        this.stroke = stroke;
+        this.fill = fill;
+        this.color = color;
+    }
+
+    public OvalElement(double xCoord, double yCoord, double radius,
+                       boolean fill, Color color) {
         this.xCoord = xCoord;
         this.yCoord = yCoord;
         this.radius = radius;
+        this.stroke = 1;
         this.fill = fill;
         this.color = color;
     }
diff --git a/display/renderbasic/src/main/java/org/openscience/cdk/renderer/generators/standard/StandardDonutGenerator.java b/display/renderbasic/src/main/java/org/openscience/cdk/renderer/generators/standard/StandardDonutGenerator.java
@@ -67,6 +67,7 @@ final class StandardDonutGenerator {
     private final boolean    delocalisedDonuts;
     private final double     dbSpacing;
     private final double     scale;
+    private final double     stroke;
     private final Color      fgColor;
     private final Font       font;
     private final IAtomContainer mol;
@@ -77,13 +78,15 @@ final class StandardDonutGenerator {
      * @param font the font
      * @param model the rendering parameters
      */
-    StandardDonutGenerator(IAtomContainer mol, Font font, RendererModel model) {
+    StandardDonutGenerator(IAtomContainer mol, Font font, RendererModel model,
+                           double stroke) {
         this.mol = mol;
         this.font = font;
         this.forceDelocalised = model.get(ForceDelocalisedBondDisplay.class);
         this.delocalisedDonuts = model.get(DelocalisedDonutsBondDisplay.class);
         this.dbSpacing = model.get(StandardGenerator.BondSeparation.class);
         this.scale = model.get(BasicSceneGenerator.Scale.class);
+        this.stroke = stroke;
         this.fgColor = model.get(StandardGenerator.AtomColor.class).getAtomColor(
                              mol.getBuilder().newInstance(IAtom.class, "C"));
     }
@@ -150,7 +153,7 @@ else if (charge > +1)
             double  n  = ring.getBondCount();
             double  r  = s / (2 * Math.tan(Math.PI / n));
             group.add(new OvalElement(p2.x, p2.y, r - 1.5*dbSpacing,
-                                      false, fgColor));
+                                      stroke, false, fgColor));
         }
         return group;
     }
diff --git a/display/renderbasic/src/main/java/org/openscience/cdk/renderer/generators/standard/StandardGenerator.java b/display/renderbasic/src/main/java/org/openscience/cdk/renderer/generators/standard/StandardGenerator.java
@@ -212,7 +212,8 @@ public IRenderingElement generate(IAtomContainer container, RendererModel parame
         ElementGroup annotations = new ElementGroup();
 
         StandardDonutGenerator donutGenerator;
-        donutGenerator = new StandardDonutGenerator(container, font, parameters);
+        donutGenerator = new StandardDonutGenerator(container, font, parameters,
+                                                    stroke);
         IRenderingElement donuts = donutGenerator.generate();
 
         AtomSymbol[] symbols = generateAtomSymbols(container, symbolRemap,
