From: <ha...@us...> - 2015-09-01 20:53:26
|
Revision: 20753 http://sourceforge.net/p/jmol/code/20753 Author: hansonr Date: 2015-09-01 20:53:24 +0000 (Tue, 01 Sep 2015) Log Message: ----------- Jmol.___JmolVersion="14.3.16_2015.08.31" bug fix: MOVE command with 0 time does not work Modified Paths: -------------- trunk/Jmol/src/org/jmol/thread/MoveToThread.java trunk/Jmol/src/org/jmol/viewer/Jmol.properties Modified: trunk/Jmol/src/org/jmol/thread/MoveToThread.java =================================================================== --- trunk/Jmol/src/org/jmol/thread/MoveToThread.java 2015-09-01 00:13:59 UTC (rev 20752) +++ trunk/Jmol/src/org/jmol/thread/MoveToThread.java 2015-09-01 20:53:24 UTC (rev 20753) @@ -138,12 +138,12 @@ */ private int setManagerMove(Object[] options) { // { dRot, dTrans, - // { + // [ // dZoom, // dSlab, // floatSecondsTotal, // fps - // } + // ] // } dRot = (V3) options[0]; @@ -251,10 +251,11 @@ mode = MAIN; break; case MAIN: - if (stopped || ++iStep >= totalSteps) { + if (stopped || iStep >= totalSteps) { mode = FINISH; break; } + iStep++; if (dRot.x != 0) transformManager.rotateXRadians(radiansXStep, null); if (dRot.y != 0) @@ -271,11 +272,15 @@ transformManager.translateToPercent('y', transY + dTrans.y * iStep / totalSteps); if (dTrans.z != 0) - transformManager.translateToPercent('z', /*transZ + */dTrans.z * iStep - / totalSteps); + transformManager.translateToPercent('z', /*transZ + */dTrans.z + * iStep / totalSteps); if (dSlab != 0) transformManager.slabToPercent((int) Math.floor(slab + dSlab * iStep / totalSteps)); + if (iStep == totalSteps) { + mode = FINISH; + break; + } int timeSpent = (int) (System.currentTimeMillis() - startTime); int timeAllowed = iStep * timePerStep; if (timeSpent < timeAllowed) { Modified: trunk/Jmol/src/org/jmol/viewer/Jmol.properties =================================================================== --- trunk/Jmol/src/org/jmol/viewer/Jmol.properties 2015-09-01 00:13:59 UTC (rev 20752) +++ trunk/Jmol/src/org/jmol/viewer/Jmol.properties 2015-09-01 20:53:24 UTC (rev 20753) @@ -61,6 +61,10 @@ Jmol.___JmolVersion="14.3.16_2015.08.31" +bug fix: MOVE command with 0 time does not work + +___JmolVersion="14.3.16_2015.08.31" + bug fix: plot property with nothing more throws Exception bug fix: Gaussian Dialog does not add final line ending when saving This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |