Allow charges to be places on the left side of an atom if orientation allows.

johnmay · johnmay · commit e7de75d234c7 · 2020-01-08T11:58:43.000Z
diff --git a/display/renderbasic/src/main/java/org/openscience/cdk/renderer/generators/standard/StandardAtomGenerator.java b/display/renderbasic/src/main/java/org/openscience/cdk/renderer/generators/standard/StandardAtomGenerator.java
@@ -476,7 +476,10 @@ TextOutline positionAfter(TextOutline before, TextOutline after) {
      * @param hydrogen  the hydrogen label outline
      * @return positioned charge label
      */
-    TextOutline positionChargeLabel(int hydrogens, HydrogenPosition position, TextOutline charge, TextOutline element,
+    TextOutline positionChargeLabel(int hydrogens,
+                                    HydrogenPosition position,
+                                    TextOutline charge,
+                                    TextOutline element,
                                     TextOutline hydrogen) {
 
         final Rectangle2D chargeBounds = charge.getBounds();
@@ -486,12 +489,14 @@ TextOutline positionChargeLabel(int hydrogens, HydrogenPosition position, TextOu
         // are in the way - in which case we place it relative to the
         // hydrogen
         Rectangle2D referenceBounds = element.getBounds();
-        if (hydrogens > 0 && position == Right)
+        if (hydrogens > 0 && position != Below)
             referenceBounds = hydrogen.getBounds();
-        else if (hydrogens > 1 && position == Above) referenceBounds = hydrogen.getBounds();
-
-        return charge.translate((referenceBounds.getMaxX() + padding) - chargeBounds.getMinX(),
-                                (referenceBounds.getMinY() - (chargeBounds.getHeight() / 2)) - chargeBounds.getMinY());
+        if (position == Left)
+            return charge.translate((referenceBounds.getMinX() - padding) - chargeBounds.getMaxX(),
+                                    (referenceBounds.getMinY() - (chargeBounds.getHeight() / 2)) - chargeBounds.getMinY());
+        else
+            return charge.translate((referenceBounds.getMaxX() + padding) - chargeBounds.getMinX(),
+                                    (referenceBounds.getMinY() - (chargeBounds.getHeight() / 2)) - chargeBounds.getMinY());
     }
 
     /**
