Revision: 20867
http://sourceforge.net/p/jmol/code/20867
Author: hansonr
Date: 2015-11-25 23:47:58 +0000 (Wed, 25 Nov 2015)
Log Message:
-----------
Jmol.___JmolVersion="14.4.0_2015.11.25"
bug fix: draw ARC|ARROW|CURVE|LINE|VERTICES @x where x is an array does not work
Modified Paths:
--------------
branches/v14_4/Jmol/src/org/jmol/scriptext/IsoExt.java
branches/v14_4/Jmol/src/org/jmol/shapespecial/Draw.java
branches/v14_4/Jmol/src/org/jmol/viewer/Jmol.properties
trunk/Jmol/src/org/jmol/scriptext/IsoExt.java
trunk/Jmol/src/org/jmol/shapespecial/Draw.java
trunk/Jmol/src/org/jmol/viewer/Jmol.properties
Modified: branches/v14_4/Jmol/src/org/jmol/scriptext/IsoExt.java
===================================================================
--- branches/v14_4/Jmol/src/org/jmol/scriptext/IsoExt.java 2015-11-18
15:29:04 UTC (rev 20866)
+++ branches/v14_4/Jmol/src/org/jmol/scriptext/IsoExt.java 2015-11-25
23:47:58 UTC (rev 20867)
@@ -294,6 +294,7 @@
boolean isWild = (idSeen && getShapeProperty(JC.SHAPE_DRAW, "ID") == null);
int[] connections = null;
int iConnect = 0;
+ int iArray = -1;
for (int i = eval.iToken; i < slen; ++i) {
String propertyName = null;
Object propertyValue = null;
@@ -535,9 +536,9 @@
havePoints = true;
break;
case T.varray:
- propertyName = "modelBasedPoints";
+ havePoints = true;
+ propertyName = (iArray == i ? "coords" : "modelBasedPoints");
propertyValue = eval.theToken.value;
- havePoints = true;
break;
case T.spacebeforesquare:
case T.comma:
@@ -634,25 +635,30 @@
case T.line:
propertyName = "line";
propertyValue = Boolean.TRUE;
+ iArray = i + 1;
break;
case T.curve:
propertyName = "curve";
+ iArray = i + 1;
break;
case T.arc:
propertyName = "arc";
+ iArray = i + 1;
break;
case T.arrow:
propertyName = "arrow";
+ iArray = i + 1;
break;
+ case T.vertices:
+ propertyName = "vertices";
+ iArray = i + 1;
+ break;
case T.circle:
propertyName = "circle";
break;
case T.cylinder:
propertyName = "cylinder";
break;
- case T.vertices:
- propertyName = "vertices";
- break;
case T.nohead:
propertyName = "nohead";
break;
Modified: branches/v14_4/Jmol/src/org/jmol/shapespecial/Draw.java
===================================================================
--- branches/v14_4/Jmol/src/org/jmol/shapespecial/Draw.java 2015-11-18
15:29:04 UTC (rev 20866)
+++ branches/v14_4/Jmol/src/org/jmol/shapespecial/Draw.java 2015-11-25
23:47:58 UTC (rev 20867)
@@ -357,6 +357,13 @@
modelInfo[1]++; // counts vertices
return;
}
+
+ if ("coords" == propertyName) {
+ Lst<SV> pts = (Lst<SV>) value;
+ for (int i = 0, n = pts.size(); i < n; i++)
+ vData.addLast(new Object[] { Integer.valueOf(PT_COORD),
SV.ptValue(pts.get(i)) });
+ return;
+ }
if ("offset" == propertyName) {
offset = V3.newV((P3) value);
Modified: branches/v14_4/Jmol/src/org/jmol/viewer/Jmol.properties
===================================================================
--- branches/v14_4/Jmol/src/org/jmol/viewer/Jmol.properties 2015-11-18
15:29:04 UTC (rev 20866)
+++ branches/v14_4/Jmol/src/org/jmol/viewer/Jmol.properties 2015-11-25
23:47:58 UTC (rev 20867)
@@ -8,8 +8,12 @@
# see also http://chemapps.stolaf.edu/jmol/zip for daily updates
-Jmol.___JmolVersion="14.4.0_2015.11.18"
+Jmol.___JmolVersion="14.4.0_2015.11.25"
+bug fix: draw ARC|ARROW|CURVE|LINE|VERTICES @x where x is an array does not
work
+
+JmolVersion="14.4.0_2015.11.18"
+
bug fix: loading mmCIF files where label_asym_id != auth_asym_id will apply
biomolecule symmetry to wrong chain
JmolVersion="14.4.0_2015.11.13"
Modified: trunk/Jmol/src/org/jmol/scriptext/IsoExt.java
===================================================================
--- trunk/Jmol/src/org/jmol/scriptext/IsoExt.java 2015-11-18 15:29:04 UTC
(rev 20866)
+++ trunk/Jmol/src/org/jmol/scriptext/IsoExt.java 2015-11-25 23:47:58 UTC
(rev 20867)
@@ -294,6 +294,7 @@
boolean isWild = (idSeen && getShapeProperty(JC.SHAPE_DRAW, "ID") == null);
int[] connections = null;
int iConnect = 0;
+ int iArray = -1;
for (int i = eval.iToken; i < slen; ++i) {
String propertyName = null;
Object propertyValue = null;
@@ -535,9 +536,9 @@
havePoints = true;
break;
case T.varray:
- propertyName = "modelBasedPoints";
+ havePoints = true;
+ propertyName = (iArray == i ? "coords" : "modelBasedPoints");
propertyValue = eval.theToken.value;
- havePoints = true;
break;
case T.spacebeforesquare:
case T.comma:
@@ -634,25 +635,30 @@
case T.line:
propertyName = "line";
propertyValue = Boolean.TRUE;
+ iArray = i + 1;
break;
case T.curve:
propertyName = "curve";
+ iArray = i + 1;
break;
case T.arc:
propertyName = "arc";
+ iArray = i + 1;
break;
case T.arrow:
propertyName = "arrow";
+ iArray = i + 1;
break;
+ case T.vertices:
+ propertyName = "vertices";
+ iArray = i + 1;
+ break;
case T.circle:
propertyName = "circle";
break;
case T.cylinder:
propertyName = "cylinder";
break;
- case T.vertices:
- propertyName = "vertices";
- break;
case T.nohead:
propertyName = "nohead";
break;
Modified: trunk/Jmol/src/org/jmol/shapespecial/Draw.java
===================================================================
--- trunk/Jmol/src/org/jmol/shapespecial/Draw.java 2015-11-18 15:29:04 UTC
(rev 20866)
+++ trunk/Jmol/src/org/jmol/shapespecial/Draw.java 2015-11-25 23:47:58 UTC
(rev 20867)
@@ -358,6 +358,13 @@
return;
}
+ if ("coords" == propertyName) {
+ Lst<SV> pts = (Lst<SV>) value;
+ for (int i = 0, n = pts.size(); i < n; i++)
+ vData.addLast(new Object[] { Integer.valueOf(PT_COORD),
SV.ptValue(pts.get(i)) });
+ return;
+ }
+
if ("offset" == propertyName) {
offset = V3.newV((P3) value);
if (thisMesh != null)
Modified: trunk/Jmol/src/org/jmol/viewer/Jmol.properties
===================================================================
--- trunk/Jmol/src/org/jmol/viewer/Jmol.properties 2015-11-18 15:29:04 UTC
(rev 20866)
+++ trunk/Jmol/src/org/jmol/viewer/Jmol.properties 2015-11-25 23:47:58 UTC
(rev 20867)
@@ -62,8 +62,12 @@
TODO: consider if models with no atoms will cause issues in relation to
model.firstAtomIndex
-Jmol.___JmolVersion="14.5.0_2015.11.18"
+Jmol.___JmolVersion="14.5.0_2015.11.25"
+bug fix: draw ARC|ARROW|CURVE|LINE|VERTICES @x where x is an array does not
work
+
+JmolVersion="14.5.0_2015.11.18"
+
bug fix: loading mmCIF files where label_asym_id != auth_asym_id will apply
biomolecule symmetry to wrong chain
JmolVersion="14.5.0_2015.11.13"
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Go from Idea to Many App Stores Faster with Intel(R) XDK
Give your users amazing mobile app experiences with Intel(R) XDK.
Use one codebase in this all-in-one HTML5 development environment.
Design, debug & build mobile apps & 2D/3D high-impact games for multiple OSs.
http://pubads.g.doubleclick.net/gampad/clk?id=254741551&iu=/4140
_______________________________________________
Jmol-commits mailing list
Jmol-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jmol-commits
