From: <ha...@us...> - 2014-02-19 13:39:24
|
Revision: 19354 http://sourceforge.net/p/jmol/code/19354 Author: hansonr Date: 2014-02-19 13:39:17 +0000 (Wed, 19 Feb 2014) Log Message: ----------- ___JmolVersion="14.1.10_dev_2014.02.19" bug fix: zap <model Number> or zap {atom expression} broken -- does not affect ZAP command without parameters Modified Paths: -------------- trunk/Jmol/src/org/jmol/modelset/ModelCollection.java trunk/Jmol/src/org/jmol/viewer/Jmol.properties trunk/Jmol/src/org/jmol/viewer/Viewer.java Modified: trunk/Jmol/src/org/jmol/modelset/ModelCollection.java =================================================================== --- trunk/Jmol/src/org/jmol/modelset/ModelCollection.java 2014-02-19 02:01:03 UTC (rev 19353) +++ trunk/Jmol/src/org/jmol/modelset/ModelCollection.java 2014-02-19 13:39:17 UTC (rev 19354) @@ -2808,7 +2808,7 @@ // set to recreate bounding box deleteModelAtoms(firstAtomIndex, nAtoms, bsAtoms); - viewer.deleteModelAtoms(firstAtomIndex, nAtoms, bsAtoms); + viewer.deleteModelAtoms(modelIndex, firstAtomIndex, nAtoms, bsAtoms); } @SuppressWarnings("unchecked") Modified: trunk/Jmol/src/org/jmol/viewer/Jmol.properties =================================================================== --- trunk/Jmol/src/org/jmol/viewer/Jmol.properties 2014-02-19 02:01:03 UTC (rev 19353) +++ trunk/Jmol/src/org/jmol/viewer/Jmol.properties 2014-02-19 13:39:17 UTC (rev 19354) @@ -11,8 +11,13 @@ # The quotes above look odd for a parameter file, but they are # important for the JavaScript version of Jmol. +___JmolVersion="14.1.10_dev_2014.02.19" -___JmolVersion="14.1.9_2014.02.18" +bug fix: zap <model Number> or zap {atom expression} broken + -- does not affect ZAP command without parameters + +JmolVersion="14.1.9" +JmolVersion="14.1.9_2014.02.18" bug fix: recently released 14.0.8 introduced a math bug that caused y = "test" + x.f() to be evaluated as ("test" + x).f() @@ -32,21 +37,16 @@ JmolVersion="14.1.8_2014.02.17" - -- note I am leaving version as 14.1.8 here but updating the date - bug fix: JSpecView issues with navigating through spectra bug fix: PyMOL reader multiple bond view bug fix: popup menu fixes bug fix: bond/draw/isosurface picking broken bug fix: [1 -5 6 -2] gives [1 (-5+6-2)] instead of [1 -5 6 -2] -JmolVersion="14.1.8" - bug fix: set defaultLoadScript "{0 0 0}" actually sets that to {1 1 1} -- goes way way back to early Jmol math where there were no point-type variables bug fix: PyMOL reader update for Version 1700 lacking setting 83. bug fix: -m option not working with Jmol.jar -feature change: IDTF exporter now calling media9 rather than movie15 in accompanying TeX file bug fix: PNGJ files within ZIP collections not being read. -- full PNGJ models can be extracted from MS Word .docx files. Modified: trunk/Jmol/src/org/jmol/viewer/Viewer.java =================================================================== --- trunk/Jmol/src/org/jmol/viewer/Viewer.java 2014-02-19 02:01:03 UTC (rev 19353) +++ trunk/Jmol/src/org/jmol/viewer/Viewer.java 2014-02-19 13:39:17 UTC (rev 19354) @@ -9046,9 +9046,8 @@ statusManager.modifySend(-1, modelIndex, -2, "OK"); } - public void deleteModelAtoms(int firstAtomIndex, int nAtoms, BS bsDeleted) { + public void deleteModelAtoms(int modelIndex, int firstAtomIndex, int nAtoms, BS bsDeleted) { // called from ModelCollection.deleteModel - int modelIndex = getAtomModelIndex(firstAtomIndex); statusManager.modifySend(-1, modelIndex, 1, "delete atoms " + Escape.eBS(bsDeleted)); selectionManager.deleteModelAtoms(bsDeleted); BSUtil.deleteBits(getFrameOffsets(), bsDeleted); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |