[Jmol-commits] SF.net SVN: jmol:[16622] trunk/Jmol/src/org

[<ha...@us...>]

Revision: 16622
          http://jmol.svn.sourceforge.net/jmol/?rev=16622&view=rev
Author:   hansonr
Date:     2011-12-21 19:25:39 +0000 (Wed, 21 Dec 2011)
Log Message:
-----------
version=12.3.11_dev

# bug fix: (Application) proper Edit...Preferences dialog action

Modified Paths:
--------------
    trunk/Jmol/src/org/jmol/script/ScriptEvaluator.java
    trunk/Jmol/src/org/jmol/viewer/Jmol.properties
    trunk/Jmol/src/org/openscience/jmol/app/jmolpanel/PreferencesDialog.java

Modified: trunk/Jmol/src/org/jmol/script/ScriptEvaluator.java
===================================================================
--- trunk/Jmol/src/org/jmol/script/ScriptEvaluator.java	2011-12-21 18:50:27 UTC (rev 16621)
+++ trunk/Jmol/src/org/jmol/script/ScriptEvaluator.java	2011-12-21 19:25:39 UTC (rev 16622)
@@ -7144,7 +7144,8 @@
      */
 
     if (statementLength == 1) {
-      viewer.rebond();
+      if (!isSyntaxCheck)
+        viewer.rebond();
       return;
     }
 

Modified: trunk/Jmol/src/org/jmol/viewer/Jmol.properties
===================================================================
--- trunk/Jmol/src/org/jmol/viewer/Jmol.properties	2011-12-21 18:50:27 UTC (rev 16621)
+++ trunk/Jmol/src/org/jmol/viewer/Jmol.properties	2011-12-21 19:25:39 UTC (rev 16622)
@@ -3,6 +3,8 @@
 
 version=12.3.11_dev
 
+# bug fix: (Application) proper Edit...Preferences dialog action
+
 # =============================================================================
 
 #version=12.3.10

Modified: trunk/Jmol/src/org/openscience/jmol/app/jmolpanel/PreferencesDialog.java
===================================================================
--- trunk/Jmol/src/org/openscience/jmol/app/jmolpanel/PreferencesDialog.java	2011-12-21 18:50:27 UTC (rev 16621)
+++ trunk/Jmol/src/org/openscience/jmol/app/jmolpanel/PreferencesDialog.java	2011-12-21 19:25:39 UTC (rev 16622)
@@ -108,7 +108,7 @@
     "showAxes",                       "false",
     "showBoundingBox",                "false",
     "axesOrientationRasmol",          "false",
-	"openFilePreview",                "true",
+	  "openFilePreview",                "true",
     "percentVdwAtom",                 "23",
     "autoBond",                       "true",
     "marBond",                        "150",
@@ -170,9 +170,9 @@
     rasmolDefaultsButton.addActionListener(this);
     buttonPanel.add(rasmolDefaultsButton);
 
-    cancelButton = new JButton(GT._("Cancel"));
-    cancelButton.addActionListener(this);
-    buttonPanel.add(cancelButton);
+    //cancelButton = new JButton(GT._("Cancel"));
+    //cancelButton.addActionListener(this);
+    //buttonPanel.add(cancelButton);
 
     applyButton = new JButton(GT._("Apply"));
     applyButton.addActionListener(this);
@@ -315,11 +315,7 @@
     vdwPercentSlider.addChangeListener(new ChangeListener() {
 
       public void stateChanged(ChangeEvent e) {
-
-        JSlider source = (JSlider) e.getSource();
-        percentVdwAtom = source.getValue();
-        viewer.setIntProperty("PercentVdwAtom", percentVdwAtom);
-        currentProperties.put("percentVdwAtom", "" + percentVdwAtom);
+        rebond();
       }
     });
     sfPanel.add(vdwPercentSlider, BorderLayout.CENTER);
@@ -414,11 +410,7 @@
     bwSlider.addChangeListener(new ChangeListener() {
 
       public void stateChanged(ChangeEvent e) {
-
-        JSlider source = (JSlider) e.getSource();
-        marBond = (short)source.getValue();
-        viewer.setIntProperty("bondRadiusMilliAngstroms", marBond);
-        currentProperties.put("marBond", "" + marBond);
+        rebond();
       }
     });
 
@@ -460,12 +452,7 @@
     btSlider.addChangeListener(new ChangeListener() {
 
       public void stateChanged(ChangeEvent e) {
-
-        JSlider source = (JSlider) e.getSource();
-        bondTolerance = source.getValue() / 100f;
-        viewer.setFloatProperty("bondTolerance", bondTolerance);
-        currentProperties.put("bondTolerance", "" + bondTolerance);
-        viewer.rebond();
+        rebond();
       }
     });
     btPanel.add(btSlider);
@@ -504,14 +491,8 @@
     bdSlider.setLabelTable(labelTable);
 
     bdSlider.addChangeListener(new ChangeListener() {
-
       public void stateChanged(ChangeEvent e) {
-
-        JSlider source = (JSlider) e.getSource();
-        minBondDistance = source.getValue() / 100f;
-        viewer.setFloatProperty("minBondDistance", minBondDistance);
-        currentProperties.put("minBondDistance", "" + minBondDistance);
-        viewer.rebond();
+        rebond();
       }
     });
     bdPanel.add(bdSlider);
@@ -571,6 +552,12 @@
 
   }
 
+  private void apply() {
+    rebond();
+    save();
+    viewer.refresh(3, "PreferencesDialog:apply()");
+  }
+
   private void save() {
     try {
       FileOutputStream fileOutputStream =
@@ -580,7 +567,6 @@
     } catch (Exception e) {
       Logger.error("Error saving preferences", e);
     }
-    viewer.refresh(3, "PreferencesDialog:save()");
   }
 
   void initializeProperties() {
@@ -610,6 +596,27 @@
     updateComponents();
   }
 
+  void rebond() {
+    percentVdwAtom = vdwPercentSlider.getValue();
+    viewer.setIntProperty("PercentVdwAtom", percentVdwAtom);
+    currentProperties.put("percentVdwAtom", "" + percentVdwAtom);
+
+    bondTolerance = btSlider.getValue() / 100f;
+    viewer.setFloatProperty("bondTolerance", bondTolerance);
+    currentProperties.put("bondTolerance", "" + bondTolerance);
+    
+    minBondDistance = bdSlider.getValue() / 100f;
+    viewer.setFloatProperty("minBondDistance", minBondDistance);
+    currentProperties.put("minBondDistance", "" + minBondDistance);
+    
+    marBond = (short)bwSlider.getValue();
+    viewer.setIntProperty("bondRadiusMilliAngstroms", marBond);
+    currentProperties.put("marBond", "" + marBond);
+    
+    viewer.rebond();
+    viewer.refresh(3, "PreferencesDialog:rebond()");
+  }
+  
   void initVariables() {
 
     autoBond = Boolean.getBoolean("autoBond");
@@ -729,7 +736,7 @@
   
   public void actionPerformed(ActionEvent event) {
     if (event.getSource() == applyButton) {
-      save();
+      apply();
     } else if (event.getSource() == jmolDefaultsButton) {
       resetDefaults(null);
     } else if (event.getSource() == rasmolDefaultsButton) {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.