Revision: 18599
http://sourceforge.net/p/jmol/code/18599
Author: hansonr
Date: 2013-08-20 03:06:28 +0000 (Tue, 20 Aug 2013)
Log Message:
-----------
___JmolVersion="13.3.4_dev_2013.08.19"
bug fix: TRY failure in a load command followed by a successful load
having a loadScript will pop past the second TRY and crash Jmol
Modified Paths:
--------------
trunk/Jmol/src/org/jmol/script/ScriptEvaluator.java
trunk/Jmol/src/org/jmol/viewer/Jmol.properties
trunk/Jmol/src/org/jmol/viewer/Viewer.java
Modified: trunk/Jmol/src/org/jmol/script/ScriptEvaluator.java
===================================================================
--- trunk/Jmol/src/org/jmol/script/ScriptEvaluator.java 2013-08-20 03:06:01 UTC
(rev 18598)
+++ trunk/Jmol/src/org/jmol/script/ScriptEvaluator.java 2013-08-20 03:06:28 UTC
(rev 18599)
@@ -313,7 +313,7 @@
timeEndExecution = System.currentTimeMillis();
if (errorMessage == null && executionStopped)
setErrorMessage("execution interrupted");
- else if (!tQuiet && !chk)
+ else if (!tQuiet && !chk)
viewer.scriptStatus(JC.SCRIPT_COMPLETED);
executing = chk = this.isCmdLine_c_or_C_Option = this.historyDisabled =
false;
String msg = getErrorMessageUntranslated();
@@ -771,7 +771,7 @@
* variable name for debugging reference only -- null indicates return
* Boolean -- "" indicates return String
* @param ignoreComma
- * TODO
+ *
* @param asVector
* a flag passed on to RPN;
* @param ptAtom
@@ -2210,7 +2210,7 @@
Map<String, SV> cv = contextVariables;
executeCommands(true);
//JavaScript will not return here after DELAY
- while (thisContext.tryPt != tryPt)
+ while (thisContext.tryPt > tryPt)
popContext(false, false);
processTry(cv);
return null;
@@ -3822,7 +3822,6 @@
case T.spec_seqcode_range:
if (isInMath) {
rpn.addXNum(SV.newScriptVariableInt(instruction.intValue));
- // TODO -- in 13.0 had addXObj this adds a "-" to the X stack.
rpn.addOp(T.tokenMinus);
rpn.addXNum(SV.newScriptVariableInt(code[++pc].intValue));
break;
@@ -5366,7 +5365,7 @@
/**
*
* @param isSpt
- * @param fromFunc TODO
+ * @param fromFunc
* @return false only when still working through resumeEval
* @throws ScriptException
*/
@@ -15155,7 +15154,7 @@
* Checks color, translucent, opaque parameters.
*
* @param i
- * @param allowNone TODO
+ * @param allowNone
* @return translucentLevel and sets iToken and colorArgb[0]
*
* @throws ScriptException
Modified: trunk/Jmol/src/org/jmol/viewer/Jmol.properties
===================================================================
--- trunk/Jmol/src/org/jmol/viewer/Jmol.properties 2013-08-20 03:06:01 UTC
(rev 18598)
+++ trunk/Jmol/src/org/jmol/viewer/Jmol.properties 2013-08-20 03:06:28 UTC
(rev 18599)
@@ -13,6 +13,11 @@
___JmolVersion="13.3.4_dev_2013.08.19"
+bug fix: TRY failure in a load command followed by a successful load
+ having a loadScript will pop past the second TRY and crash Jmol
+
+new feature: _logfile holds full path to logfile
+
code: Incommensurate modulated structure CIF and M50/40 file loading validation
-- includes d=1 and d=2
-- Fourier, sawtooth, crenel
Modified: trunk/Jmol/src/org/jmol/viewer/Viewer.java
===================================================================
--- trunk/Jmol/src/org/jmol/viewer/Viewer.java 2013-08-20 03:06:01 UTC (rev
18598)
+++ trunk/Jmol/src/org/jmol/viewer/Viewer.java 2013-08-20 03:06:28 UTC (rev
18599)
@@ -9196,7 +9196,7 @@
} else {
if (path != null)
Logger.info(GT._("Setting log file to {0}", path));
- logFile = path;
+ global.setS("_logFile", logFile = path);
}
return value;
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Introducing Performance Central, a new site from SourceForge and
AppDynamics. Performance Central is your source for news, insights,
analysis and resources for efficient Application Performance Management.
Visit us today!
http://pubads.g.doubleclick.net/gampad/clk?id=48897511&iu=/4140/ostg.clktrk
_______________________________________________
Jmol-commits mailing list
Jmol-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jmol-commits
