Changeset 2688 for trunk/packages

Timestamp:

Nov 16, 2011, 12:56:37 PM (13 years ago)

Author:

gah

Message:

 

File:

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

trunk/packages/vizservers/pymolproxy/pymolproxy2.c

@@ -94 +94 @@
 static FILE *frecord;
 static int recording = FALSE;
+static int pymolIsAlive = TRUE;
 
 #define WANT_DEBUG      0
@@ -723 +724 @@
 {
     PymolProxy *p = clientData;
-    int i, push, defer, state, size;
+    int i, push, defer, bool, size;
     const char *model;
 
@@ -729 +730 @@
     model = "all";
     size = 14;
-    state = TRUE;
+    bool = TRUE;
     push = defer = FALSE;
     for(i = 1; i < argc; i++) {
@@ -744 +745 @@
                 size = atoi(argv[i]);
             }
-        } else if (Tcl_GetBoolean(interp, argv[i], &state) != TCL_OK) {
+        } else if (Tcl_GetBoolean(interp, argv[i], &bool) != TCL_OK) {
             return TCL_ERROR;
         }
@@ -757 +758 @@
     SendCmd(p, "set label_color,white,%s\nset label_size,%d,%s\n", 
             model, size, model);
-    if (state) {
+    if (bool) {
         SendCmd(p, "label %s,\"%%s%%s\" %% (ID,name)\n", model);
     } else {
@@ -843 +844 @@
         p->flags |= FORCE_UPDATE;
     }
+    p->cacheId = state;
 
     /* Does not invalidate cache? */
@@ -984 +986 @@
     /* Force pymol to update the current scene. */
     SendCmd(p, "refresh\n");
-#ifdef notdef
-    SendCmd(p, "png \"- %d %d %d\"\n", p->frame, p->cacheId, p->rockOffset);
-#endif
-    SendCmd(p, "png -\n");
+    /* This is a hack. We're encoding the filename to pass extra information
+     * to the MyPNGWrite routine inside of pymol. Ideally these would be
+     * parameters of a new "molvispng" command that would be passed all the
+     * way through to MyPNGWrite.
+     *
+     * The extra information is contained in the token we get from the
+     * molvisviewer client, the frame number, and rock offset. */
+    SendCmd(p, "png -:%d:%d:%d\n", p->cacheId, p->frame, p->rockOffset);
     return p->status;
 }
@@ -1001 +1007 @@
     /* Force pymol to update the current scene. */
     SendCmd(p, "refresh\n");
-#ifdef notdef
-    SendCmd(p, "png \"- %d %d %d\",format=1\n", p->frame, p->cacheId, 
+    /* This is a hack. We're encoding the filename to pass extra information
+     * to the MyPNGWrite routine inside of pymol. Ideally these would be
+     * parameters of a new "molvispng" command that would be passed all the
+     * way through to MyPNGWrite.
+     *
+     * The extra information is contained in the token we get from the
+     * molvisviewer client, the frame number, and rock offset. */
+    SendCmd(p, "png -:%d:%d:%d,format=1\n", p->cacheId, p->frame, 
             p->rockOffset);
-#endif
-    SendCmd(p, "png -,format=1\n");
     p->flags &= ~(UPDATE_PENDING|FORCE_UPDATE);
     return p->status;
@@ -1042 +1052 @@
         SendCmd(p, "bg_color %s\nrefresh\n", bgcolor);
     }
-    SendCmd(p, "ray %d,%d\n", width, height);
-#ifdef notdef
-    SendCmd(p, "png \"- print 0 0\",dpi=300\nbg_color black\n");
-#endif
-    SendCmd(p, "png -,dpi=300\nbg_color black\n");
+    /* This is a hack. We're encoding the filename to pass extra information
+     * to the MyPNGWrite routine inside of pymol. Ideally these would be
+     * parameters of a new "molvispng" command that would be passed all the
+     * way through to MyPNGWrite.  
+     *
+     * The extra information is contained in the token we get from the
+     * molvisviewer client, the frame number, and rock offset.
+     */
+    SendCmd(p, "png -:%s:0:0,width=%d,height=%d,ray=1,dpi=300\n", 
+            token, width, height);
+    SendCmd(p, "bg_color black\n");
     return p->status;
 }
@@ -1891 +1907 @@
 {
     ERROR("pymol (%d) died unexpectedly", stats.pid);
+    pymolIsAlive = FALSE;
     /*DoExit(1);*/
 }
@@ -1987 +2004 @@
         exit(-1);
     } else {
+        pymolIsAlive = TRUE;
         signal(SIGCHLD, ChildHandler);
     }
@@ -2104 +2122 @@
 #endif
     Tcl_DStringInit(&command);
-    for (;;) {
+    while (pymolIsAlive) {
         tvPtr = NULL;
 #if READ_DEBUG
         DEBUG("Start I/O set");
 #endif
-        while (WaitForNextLine(&p->client, tvPtr)) {
+        while ((pymolIsAlive) && (WaitForNextLine(&p->client, tvPtr))) {
             size_t numBytes;
             const char *line;
@@ -2182 +2200 @@
 #endif
     list.headPtr = list.tailPtr = NULL;
-    for (;;) {
+    while (pymolIsAlive) {
         while (WaitForNextLine(bp, NULL)) {
             Image *imgPtr;
@@ -2200 +2218 @@
                 return NULL;
             }
-            if (strncmp(line, "ppm image follows: ", 16) != 0) {
+#if WRITE_DEBUG
+            DEBUG("Writer: line found is %s\n", line);
+#endif
+            if (strncmp(line, "image follows: ", 15) != 0) {
                 continue;
             }
-#ifdef notdef
             if (sscanf(line, "image follows: %d %s %d %d\n", &numBytes, cacheId,
                        &frameNum, &rockOffset) != 4) {
@@ -2210 +2230 @@
                 return NULL;
             } 
-#endif
-            if (sscanf(line, "ppm image follows: %d\n", &numBytes) != 1) {
-                ERROR("can't get # bytes from \"%s\"", line);
-                DEBUG("Leaving Writer thread");
-                return NULL;
-            } 
 #if WRITE_DEBUG
             DEBUG("found image line \"%.*s\"", numBytes, line);
 #endif
-            strcpy(cacheId, "0");
-            frameNum = 0;
-            rockOffset = 0;
-            sprintf(header, "nv>image %d %s %d %d\n", numBytes, cacheId, frameNum, 
-                    rockOffset);
+            sprintf(header, "nv>image %d %s %d %d\n", numBytes, cacheId, 
+                    frameNum, rockOffset);
             hdrLength = strlen(header);
 #if WRITE_DEBUG
-            DEBUG("Queueing image numBytes=%d frameNum=%d, rockOffset=%d size=%d\n", numBytes, frameNum, rockOffset, numBytes + hdrLength);
+            DEBUG("Queueing image numBytes=%d cacheId=%s, frameNum=%d, rockOffset=%d size=%d\n", numBytes, cacheId, frameNum, rockOffset, numBytes + hdrLength);
 #endif
             imgPtr = NewImage(&list, numBytes + hdrLength);