Revision: 20642
http://sourceforge.net/p/jmol/code/20642
Author: hansonr
Date: 2015-07-07 21:31:01 +0000 (Tue, 07 Jul 2015)
Log Message:
-----------
Modified Paths:
--------------
trunk/Jmol/src/org/jmol/viewer/Jmol.properties
trunk/Jmol/src/org/jmol/viewer/PropertyManager.java
Modified: trunk/Jmol/src/org/jmol/viewer/Jmol.properties
===================================================================
--- trunk/Jmol/src/org/jmol/viewer/Jmol.properties 2015-07-07 18:34:37 UTC
(rev 20641)
+++ trunk/Jmol/src/org/jmol/viewer/Jmol.properties 2015-07-07 21:31:01 UTC
(rev 20642)
@@ -48,8 +48,12 @@
there is something wrong with JSmol and zoneDemo. Just slow? or
-Jmol.___JmolVersion="14.3.15_2015.07.07b"
+Jmol.___JmolVersion="14.3.15_2015.07.07c"
+bug fix: x.getProperty("[select name where composition[1] == 0.5]")
+
+JmolVersion="14.3.15_2015.07.07b"
+
bug fix: 2015.07.06 breaks text writing in JSmol
bug fix: Crystal reader cannot handle TOTAL ENERGY CORRECTED... line
Modified: trunk/Jmol/src/org/jmol/viewer/PropertyManager.java
===================================================================
--- trunk/Jmol/src/org/jmol/viewer/PropertyManager.java 2015-07-07 18:34:37 UTC
(rev 20641)
+++ trunk/Jmol/src/org/jmol/viewer/PropertyManager.java 2015-07-07 21:31:01 UTC
(rev 20642)
@@ -265,15 +265,15 @@
propertyName = fixSelectQuotes(propertyName);
while ((pt = lc.indexOf("[select ", ++pt)) >= 0) {
int pt2 = lc.indexOf(" where ", pt);
- int pt3 = lc.indexOf("]", pt2 + 1);
+ int pt3 = lc.lastIndexOf("]");
if (pt2 < 0 || pt2 > pt3)
continue;
propertyName = propertyName.substring(0, pt + 1)
+ propertyName.substring(pt + 1, pt3).replace('.',
'\1').replace('[', '\2').replace(']', '\3')
+ propertyName.substring(pt3);
}
- propertyName = propertyName.replace(']', '\0').replace('[', '\0')
- .replace('.', '\0').replace('\1', '.').replace('\2',
'[').replace('\3', ']');
+ propertyName = PT.rep(PT.rep(propertyName.replace(']', '\0').replace('[',
'\0'), "..", "\4")
+ .replace('.', '\0').replace('\1', '.').replace('\2',
'[').replace('\3', ']'),"\4","..");
propertyName = PT.rep(propertyName, "\0\0", "\0");
String[] names = PT.split(PT.trim(propertyName, "\0"), "\0");
SV[] args = new SV[names.length];
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Don't Limit Your Business. Reach for the Cloud.
GigeNET's Cloud Solutions provide you with the tools and support that
you need to offload your IT needs and focus on growing your business.
Configured For All Businesses. Start Your Cloud Today.
https://www.gigenetcloud.com/
_______________________________________________
Jmol-commits mailing list
Jmol-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jmol-commits
