From: <ha...@us...> - 2012-03-30 16:14:24
|
Revision: 16949 http://jmol.svn.sourceforge.net/jmol/?rev=16949&view=rev Author: hansonr Date: 2012-03-30 16:14:14 +0000 (Fri, 30 Mar 2012) Log Message: ----------- 12.3.19 VERSION # bug fix: set dragSelected disallows popup menu # new feature: select baseModel for JSpecView # new feature; model {atomset} -- model of first atom in this set # 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 # code: refactored org.jmol.g3d.[Normix3d,Shade3D] --> org.jmol.util.[Normix, Shader] # code: refactored org.jmol.geodesic.Geodesic --> org.jmol.util.Geodesic # 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 # code: better coding for quaternions Modified Paths: -------------- trunk/Jmol/src/org/jmol/g3d/Font3D.java trunk/Jmol/src/org/jmol/viewer/ActionManager.java trunk/Jmol/src/org/jmol/viewer/Jmol.properties Modified: trunk/Jmol/src/org/jmol/g3d/Font3D.java =================================================================== --- trunk/Jmol/src/org/jmol/g3d/Font3D.java 2012-03-30 16:13:40 UTC (rev 16948) +++ trunk/Jmol/src/org/jmol/g3d/Font3D.java 2012-03-30 16:14:14 UTC (rev 16949) @@ -89,19 +89,6 @@ if (fontkey == fontkeys[i] && font3ds[i].fontSizeNominal == fontsizeNominal) return font3ds[i]; - /* - return allocFont3D(fontkey, fontface, fontstyle, fontsize, - fontsizeNominal, platform); - } - - private static synchronized Font3D allocFont3D(int fontkey, int fontface, - int fontstyle, float fontsize, float fontsizeNominal, - Platform3D platform) { - // recheck in case another process just allocated one - for (int i = fontkeyCount; --i > 0; ) - if (fontkey == fontkeys[i] && font3ds[i].fontSizeNominal == fontsizeNominal) - return font3ds[i]; - */ int fontIndexNext = fontkeyCount++; if (fontIndexNext == fontkeys.length) { int[] t0 = new int[fontIndexNext + FONT_ALLOCATION_UNIT]; Modified: trunk/Jmol/src/org/jmol/viewer/ActionManager.java =================================================================== --- trunk/Jmol/src/org/jmol/viewer/ActionManager.java 2012-03-30 16:13:40 UTC (rev 16948) +++ trunk/Jmol/src/org/jmol/viewer/ActionManager.java 2012-03-30 16:14:14 UTC (rev 16949) @@ -779,6 +779,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) { @@ -792,17 +803,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: trunk/Jmol/src/org/jmol/viewer/Jmol.properties =================================================================== --- trunk/Jmol/src/org/jmol/viewer/Jmol.properties 2012-03-30 16:13:40 UTC (rev 16948) +++ trunk/Jmol/src/org/jmol/viewer/Jmol.properties 2012-03-30 16:14:14 UTC (rev 16949) @@ -3,6 +3,7 @@ version=12.3.19 +# bug fix: set dragSelected disallows popup menu # new feature: select baseModel for JSpecView # new feature; model {atomset} -- model of first atom in this set # bug fix: MOPAC (PUBLIC DOMAIN) output reader can fail on reading vibrations This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |