From: <ha...@us...> - 2012-01-22 05:22:26
|
Revision: 16676 http://jmol.svn.sourceforge.net/jmol/?rev=16676&view=rev Author: hansonr Date: 2012-01-22 05:22:19 +0000 (Sun, 22 Jan 2012) Log Message: ----------- version=12.2.13 # bug fix: bind xxx _select does not work in conjunction with bind yyy _atomPicking # bug fix: {*}.atomno and related expressions broken # bug fix: isosurface offset does not change boundbox or zoom/center points 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-01-22 04:11:05 UTC (rev 16675) +++ branches/v12_2/Jmol/src/org/jmol/viewer/ActionManager.java 2012-01-22 05:22:19 UTC (rev 16676) @@ -603,7 +603,7 @@ moved.modifiers |= Binding.CTRL; } int action = Binding.LEFT+Binding.SINGLE_CLICK+moved.modifiers; - if(!labelMode && !binding.isUserAction(action) && !isSelectAction(action)) + if(!labelMode && !binding.isUserAction(action) && !isSelectAction(action, true)) checkMotionRotateZoom(action, current.x, 0, 0, false); if (viewer.getNavigationMode()) { // if (viewer.getBooleanProperty("showKeyStrokes", false)) @@ -1366,7 +1366,7 @@ boolean isDragSelected = (dragSelectedMode && (isBound(action, ACTION_rotateSelected) || isBound(action, ACTION_dragSelected))); - if (isDragSelected || isSelectAction(action)) { + if (isDragSelected || isSelectAction(action, true)) { // TODO: in drawMode the binding changes if (tokType != Token.isosurface) atomOrPointPicked(nearestAtomIndex, nearestPoint, isDragSelected ? 0 : action); @@ -1380,9 +1380,9 @@ return (nearestAtomIndex >= 0); } - private boolean isSelectAction(int action) { - return (isBound(action, ACTION_pickAtom) - || isBound(action, ACTION_pickPoint) + private boolean isSelectAction(int action, boolean allowPick) { + return (allowPick && (isBound(action, ACTION_pickAtom) + || isBound(action, ACTION_pickPoint)) || isBound(action, ACTION_selectToggle) || isBound(action, ACTION_selectAndNot) || isBound(action, ACTION_selectOr) @@ -1554,11 +1554,11 @@ break; } } catch (InterruptedException ie) { - Logger.info("Timeout " + this + " interrupted"); + //Logger.info("Timeout " + this + " interrupted"); } catch (Exception ie) { Logger.info("Timeout " + name + " Exception: " + ie); } - System.out.println("timeout done:" + name); + //System.out.println("timeout done:" + name); timeouts.remove(name); } } @@ -1827,6 +1827,8 @@ case PICKING_IDENTIFY: if (isBound(action, ACTION_pickAtom)) viewer.setStatusAtomPicked(atomIndex, null); + if (isSelectAction(action, false)) + break; return; case PICKING_LABEL: if (isBound(action, ACTION_pickLabel)) { @@ -1885,6 +1887,7 @@ switch (atomPickingMode) { default: return; + case PICKING_IDENTIFY: case PICKING_SELECT_ATOM: applySelectStyle(spec, action); break; @@ -2059,6 +2062,7 @@ } int add(int action, int x, int y, long time) { + //System.out.println("ActionMan gesture add " + action + " " + x + " " + y + " " + time); this.action = action; getNode(ptNext).set(ptNext, x, y, time - time0); ptNext++; @@ -2076,6 +2080,7 @@ public float getSpeedPixelsPerMillisecond(int nPoints, int nPointsPrevious) { nPoints = getPointCount(nPoints, nPointsPrevious); + //System.out.println("ActionMan getSpeed " + nPoints + " " + nPointsPrevious); if (nPoints < 2) return 0; MotionPoint mp1 = getNode(ptNext - 1 - nPointsPrevious); Modified: branches/v12_2/Jmol/src/org/jmol/viewer/Jmol.properties =================================================================== --- branches/v12_2/Jmol/src/org/jmol/viewer/Jmol.properties 2012-01-22 04:11:05 UTC (rev 16675) +++ branches/v12_2/Jmol/src/org/jmol/viewer/Jmol.properties 2012-01-22 05:22:19 UTC (rev 16676) @@ -4,6 +4,7 @@ version=12.2.13 +# bug fix: bind xxx _select does not work in conjunction with bind yyy _atomPicking # bug fix: {*}.atomno and related expressions broken # bug fix: isosurface offset does not change boundbox or zoom/center points This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |