Thread: [Jmol-commits] SF.net SVN: jmol:[11105] trunk/Jmol/src/org/jmol/viewer (Page 2)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 454-5900

Revision: 11105
          http://jmol.svn.sourceforge.net/jmol/?rev=11105&view=rev
Author:   hansonr
Date:     2009-06-24 14:03:51 +0000 (Wed, 24 Jun 2009)

Log Message:
-----------
version=11.7.45_dev # bug fix: problems with PAUSE/RESUME within App

Modified Paths:
--------------
    trunk/Jmol/src/org/jmol/viewer/ScriptEvaluator.java
    trunk/Jmol/src/org/jmol/viewer/StateManager.java

Modified: trunk/Jmol/src/org/jmol/viewer/ScriptEvaluator.java
===================================================================

--- trunk/Jmol/src/org/jmol/viewer/ScriptEvaluator.java	2009-06-24 13:32:31 UTC (rev 11104)
+++ trunk/Jmol/src/org/jmol/viewer/ScriptEvaluator.java	2009-06-24 14:03:51 UTC (rev 11105)
@@ -199,7 +199,7 @@
       if (withVariables) {
         if (stack[i].contextVariables != null) {
           sb.append(getScriptID(stack[i]));
-          sb.append(StateManager.getVariableList(stack[i].contextVariables));
+          sb.append(StateManager.getVariableList(stack[i].contextVariables, 80));
         }
       } else {
         sb.append(setErrorLineMessage(stack[i].functionName, stack[i].filename,
@@ -210,7 +210,7 @@
     if (withVariables) {
       if (contextVariables != null) {
         sb.append(getScriptID(null));
-        sb.append(StateManager.getVariableList(contextVariables));
+        sb.append(StateManager.getVariableList(contextVariables, 80));
       }
     } else {
       sb.append(setErrorLineMessage(functionName, filename,
@@ -775,17 +775,18 @@
             pc++;
             if (error)
               scriptStatusOrBuffer(errorMessage);
-            pauseExecution();
+            else 
+              pauseExecution();
           }
         }
-        viewer.scriptStatus("script execution resumed");
+        viewer.scriptStatus("script execution " + (error || interruptExecution ? "interrupted" : "resumed"));
       } catch (Exception e) {
 
       }
       Logger.debug("script execution resumed");
     }
     // once more to trap quit during pause
-    return !interruptExecution;
+    return !error && !interruptExecution;
   }
 
   private int commandHistoryLevelMax = 0;

Modified: trunk/Jmol/src/org/jmol/viewer/StateManager.java
===================================================================
--- trunk/Jmol/src/org/jmol/viewer/StateManager.java	2009-06-24 13:32:31 UTC (rev 11104)
+++ trunk/Jmol/src/org/jmol/viewer/StateManager.java	2009-06-24 14:03:51 UTC (rev 11105)
@@ -68,7 +68,7 @@
   public final static int OBJ_MAX = 7;
   private final static String objectNameList = "background axis1      axis2      axis3      boundbox   unitcell   frank      ";
 
-  static String getVariableList(Hashtable htVariables) {
+  static String getVariableList(Hashtable htVariables, int nMax) {
     StringBuffer sb = new StringBuffer();
     //user variables only:
     int n = 0;
@@ -79,7 +79,7 @@
       String key = (String) e.nextElement();
       ScriptVariable var = (ScriptVariable) htVariables.get(key);
       list[n++] = key  + (key.charAt(0) == '@' ? " "
-              + ScriptVariable.sValue(var) : " = " + var.escape());
+              + ScriptVariable.sValue(var) : " = " + varClip(key, var.escape(), nMax));
     }
     Arrays.sort(list, 0, n);
     for (int i = 0; i < n; i++)
@@ -466,7 +466,7 @@
   Hashtable localFunctions = new Hashtable();
 
   boolean isFunction(String name) {
-    return (name.indexOf("_") == 0 ? localFunctions : globalFunctions).containsKey(name);
+    return (name.indexOf("_") == 0 ? globalFunctions : localFunctions).containsKey(name);
   }
 
   void addFunction(ScriptFunction function) {
@@ -943,12 +943,7 @@
       name = name.toLowerCase();
       if (htParameterValues.containsKey(name)) {
         Object v = htParameterValues.get(name);
-        String sv = Escape.escape(v);
-        if (nMax > 0 && sv.length() > nMax)
-          sv = sv.substring(0, nMax) + "\n#...(" + sv.length()
-              + " bytes -- use SHOW " + name + " or MESSAGE @" + name
-              + " to view)";
-        return sv;
+        return varClip(name, Escape.escape(v), nMax);
       }
       if (htPropertyFlags.containsKey(name))
         return htPropertyFlags.get(name).toString();
@@ -1111,7 +1106,7 @@
           appendCmd(commands, list[i]);
 
       commands.append("\n#user-defined variables; \n");
-      commands.append(StateManager.getVariableList(htUserVariables));
+      commands.append(StateManager.getVariableList(htUserVariables, 0));
 
       // label defaults
 
@@ -1349,7 +1344,7 @@
     }
 
     String getVariableList() {
-      return StateManager.getVariableList(htUserVariables);
+      return StateManager.getVariableList(htUserVariables, 0);
     }
 
   }
@@ -1368,6 +1363,14 @@
       bs.set(i);
   }
 
+  public static String varClip(String name, String sv, int nMax) {
+    if (nMax > 0 && sv.length() > nMax)
+      sv = sv.substring(0, nMax) + " #...more (" + sv.length()
+          + " bytes -- use SHOW " + name + " or MESSAGE @" + name
+          + " to view)";
+    return sv;
+  }
+
   public static String getCommands(Hashtable ht) {
     return getCommands(ht, null, -1, "select");
   }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




Thread: [Jmol-commits] SF.net SVN: jmol:[11105] trunk/Jmol/src/org/jmol/viewer (Page 2)

An interactive viewer for three-dimensional chemical structures.

jmol-commits