Changes for zoom and scale

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

Hide file tree

Showing 4 changed files with 16 additions and 4 deletions.
diff --git a/...bioclipse.cdk.jchempaint.view/src/net/bioclipse/cdk/jchempaint/view/JChemPaintWidget.java b/...bioclipse.cdk.jchempaint.view/src/net/bioclipse/cdk/jchempaint/view/JChemPaintWidget.java
@@ -51,6 +51,7 @@
 import org.openscience.cdk.renderer.generators.AtomNumberGenerator.AtomNumberTextColor;
 import org.openscience.cdk.renderer.generators.BasicAtomGenerator;
 import org.openscience.cdk.renderer.generators.BasicSceneGenerator;
+import org.openscience.cdk.renderer.generators.BasicSceneGenerator.Scale;
 import org.openscience.cdk.renderer.generators.ExtendedAtomGenerator;
 import org.openscience.cdk.renderer.generators.HighlightAtomGenerator;
 import org.openscience.cdk.renderer.generators.HighlightBondGenerator;
@@ -59,6 +60,7 @@
 import org.openscience.cdk.renderer.generators.RadicalGenerator;
 import org.openscience.cdk.renderer.generators.RingGenerator;
 import org.openscience.cdk.renderer.visitor.IDrawVisitor;
+import org.openscience.cdk.tools.manipulator.ChemModelManipulator;
 
 /**
  * @author arvid
@@ -223,6 +225,8 @@ public void setModel(IChemModel model) {
             this.model = model;
             setBackground( getDisplay().getSystemColor( SWT.COLOR_WHITE ) );
             renderer.setup(model, adaptRectangle(getClientArea()));
+            if(ChemModelManipulator.getAtomCount(model)<2)
+            	getRenderer2DModel().set(Scale.class,28d);
             updateView( true );
         } else {
             this.model = null;

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
@@ -66,10 +66,11 @@ 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();
+    @PublishedMethod ( methodSummary = "Gets the scale paramterer.")
+    public double getScale();
 
+    @PublishedMethod( params = "double new scale", methodSummary="Sets a new scale")
+    public void setScale(double scale);
     @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
@@ -686,9 +686,13 @@ public boolean getShowAromaticity() {
         }
     }
 
-    public Object getParameter() {
+    public double getScale() {
     	return this.getRendererModel().get(Scale.class);
     }
+
+    public void setScale(double scale) {
+    	this.getRendererModel().set(Scale.class,scale);
+    }
 
     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
@@ -101,6 +101,7 @@
 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.BasicSceneGenerator.Scale;
 import org.openscience.cdk.renderer.generators.ExternalHighlightGenerator;
 import org.openscience.cdk.renderer.generators.HighlightAtomGenerator.HighlightAtomShapeFilled;
 import org.openscience.cdk.renderer.generators.HighlightAtomGenerator.HoverOverColor;
@@ -580,6 +581,8 @@ public void reset() {
                                                               clientRect.width,
                                                               clientRect.height);
             getRenderer().setup( hub.getIChemModel(), rect );
+            if(ChemModelManipulator.getAtomCount(hub.getIChemModel())<2)
+            	getRenderer2DModel().set(Scale.class,28d);
             resizeControl();
         }
     }