Revision: 20624
http://sourceforge.net/p/jmol/code/20624
Author: hansonr
Date: 2015-07-03 17:54:59 +0000 (Fri, 03 Jul 2015)
Log Message:
-----------
Jmol.___JmolVersion="14.3.15_2015.07.03"
bug fix: mmCIF reader does not recognize load model
bug fix: load MODELS "" [1 3 4] does not work
Modified Paths:
--------------
trunk/Jmol/src/org/jmol/script/ScriptEval.java
Modified: trunk/Jmol/src/org/jmol/script/ScriptEval.java
===================================================================
--- trunk/Jmol/src/org/jmol/script/ScriptEval.java 2015-07-03 17:33:23 UTC
(rev 20623)
+++ trunk/Jmol/src/org/jmol/script/ScriptEval.java 2015-07-03 17:54:59 UTC
(rev 20624)
@@ -4226,7 +4226,8 @@
htParams.put("fileData", strModel);
htParams.put("isData", Boolean.TRUE);
//note: ScriptCompiler will remove an initial \n if present
- loadScript.appendC('\n').append(strModel).append(" end
").append(PT.esc(key));
+ loadScript.appendC('\n').append(strModel).append(" end ")
+ .append(PT.esc(key));
if (ptVar < 0)
i += 2; // skip END "key"
break;
@@ -4320,12 +4321,16 @@
htParams.put("firstLastStep", new int[] { (int) pt.x, (int) pt.y,
(int) pt.z });
loadScript.append(" " + Escape.eP(pt));
- } else if (tokAt(i) == T.bitset) {
- bsModels = (BS) getToken(i++).value;
- htParams.put("bsModels", bsModels);
- loadScript.append(" " + Escape.eBS(bsModels));
} else {
- htParams.put("firstLastStep", new int[] { 0, -1, 1 });
+ switch (tokAt(i)) {
+ case T.bitset:
+ bsModels = (BS) getToken(i++).value;
+ htParams.put("bsModels", bsModels);
+ loadScript.append(" " + Escape.eBS(bsModels));
+ break;
+ default:
+ htParams.put("firstLastStep", new int[] { 0, -1, 1 });
+ }
}
break;
case T.identifier:
@@ -4767,12 +4772,14 @@
case T.varray:
case T.leftsquare:
case T.spacebeforesquare:
+ System.out.println(sOptions);
float[] data = floatParameterSet(i, 1, Integer.MAX_VALUE);
i = iToken;
BS bs = new BS();
for (int j = 0; j < data.length; j++)
if (data[j] >= 1 && data[j] == (int) data[j])
bs.set((int) data[j] - 1);
+ htParams.remove("firstLastStep");
htParams.put("bsModels", bs);
int[] iArray = new int[bs.cardinality()];
for (int pt = 0, j = bs.nextSetBit(0); j >= 0; j = bs.nextSetBit(j + 1))
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
