Show ovals for outerglow - also realised the SVG element is ellipse i…

…nstead of oval.
cdk · Oct 6, 2015 · fddbdc5 · fddbdc5
1 parent 305aaf3
commit fddbdc5
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/app/depict/src/main/java/org/openscience/cdk/depict/SvgDrawVisitor.java b/app/depict/src/main/java/org/openscience/cdk/depict/SvgDrawVisitor.java
@@ -411,7 +411,7 @@ private void visit(OvalElement elem) {
         appendIdent();
         double[] points = new double[]{elem.xCoord, elem.yCoord};
         transform(points, 1);
-        sb.append("<oval");
+        sb.append("<ellipse");
         sb.append(" cx='").append(toStr(points[0])).append("'");
         sb.append(" cy='").append(toStr(points[1])).append("'");
         sb.append(" rx='").append(toStr(scaled(elem.radius))).append("'");

diff --git a/...sic/src/main/java/org/openscience/cdk/renderer/generators/standard/StandardGenerator.java b/...sic/src/main/java/org/openscience/cdk/renderer/generators/standard/StandardGenerator.java
@@ -39,6 +39,7 @@
 import org.openscience.cdk.renderer.elements.IRenderingElement;
 import org.openscience.cdk.renderer.elements.LineElement;
 import org.openscience.cdk.renderer.elements.MarkedElement;
+import org.openscience.cdk.renderer.elements.OvalElement;
 import org.openscience.cdk.renderer.generators.BasicSceneGenerator;
 import org.openscience.cdk.renderer.generators.IGenerator;
 import org.openscience.cdk.renderer.generators.IGeneratorParameter;
@@ -233,14 +234,19 @@ public IRenderingElement generate(IAtomContainer container, RendererModel parame
             if (isHidden(atom))
                 continue;
 
-            if (symbols[i] == null) {
-                continue;
-            }
-
             Color highlight = getHighlightColor(atom, parameters);
             Color color = highlight != null && style == HighlightStyle.Colored ? highlight : coloring
                     .getAtomColor(atom);
 
+            if (symbols[i] == null) {
+                // we add a 'ball' around atoms with no symbols (e.g. carbons)
+                if (highlight != null && style == HighlightStyle.OuterGlow) {
+                    backLayer.add(MarkedElement.markup(new OvalElement(atom.getPoint2d().x, atom.getPoint2d().y,1.75 * glowWidth * stroke, true, highlight),
+                                                       "outerglow"));
+                }
+                continue;
+            }
+
             ElementGroup symbolElements = new ElementGroup();
             for (Shape shape : symbols[i].getOutlines()) {
                 GeneralPath path = GeneralPath.shapeOf(shape, color);