Update show generator option with actual value when switching to the …

…headers tab in moleditor solves bug 3302
bioclipse · Sep 7, 2012 · 59a56d2 · 59a56d2
1 parent d17276f
commit 59a56d2
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/....bioclipse.cdk.ui.sdfeditor/src/net/bioclipse/cdk/ui/sdfeditor/editor/JCPCellPainter.java b/....bioclipse.cdk.ui.sdfeditor/src/net/bioclipse/cdk/ui/sdfeditor/editor/JCPCellPainter.java
@@ -72,7 +72,7 @@
 public class JCPCellPainter extends BackgroundPainter {
     public Logger logger = Logger.getLogger(JCPCellPainter.class );
 
-    private AtomContainerRenderer renderer;
+    AtomContainerRenderer renderer;
     private ChoiceGenerator extensionGenerator;
 
     private  IRenderer2DConfigurator renderer2DConfigurator;
@@ -222,7 +222,7 @@ public void paintCell( LayerCell cell, GC gc, Rectangle bounds,
 
     public boolean isUseExtensionGenerators() {
 
-        return useExtensionGenerators;
+        return extensionGenerator.getUse();
     }
 
     public void setUseExtensionGenerators( boolean useExtensionGenerators ) {

diff --git a/....ui.sdfeditor/src/net/bioclipse/cdk/ui/sdfeditor/editor/MultiPageMoleculesEditorPart.java b/....ui.sdfeditor/src/net/bioclipse/cdk/ui/sdfeditor/editor/MultiPageMoleculesEditorPart.java
@@ -64,6 +64,7 @@
 import org.eclipse.ui.handlers.IHandlerService;
 import org.eclipse.ui.part.MultiPageEditorPart;
 import org.openscience.cdk.Mapping;
+import org.openscience.cdk.renderer.IRenderer;
 
 public class MultiPageMoleculesEditorPart extends MultiPageEditorPart implements
                                                     ISelectionListener,
@@ -329,6 +330,8 @@ protected void pageChange( int newPageIndex ) {
                        moleculesPage.getContentProvider();
                ps.setInitialData( contentProvider.getProperties(),
                                   contentProvider.getAvailableProperties());
+               boolean useEx = moleculesPage.getMolTableViewer().cellPainter.isUseExtensionGenerators();
+               ps.setUseGenerators(useEx);
                break;
            case JCP:
                updateJCPPage();

diff --git a/...ioclipse.cdk.ui.sdfeditor/src/net/bioclipse/cdk/ui/sdfeditor/editor/PropertySelector.java b/...ioclipse.cdk.ui.sdfeditor/src/net/bioclipse/cdk/ui/sdfeditor/editor/PropertySelector.java
@@ -44,6 +44,7 @@ public PropertySelector(Composite parent, int style) {
 
     Button removeAll;
     Button addAll;
+	private Button generatorButton;
 
     private void createControl(Composite parent) {
 
@@ -98,7 +99,7 @@ private void createControl(Composite parent) {
         gridData.heightHint = 20;
         comp.setLayoutData( gridData );
 
-        final Button generatorButton = new Button(parent, SWT.CHECK);
+        generatorButton = new Button(parent, SWT.CHECK);
         generatorButton.setLayoutData( new GridData(SWT.FILL,SWT.BOTTOM,true,false) );
         generatorButton.setText( "Disable visualization ( eg. Metaprint2D, DS)" );
         generatorButton.setSelection( !useGenerators);
@@ -316,5 +317,9 @@ public boolean isUseGenerators() {
         return useGenerators;
     }
 
+    public void setUseGenerators(boolean value) {
+    	useGenerators = value;
+    	generatorButton.setSelection(!useGenerators);
+    }
 
 }