Revision: 18563
http://sourceforge.net/p/jmol/code/18563
Author: hansonr
Date: 2013-08-14 02:43:07 +0000 (Wed, 14 Aug 2013)
Log Message:
-----------
Modified Paths:
--------------
branches/v13_2/Jmol/src/org/jmol/script/ScriptEvaluator.java
branches/v13_2/Jmol/src/org/jmol/thread/ScriptDelayThread.java
Modified: branches/v13_2/Jmol/src/org/jmol/script/ScriptEvaluator.java
===================================================================
--- branches/v13_2/Jmol/src/org/jmol/script/ScriptEvaluator.java
2013-08-13 22:55:06 UTC (rev 18562)
+++ branches/v13_2/Jmol/src/org/jmol/script/ScriptEvaluator.java
2013-08-14 02:43:07 UTC (rev 18563)
@@ -297,7 +297,7 @@
}
private void startEval() {
- viewer.pushHoldRepaintWhy("runEval");
+ viewer.pushHoldRepaintWhy("startEval");
setScriptExtensions();
executeCommands(false);
}
@@ -337,7 +337,7 @@
}
if (haveError || !isJS || !allowJSThreads) {
viewer.setTainted(true);
- viewer.popHoldRepaint("runEval");
+ viewer.popHoldRepaint("executeCommands" + " " + (scriptLevel > 0 ?
JC.REPAINT_IGNORE : ""));
}
timeEndExecution = System.currentTimeMillis();
if (errorMessage == null && executionStopped)
@@ -403,7 +403,7 @@
setErrorMessage(null);
if (executionStopped || sc == null || !sc.mustResumeEval) {
viewer.setTainted(true);
- viewer.popHoldRepaint("runEval");
+ viewer.popHoldRepaint("resumeEval");
viewer.queueOnHold = false;
return;
}
@@ -5410,8 +5410,9 @@
+ scriptLevel + ": " + thisCommand);
}
refresh();
+
while (executionPaused) {
- viewer.popHoldRepaint("pause");
+ viewer.popHoldRepaint("pause " + JC.REPAINT_IGNORE);
// does not actually do a repaint
// but clears the way for interaction
String script = viewer.getInsertedCommand();
Modified: branches/v13_2/Jmol/src/org/jmol/thread/ScriptDelayThread.java
===================================================================
--- branches/v13_2/Jmol/src/org/jmol/thread/ScriptDelayThread.java
2013-08-13 22:55:06 UTC (rev 18562)
+++ branches/v13_2/Jmol/src/org/jmol/thread/ScriptDelayThread.java
2013-08-14 02:43:07 UTC (rev 18563)
@@ -72,7 +72,7 @@
millis = 1;
}
if (doPopPush)
- viewer.popHoldRepaint("delay INIT");
+ viewer.popHoldRepaint("scriptDelayThread INIT");
mode = MAIN;
break;
case MAIN:
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Get 100% visibility into Java/.NET code with AppDynamics Lite!
It's a free troubleshooting tool designed for production.
Get down to code-level detail for bottlenecks, with <2% overhead.
Download for free and get started troubleshooting in minutes.
http://pubads.g.doubleclick.net/gampad/clk?id=48897031&iu=/4140/ostg.clktrk
_______________________________________________
Jmol-commits mailing list
Jmol-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jmol-commits
