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

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

Revision: 16948
          http://jmol.svn.sourceforge.net/jmol/?rev=16948&view=rev
Author:   hansonr
Date:     2012-03-30 16:13:40 +0000 (Fri, 30 Mar 2012)
Log Message:
-----------
12.2.19 VERSION

# bug fix: set dragSelected disallows popup menu
# bug fix: MOPAC (PUBLIC DOMAIN) output reader can fail on reading vibrations
# bug fix: Spartan 10 archives have .gz and .carc files. This fix adds .gz reading;
#          work-around is that Spartan 10 allows saving of Archive without carc compression,
#          which is a proprietary format. From Wavefunction:
#          "If you want all files to use the "text" version, you can go to the
#           Options->Preferences->X-Platform pane and make sure "Use Binary Archive" is unchecked."  
# bug fix: rotateSelected of models that have had dots at one point retrieved from a state file fails
# bug fix: Jmol defaults not being loaded with startup option -n (no display)
# bug fix: UIManager.setLookAndFeel(UIManager.getCrossPlatformLookAndFeelClassName()
#            failed for non-graphics system, and even though it is an exception, it
#            isn't trapped by try/catch. 
# bug fix: point() function does not accept 3x1 array
# bug fix: show x where x is a matrix does not have ',' before tabs, so it can't be clipped directly
#            back into Jmol

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

Modified: branches/v12_2/Jmol/src/org/jmol/viewer/ActionManager.java
===================================================================
--- branches/v12_2/Jmol/src/org/jmol/viewer/ActionManager.java	2012-03-29 16:04:21 UTC (rev 16947)
+++ branches/v12_2/Jmol/src/org/jmol/viewer/ActionManager.java	2012-03-30 16:13:40 UTC (rev 16948)
@@ -776,6 +776,17 @@
         }
         return;
       }
+      if (isBound(action, ACTION_popupMenu)) {
+        char type = 'j';
+        if (viewer.getModelkitMode()) {
+          Map<String, Object> t = viewer.checkObjectClicked(x, y, Binding.getMouseAction(1,
+              Binding.LEFT));
+          type = (t != null && "bond".equals(t.get("type")) ? 'b' : viewer
+              .findNearestAtomIndex(x, y) >= 0 ? 'a' : 'm');
+        }
+        viewer.popupMenu(x, y, type);
+        return;
+      }
       if (dragSelectedMode) {
         haveSelection = true;
         if (isSelectAndDrag) {
@@ -789,17 +800,6 @@
               Integer.MIN_VALUE, Integer.MIN_VALUE, null, false, false);
         return;
       }
-      if (isBound(action, ACTION_popupMenu)) {
-        char type = 'j';
-        if (viewer.getModelkitMode()) {
-          Map<String, Object> t = viewer.checkObjectClicked(x, y, Binding.getMouseAction(1,
-              Binding.LEFT));
-          type = (t != null && "bond".equals(t.get("type")) ? 'b' : viewer
-              .findNearestAtomIndex(x, y) >= 0 ? 'a' : 'm');
-        }
-        viewer.popupMenu(x, y, type);
-        return;
-      }
       if (viewer.useArcBall())
         viewer.rotateArcBall(x, y, 0);
       checkMotionRotateZoom(action, x, 0, 0, true);

Modified: branches/v12_2/Jmol/src/org/jmol/viewer/Jmol.properties
===================================================================
--- branches/v12_2/Jmol/src/org/jmol/viewer/Jmol.properties	2012-03-29 16:04:21 UTC (rev 16947)
+++ branches/v12_2/Jmol/src/org/jmol/viewer/Jmol.properties	2012-03-30 16:13:40 UTC (rev 16948)
@@ -4,6 +4,7 @@
 
 version=12.2.19
 
+# bug fix: set dragSelected disallows popup menu
 # bug fix: MOPAC (PUBLIC DOMAIN) output reader can fail on reading vibrations
 # bug fix: Spartan 10 archives have .gz and .carc files. This fix adds .gz reading;
 #          work-around is that Spartan 10 allows saving of Archive without carc compression,

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