Changeset 1538 for trunk

Timestamp:

Jun 29, 2009 1:30:40 PM (15 years ago)

Author:

gah

Message:

 

File:

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

trunk/packages/vizservers/pymolproxy/pymolproxy.c

@@ -19 +19 @@
  */
 
+/*
+ * Notes:   The proxy should not maintain any state information from the
+ *          client, other that what it needs for event (rotate, pan, zoom,
+ *          atom scale, bond thickness, etc.) compression.  This is because 
+ *          the connection is periodically broken (timeout, error, etc.).
+ *          It's the responsibility of the client (molvisviewer) to restore 
+ *          the settings of the previous view.  The proxy is just a relay
+ *          between the client and the pymol server.
+ */
 /*
  *   +--------------+        +------------+         +--------+
@@ -41 +50 @@
  * when we want to write the resulting image from the last command.
  *
- * FIXME: Need to fix the reads from the pymol server.  We want to check for
- * an expected string within the pymol server output.  Right now it's doing
- * single character reads to stop when we hit a newline.  We should create a
- * read buffer that lets us do block reads.  This problem only really affects
- * the echoing back of commands (waiting for the pymol command prompt).  Most
- * command lines are small.  Still it's a good area for improvement.
- *
- * FIXME: Might be a problem if another image is received from the server
- *        before the last one is transmitted.
  */
 
@@ -846 +846 @@
     proxyPtr->flags &= ~(UPDATE_PENDING|FORCE_UPDATE|INVALIDATE_CACHE);
 
-   /* Force pymol to update the current scene. */
-    Pymol(proxyPtr,"refresh\n");
-    Pymol(proxyPtr,"bmp -\n");
+    /* Force pymol to update the current scene. */
+    Pymol(proxyPtr, "refresh\n");
+    Pymol(proxyPtr, "bmp -\n");
     if (Expect(proxyPtr, "bmp image follows: ", buffer, BUFSIZ) != BUFFER_OK) {
         trace("can't find image follows line (%s)", buffer);
@@ -1092 +1092 @@
         proxyPtr->flags |= FORCE_UPDATE;
     }
-    Pymol(proxyPtr, "hide spheres,%s\nshow lines,%s\n", model, model);
+    Pymol(proxyPtr, "hide spheres,%s\nshow sticks,%s\n", model, model);
     return proxyPtr->status;
 }
@@ -1154 +1154 @@
         }
         fclose(f);
-        Pymol(proxyPtr, "load %s, %s, %d\n", fileName, name, state);
+        Pymol(proxyPtr, "load %s,%s,%d\n", fileName, name, state);
         Pymol(proxyPtr, "zoom complete=1\n");
     }
@@ -1261 +1261 @@
 
     /* Force pymol to update the current scene. */
-    Pymol(proxyPtr,"refresh\n");
-
-    Pymol(proxyPtr,"png -\n");
+    Pymol(proxyPtr, "refresh\n");
+    Pymol(proxyPtr, "png -\n");
 
     Expect(proxyPtr, "png image follows: ", buffer, 800);
@@ -1321 +1320 @@
     }
     /* Force pymol to update the current scene. */
-    Pymol(proxyPtr,"refresh\nray %d,%d\npng -, dpi=300\n", width, height);
+    Pymol(proxyPtr, "refresh\n");
+    Pymol(proxyPtr, "ray %d,%d\npng -,dpi=300\n", width, height);
     Expect(proxyPtr, "png image follows: ", buffer, 800);
 
@@ -1532 +1532 @@
         proxyPtr->flags |= FORCE_UPDATE;
     }
-    Pymol(proxyPtr, "set sphere_quality,2,%s\nhide lines,%s\n", 
-          model, model);
+    Pymol(proxyPtr, "set sphere_quality,2,%s\nhide sticks,%s\n", model, model);
     Pymol(proxyPtr, "set ambient,.2,%s\nshow spheres,%s\n", model, model);
     return proxyPtr->status;
@@ -1543 +1542 @@
 {
     PymolProxy *proxyPtr = clientData;
-    int width = 640, height = 480;
-    int defer = 0, push = 0, i, varg = 1;
-
-    clear_error(proxyPtr);
-
+    int width = -1, height = -1;
+    int defer, push, i, varg;
+
+    clear_error(proxyPtr);
+    defer = push = FALSE;
+    varg = 1;
     for(i = 1; i < argc; i++) {
         if ( strcmp(argv[i],"-defer") == 0 ) 
@@ -1562 +1562 @@
             varg++;
         }
+    }
+    if ((width < 0) || (height < 0)) {
+        return TCL_ERROR;
     }
     proxyPtr->flags |= INVALIDATE_CACHE; /* viewport */