Need to access the correct scale value from the model.

Signed-off-by: Egon Willighagen <egon.willighagen@gmail.com>
cdk · Jun 2, 2016 · 3f9fdab · 3f9fdab
1 parent 1577d14
commit 3f9fdab
Showing 1 changed file with 9 additions and 11 deletions.
diff --git a/app/depict/src/main/java/org/openscience/cdk/depict/DepictionGenerator.java b/app/depict/src/main/java/org/openscience/cdk/depict/DepictionGenerator.java
@@ -358,7 +358,7 @@ public Depiction depict(Iterable<IAtomContainer> mols, int nrow, int ncol) throw
         final List<Bounds> titles = new ArrayList<>();
         if (copy.getParameterValue(BasicSceneGenerator.ShowMoleculeTitle.class)) {
             for (IAtomContainer mol : mols)
-                titles.add(copy.generateTitle(mol));
+                titles.add(copy.generateTitle(mol, model.get(BasicSceneGenerator.Scale.class)));
         }
 
         // remove current highlight buffer
@@ -488,17 +488,17 @@ public Depiction depict(IReaction rxn) throws CDKException {
         resetCoords(agents, agentScales);
 
         final Bounds emptyBounds = new Bounds();
-        final Bounds title = copy.getParameterValue(BasicSceneGenerator.ShowReactionTitle.class) ? copy.generateTitle(rxn) : emptyBounds;
+        final Bounds title = copy.getParameterValue(BasicSceneGenerator.ShowReactionTitle.class) ? copy.generateTitle(rxn, scale) : emptyBounds;
         final List<Bounds> reactantTitles = new ArrayList<>();
         final List<Bounds> productTitles = new ArrayList<>();
         if (copy.getParameterValue(BasicSceneGenerator.ShowMoleculeTitle.class)) {
             for (IAtomContainer reactant : reactants)
-                reactantTitles.add(copy.generateTitle(reactant));
+                reactantTitles.add(copy.generateTitle(reactant, scale));
             for (IAtomContainer product : products)
-                productTitles.add(copy.generateTitle(product));
+                productTitles.add(copy.generateTitle(product, scale));
         }
 
-        final Bounds conditions = generateReactionConditions(rxn, fgcol);
+        final Bounds conditions = generateReactionConditions(rxn, fgcol, model.get(BasicSceneGenerator.Scale.class));
 
         return new ReactionDepiction(model,
                                      reactantBounds, productBounds, agentBounds,
@@ -645,22 +645,20 @@ private List<Bounds> generate(List<IAtomContainer> mols, RendererModel model, in
      * @param chemObj molecule or reaction
      * @return bound element
      */
-    private Bounds generateTitle(IChemObject chemObj) {
+    private Bounds generateTitle(IChemObject chemObj, double scale) {
         String title = chemObj.getProperty(CDKConstants.TITLE);
         if (title == null || title.isEmpty())
             return new Bounds();
-        final double scale = 1 / getParameterValue(BasicSceneGenerator.Scale.class) * getParameterValue(RendererModel.TitleFontScale.class);
+        scale = 1 / scale * getParameterValue(RendererModel.TitleFontScale.class);
         return new Bounds(MarkedElement.markup(StandardGenerator.embedText(font, title, getParameterValue(RendererModel.TitleColor.class), scale),
                                                "title"));
     }
 
-    private Bounds generateReactionConditions(IReaction chemObj, Color fg) {
+    private Bounds generateReactionConditions(IReaction chemObj, Color fg, double scale) {
         String title = chemObj.getProperty(CDKConstants.REACTION_CONDITIONS);
         if (title == null || title.isEmpty())
             return new Bounds();
-        final double scale = 1 / getParameterValue(BasicSceneGenerator.Scale.class);
-
-        return new Bounds(MarkedElement.markup(StandardGenerator.embedText(font, title, fg, scale),
+        return new Bounds(MarkedElement.markup(StandardGenerator.embedText(font, title, fg, 1/scale),
                                                "conditions"));
     }