[Jmol-commits] SF.net SVN: jmol:[17923] branches/v13_0/Jmol/src/org/jmol/viewer

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

Revision: 17923
          http://jmol.svn.sourceforge.net/jmol/?rev=17923&view=rev
Author:   hansonr
Date:     2013-02-12 13:15:57 +0000 (Tue, 12 Feb 2013)
Log Message:
-----------
___version=13.0.13_dev

bug fix: set picking IDENT when picking is already ident can cancel a pending measurement

Modified Paths:
--------------
    branches/v13_0/Jmol/src/org/jmol/viewer/ActionManager.java
    branches/v13_0/Jmol/src/org/jmol/viewer/Jmol.properties

Modified: branches/v13_0/Jmol/src/org/jmol/viewer/ActionManager.java
===================================================================
--- branches/v13_0/Jmol/src/org/jmol/viewer/ActionManager.java	2013-02-12 12:57:13 UTC (rev 17922)
+++ branches/v13_0/Jmol/src/org/jmol/viewer/ActionManager.java	2013-02-12 13:15:57 UTC (rev 17923)
@@ -1560,8 +1560,10 @@
   }
     
   void setPickingMode(int pickingMode) {
+    boolean isNew = false;
     switch (pickingMode) {
     case -1: // from  set modelkit OFF
+      isNew = true;
       bondPickingMode = PICKING_IDENTIFY_BOND;
       pickingMode = PICKING_IDENTIFY;
       break;
@@ -1572,14 +1574,17 @@
       bondPickingMode = pickingMode;
       return;
     case PICKING_DELETE_BOND:
+      isNew = true;
       bondPickingMode = pickingMode;
       if (viewer.getBondPicking())
         return;
       break;
       // if we have bondPicking mode, then we don't set atomPickingMode to this
     }
+    isNew |= (atomPickingMode != pickingMode);
     atomPickingMode = pickingMode;
-    resetMeasurement();
+    if (isNew)
+      resetMeasurement();
   }
 
   void setAtomPickingOption(String option) {

Modified: branches/v13_0/Jmol/src/org/jmol/viewer/Jmol.properties
===================================================================
--- branches/v13_0/Jmol/src/org/jmol/viewer/Jmol.properties	2013-02-12 12:57:13 UTC (rev 17922)
+++ branches/v13_0/Jmol/src/org/jmol/viewer/Jmol.properties	2013-02-12 13:15:57 UTC (rev 17923)
@@ -11,6 +11,7 @@
 
 ___version=13.0.13_dev
 
+bug fix: set picking IDENT when picking is already ident can cancel a pending measurement
 bug fix: applet does not refresh when mouse exits with pending measurement
 bug fix: signed applet file open dialog does not work
 bug fix: labels within fog should be hidden

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