[Jmol-commits] SF.net SVN: jmol: [7686] trunk/Jmol/src/org/jmol

[<ha...@us...>]

Revision: 7686
          http://svn.sourceforge.net/jmol/?rev=7686&view=rev
Author:   hansonr
Date:     2007-05-13 13:26:33 -0700 (Sun, 13 May 2007)

Log Message:
-----------
11.1.38 bug fix in lcaoCartoon multiple color/create in one command

Modified Paths:
--------------
    trunk/Jmol/src/org/jmol/shapespecial/LcaoCartoon.java
    trunk/Jmol/src/org/jmol/viewer/Eval.java

Modified: trunk/Jmol/src/org/jmol/shapespecial/LcaoCartoon.java
===================================================================
--- trunk/Jmol/src/org/jmol/shapespecial/LcaoCartoon.java	2007-05-13 17:58:07 UTC (rev 7685)
+++ trunk/Jmol/src/org/jmol/shapespecial/LcaoCartoon.java	2007-05-13 20:26:33 UTC (rev 7686)
@@ -112,7 +112,8 @@
 
     if ("translucency" == propertyName) {
       isTranslucent = (((String) value).equals("translucent"));
-      //pass through
+      if (lcaoID == null)
+        return;
     }
 
     //final operations
@@ -125,6 +126,7 @@
     }
 
     if ("create" == propertyName) {
+      myColorPt = 0;
       thisType = (String) value;
       createLcaoCartoon();
       return;

Modified: trunk/Jmol/src/org/jmol/viewer/Eval.java
===================================================================
--- trunk/Jmol/src/org/jmol/viewer/Eval.java	2007-05-13 17:58:07 UTC (rev 7685)
+++ trunk/Jmol/src/org/jmol/viewer/Eval.java	2007-05-13 20:26:33 UTC (rev 7686)
@@ -7931,7 +7931,11 @@
         continue;    
       case Token.string:
         propertyValue = stringParameter(i);
-        propertyName = (optParameterAsString(++i).equalsIgnoreCase("molecular") ? "molecular" : "create");
+        propertyName = "create";
+        if (optParameterAsString(i + 1).equalsIgnoreCase("molecular")) {
+          i++;
+          propertyName = "molecular";
+        }
         break;
       case Token.select:
         if (tokAt(i + 1) == Token.bitset || tokAt(i + 1) == Token.expressionBegin) {
@@ -7956,7 +7960,11 @@
         }
         if (str.equalsIgnoreCase("CREATE")) {
           propertyValue = parameterAsString(++i);
-          propertyName = (optParameterAsString(++i).equalsIgnoreCase("molecular") ? "molecular" : "create");
+          propertyName = "create";
+          if (optParameterAsString(i + 1).equalsIgnoreCase("molecular")) {
+            i++;
+            propertyName = "molecular";
+          }
           break;
         }
         propertyValue = str;


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