[Jmol-commits] SF.net SVN: jmol:[14554] trunk/Jmol/src/org/jmol/viewer/ActionManager.java

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

Revision: 14554
          http://jmol.svn.sourceforge.net/jmol/?rev=14554&view=rev
Author:   hansonr
Date:     2010-10-31 09:39:10 +0000 (Sun, 31 Oct 2010)

Log Message:
-----------
version=12.1.17_dev

# bug fix: set picking measure SEQUENCE not reporting to application console
# bug fix: (application only) distance picking not being reported in console
# bug fix: set picking chain, then mouse click does not report number of atoms selected

Modified Paths:
--------------
    trunk/Jmol/src/org/jmol/viewer/ActionManager.java

Modified: trunk/Jmol/src/org/jmol/viewer/ActionManager.java
===================================================================
--- trunk/Jmol/src/org/jmol/viewer/ActionManager.java	2010-10-31 09:38:48 UTC (rev 14553)
+++ trunk/Jmol/src/org/jmol/viewer/ActionManager.java	2010-10-31 09:39:10 UTC (rev 14554)
@@ -1769,11 +1769,12 @@
         resetMeasurement();
       if (queueAtom(atomIndex, ptClicked) < n)
         return;
-      if (atomPickingMode == PICKING_MEASURE_SEQUENCE)
+      if (atomPickingMode == PICKING_MEASURE_SEQUENCE) {
         getSequence();
-      else
-        viewer.setStatusMeasuring("measurePicked", n, measurementQueued
-            .getStringDetail(), measurementQueued.getValue());
+        return;
+      }
+      viewer.setStatusMeasuring("measurePicked", n, measurementQueued
+          .getStringDetail(), measurementQueued.getValue());
       if (atomPickingMode == PICKING_MEASURE
           || pickingStyleMeasure == PICKINGSTYLE_MEASURE_ON) {
         viewer.script("measure "
@@ -1781,7 +1782,9 @@
       }
       return;
     }
-    int mode = (measurementPending != null && atomPickingMode != PICKING_IDENTIFY ? PICKING_IDENTIFY : atomPickingMode);
+    int mode = (measurementPending != null
+        && atomPickingMode != PICKING_IDENTIFY ? PICKING_IDENTIFY
+        : atomPickingMode);
     switch (mode) {
     case PICKING_CENTER:
       if (!isBound(action, ACTION_pickAtom))


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