Added getScale and AtomContainerBoundsGenerator

bioclipse · May 23, 2012 · 5b7ddc2 · 5b7ddc2
1 parent 467ba79
commit 5b7ddc2
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 6 deletions.
diff --git a/...ioclipse.cdk.jchempaint/src/net/bioclipse/cdk/jchempaint/business/IJChemPaintManager.java b/...ioclipse.cdk.jchempaint/src/net/bioclipse/cdk/jchempaint/business/IJChemPaintManager.java
@@ -22,8 +22,10 @@
 import net.bioclipse.managers.business.IBioclipseManager;
 
 import org.openscience.cdk.interfaces.IAtom;
+import org.openscience.cdk.interfaces.IAtomContainer;
 import org.openscience.cdk.interfaces.IBond;
 import org.openscience.cdk.interfaces.IChemObject;
+import org.openscience.cdk.renderer.generators.IGeneratorParameter;
 
 /**
  * Manager for the JChemPaintEditor scripting language.
@@ -64,6 +66,10 @@ public interface IJChemPaintManager extends IBioclipseManager {
                        		           " are shown." )
     public void setShowExplicitHydrogens(boolean explicitHydrogens);
 
+    @PublishedMethod ( params = "Class parameter",
+    				   methodSummary = "Gets the generator parameter of type class.")
+    public Object getParameter();
+
     @Recorded
     @PublishedMethod ( params = "boolean implicitHydrogens",
                        methodSummary = "Sets whether implicit hydrogens are " +

diff --git a/...bioclipse.cdk.jchempaint/src/net/bioclipse/cdk/jchempaint/business/JChemPaintManager.java b/...bioclipse.cdk.jchempaint/src/net/bioclipse/cdk/jchempaint/business/JChemPaintManager.java
@@ -55,10 +55,12 @@
 import org.openscience.cdk.renderer.generators.BasicBondGenerator.WedgeWidth;
 import org.openscience.cdk.renderer.generators.BasicSceneGenerator.FitToScreen;
 import org.openscience.cdk.renderer.generators.BasicSceneGenerator.Margin;
+import org.openscience.cdk.renderer.generators.BasicSceneGenerator.Scale;
 import org.openscience.cdk.renderer.generators.BasicSceneGenerator.ZoomFactor;
 import org.openscience.cdk.renderer.generators.ExtendedAtomGenerator.ShowImplicitHydrogens;
 import org.openscience.cdk.renderer.generators.HighlightAtomGenerator.HighlightAtomDistance;
 import org.openscience.cdk.renderer.generators.HighlightBondGenerator.HighlightBondDistance;
+import org.openscience.cdk.renderer.generators.IGeneratorParameter;
 import org.openscience.cdk.renderer.generators.RingGenerator.CDKStyleAromaticity;
 import org.openscience.cdk.renderer.generators.RingGenerator.RingProportion;
 import org.openscience.cdk.renderer.generators.RingGenerator.ShowAromaticity;
@@ -683,6 +685,10 @@ public boolean getShowAromaticity() {
             return false;
         }
     }
+
+    public Object getParameter() {
+    	return this.getRendererModel().get(Scale.class);
+    }
 
     public boolean getShowAromaticityInCDKStyle() {
         RendererModel model = this.getRendererModel();

diff --git a/...lipse.cdk.jchempaint/src/net/bioclipse/cdk/jchempaint/widgets/JChemPaintEditorWidget.java b/...lipse.cdk.jchempaint/src/net/bioclipse/cdk/jchempaint/widgets/JChemPaintEditorWidget.java
@@ -95,24 +95,22 @@
 import org.openscience.cdk.interfaces.IAtomType;
 import org.openscience.cdk.interfaces.IBond;
 import org.openscience.cdk.interfaces.IChemModel;
-import org.openscience.cdk.interfaces.IMoleculeSet;
 import org.openscience.cdk.interfaces.IReaction;
 import org.openscience.cdk.interfaces.IReactionSet;
 import org.openscience.cdk.nonotify.NoNotificationChemObjectBuilder;
-import org.openscience.cdk.renderer.ChemModelRenderer;
 import org.openscience.cdk.renderer.IRenderer;
 import org.openscience.cdk.renderer.RendererModel;
 import org.openscience.cdk.renderer.generators.BasicSceneGenerator;
 import org.openscience.cdk.renderer.generators.ExternalHighlightGenerator;
-import org.openscience.cdk.renderer.generators.IGenerator;
-import org.openscience.cdk.renderer.generators.MergeAtomsGenerator;
-import org.openscience.cdk.renderer.generators.SelectAtomGenerator;
-import org.openscience.cdk.renderer.generators.SelectBondGenerator;
 import org.openscience.cdk.renderer.generators.HighlightAtomGenerator.HighlightAtomShapeFilled;
 import org.openscience.cdk.renderer.generators.HighlightAtomGenerator.HoverOverColor;
 import org.openscience.cdk.renderer.generators.HighlightBondGenerator.HighlightBondShapeFilled;
+import org.openscience.cdk.renderer.generators.IGenerator;
+import org.openscience.cdk.renderer.generators.MergeAtomsGenerator;
+import org.openscience.cdk.renderer.generators.SelectAtomGenerator;
 import org.openscience.cdk.renderer.generators.SelectAtomGenerator.SelectionAtomColor;
 import org.openscience.cdk.renderer.generators.SelectAtomGenerator.SelectionRadius;
+import org.openscience.cdk.renderer.generators.SelectBondGenerator;
 import org.openscience.cdk.renderer.generators.SelectBondGenerator.SelectionBondColor;
 import org.openscience.cdk.renderer.selection.AbstractSelection;
 import org.openscience.cdk.renderer.selection.IChemObjectSelection;