Changeset 1563 for trunk/packages/vizservers

Timestamp:

Sep 14, 2009, 2:17:49 PM (15 years ago)

Author:

gah

Message:

add cartoon to representation, background color to print command

File:

• trunk/packages/vizservers/pymolproxy/pymolproxy.c (modified) (9 diffs)

trunk/packages/vizservers/pymolproxy/pymolproxy.c

@@ -358 +358 @@
         return proxyPtr->status;
     }
-#ifdef notdef
+#ifndef notdef
     trace("Entering Expect(want=%s, maxSize=%d)\n", match, maxSize);
 #endif
@@ -369 +369 @@
         line = GetLine(&proxyPtr->server, &nBytes);
         if (line != NULL) {
-#ifdef notdef
+#ifndef notdef
             trace("pymol says:%.*s", nBytes, out);
 #endif
@@ -378 +378 @@
                 memcpy(out, line, nBytes);
                 clear_error(proxyPtr);
-#ifdef notdef
+#ifndef notdef
                 trace("Leaving Expect: got (%.*s)\n", nBytes, out);
 #endif
@@ -664 +664 @@
     
     va_start(ap, format);
-    vsnprintf(buffer, BUFSIZ-1, format, ap);
+    result = vsnprintf(buffer, BUFSIZ-1, format, ap);
     va_end(ap);
     
-    trace("to-pymol>(%s)", buffer);
+    trace("to-pymol>(%s) code=%d", buffer, result);
     
     /* Write the command out to the server. */
@@ -1225 +1225 @@
     Image *imgPtr;
     int width, height;
-    const char *token;
+    const char *token, *bgcolor;
 
     clear_error(proxyPtr);
@@ -1234 +1234 @@
     proxyPtr->flags &= ~(UPDATE_PENDING | FORCE_UPDATE | INVALIDATE_CACHE);
 
-    if (argc != 4) {
+    if (argc != 5) {
         Tcl_AppendResult(interp, "wrong # arguments: should be \"", 
-                         argv[0], " token width height\"", (char *)NULL);
+                         argv[0], " token width height color\"", (char *)NULL);
         return TCL_ERROR;
     }
@@ -1246 +1246 @@
         return TCL_ERROR;
     }
+    bgcolor = argv[4];
     /* Force pymol to update the current scene. */
-    Pymol(proxyPtr, "refresh\n");
-    Pymol(proxyPtr, 
-          "ray %d,%d\n"
-          "png -,dpi=300\n", 
-          width, height);
+    Pymol(proxyPtr, "bg_color %s\nrefresh\n", bgcolor);
+    Pymol(proxyPtr, "ray %d,%d\n", width, height);
+    Expect(proxyPtr, " Ray:", buffer, 800);
+
+    Pymol(proxyPtr, "png -,dpi=300\nbg_color black\n");
     Expect(proxyPtr, "png image follows: ", buffer, 800);
 
@@ -1261 +1262 @@
     sprintf(buffer, "nv>image %d print \"%s\" %d\n", nBytes, token, 
             proxyPtr->rockOffset);
+    trace("header is png is (%s)\n", buffer);
     length = strlen(buffer);
     imgPtr = NewImage(proxyPtr, nBytes + length);
@@ -1405 +1407 @@
         proxyPtr->flags |= FORCE_UPDATE;
     }
-    if (strcmp(rep, "ballnstick") == 0) { 
-        /* Ball 'n Stick */
-        Pymol(proxyPtr, "set stick_color,white,%s\n", model);
+    if (strcmp(rep, "ballnstick") == 0) { /* Ball 'n Stick */
         Pymol(proxyPtr, 
+              "set stick_color,white,%s\n"
+              "show sticks,%s\n"
+              "show spheres,%s\n"
               "hide lines,%s\n"
-              "show sticks,%s\n"
-              "show spheres,%s\n", 
-              model, model, model);
-    } else if (strcmp(rep, "spheres") == 0) { 
-        /* spheres */    
+              "hide cartoon,%s\n",
+              model, model, model, model, model);
+    } else if (strcmp(rep, "spheres") == 0) { /* spheres */    
         Pymol(proxyPtr, 
               "hide sticks,%s\n"
+              "show spheres,%s\n"
               "hide lines,%s\n"
-              "show spheres,%s\n", 
-              model, model, model);
-        Pymol(proxyPtr, 
+              "hide cartoon,%s\n"
               "set sphere_quality,2,%s\n"
               "set ambient,.2,%s\n", 
-              model, model);
-    } else if (strcmp(rep, "none") == 0) { 
-        /* nothing */    
+              model, model, model, model, model, model);
+    } else if (strcmp(rep, "none") == 0) { /* nothing */    
         Pymol(proxyPtr, 
+              "hide sticks,%s\n", 
               "hide spheres,%s\n"
               "hide lines,%s\n"
-              "hide sticks,%s\n", 
-              model, model, model);
-    } else if (strcmp(rep, "sticks") == 0) { 
-        /* sticks */    
-        Pymol(proxyPtr, "set stick_color,white,%s\n", model);
+              "hide cartoon,%s\n",
+              model, model, model, model);
+    } else if (strcmp(rep, "sticks") == 0) { /* sticks */    
         Pymol(proxyPtr, 
+              "set stick_color,white,%s\n"
+              "show sticks,%s\n"
               "hide spheres,%s\n"
               "hide lines,%s\n"
-              "show sticks,%s\n", 
-              model, model, model);
-    } else if (strcmp(rep, "lines") == 0) { 
-        /* lines */    
+              "hide cartoon,%s\n",
+              model, model, model, model, model);
+    } else if (strcmp(rep, "lines") == 0) { /* lines */    
         Pymol(proxyPtr, 
+              "hide sticks,%s\n"
               "hide spheres,%s\n"
+              "show lines,%s\n"
+              "hide cartoon,%s\n",
+              model, model, model, model);
+    } else if (strcmp(rep, "cartoon") == 0) { /* cartoon */    
+        Pymol(proxyPtr, 
               "hide sticks,%s\n"
-              "show lines,%s\n", 
-              model, model, model);
-    }
+              "hide spheres,%s\n"
+              "hide lines,%s\n"
+              "show cartoon,%s\n", 
+              model, model, model, model);
+    } 
     return proxyPtr->status;
 }