Revision: 20442
http://sourceforge.net/p/jmol/code/20442
Author: hansonr
Date: 2015-04-08 18:15:24 +0000 (Wed, 08 Apr 2015)
Log Message:
-----------
Jmol.___JmolVersion="14.3.13_2015.04.08"
bug fix: echo id myecho "testing" reports "myecho" instead of "testing"
Modified Paths:
--------------
branches/v14_2/Jmol/src/org/jmol/script/ScriptEval.java
branches/v14_2/Jmol/src/org/jmol/viewer/Jmol.properties
Modified: branches/v14_2/Jmol/src/org/jmol/script/ScriptEval.java
===================================================================
--- branches/v14_2/Jmol/src/org/jmol/script/ScriptEval.java 2015-04-08
18:15:09 UTC (rev 20441)
+++ branches/v14_2/Jmol/src/org/jmol/script/ScriptEval.java 2015-04-08
18:15:24 UTC (rev 20442)
@@ -7164,6 +7164,24 @@
invArg();
pt = iToken + 1;
break;
+ case T.image:
+ pt++;
+ //$FALL-THROUGH$
+ case T.string:
+ boolean isImage = (theTok != T.string);
+ checkLength(pt--);
+ if (!isImage) {
+ cmdEcho(pt);
+ return;
+ }
+ if (id == null) {
+ String[] data = new String[1];
+ getShapePropertyData(JC.SHAPE_ECHO, "currentTarget", data);
+ id = data[0];
+ }
+ if (!chk && vwr.ms.getEchoStateActive())
+ vwr.fm.loadImage(getToken(pt).value, id);
+ return;
case T.integer:
// x y without brackets
int posx = intParameter(pt - 1);
@@ -7192,24 +7210,6 @@
propertyName = "script";
propertyValue = paramAsStr(pt++);
break;
- case T.image:
- pt++;
- //$FALL-THROUGH$
- case T.string:
- boolean isImage = (theTok != T.string);
- checkLength(pt--);
- if (isImage) {
- if (id == null) {
- String[] data = new String[1];
- getShapePropertyData(JC.SHAPE_ECHO, "currentTarget", data);
- id = data[0];
- }
- if (!chk && vwr.ms.getEchoStateActive())
- vwr.fm.loadImage(getToken(pt).value, id);
- return;
- }
- cmdEcho(pt - 1);
- return;
case T.point:
propertyName = "point";
propertyValue = (isCenterParameter(pt) ? centerParameter(pt) : null);
Modified: branches/v14_2/Jmol/src/org/jmol/viewer/Jmol.properties
===================================================================
--- branches/v14_2/Jmol/src/org/jmol/viewer/Jmol.properties 2015-04-08
18:15:09 UTC (rev 20441)
+++ branches/v14_2/Jmol/src/org/jmol/viewer/Jmol.properties 2015-04-08
18:15:24 UTC (rev 20442)
@@ -4,8 +4,12 @@
# THIS IS THE RELEASE BRANCH
# BUG FIXES ONLY, PLEASE
-Jmol.___JmolVersion="14.2.13_2015.04.07"
+Jmol.___JmolVersion="14.2.13_2015.04.08"
+bug fix: echo id myecho "testing" reports "myecho" instead of "testing"
+
+JmolVersion="14.2.13_2015.04.07"
+
bug fix: Molden reader broken for Dalton2015 version
JmolVersion="14.2.13_2015.04.05b"
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
BPM Camp - Free Virtual Workshop May 6th at 10am PDT/1PM EDT
Develop your own process in accordance with the BPMN 2 standard
Learn Process modeling best practices with Bonita BPM through live exercises
http://www.bonitasoft.com/be-part-of-it/events/bpm-camp-virtual- event?utm_
source=Sourceforge_BPM_Camp_5_6_15&utm_medium=email&utm_campaign=VA_SF
_______________________________________________
Jmol-commits mailing list
Jmol-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jmol-commits
