Changeset 1998 for trunk/packages/vizservers

Timestamp:

Dec 9, 2010, 8:49:06 PM (14 years ago)

Author:

gah

Message:

 

File:

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

trunk/packages/vizservers/pymolproxy/pymolproxy.c

@@ -96 +96 @@
 
 static FILE *flog;
-static int debug = TRUE;
+static int debug = FALSE;
 static FILE *scriptFile;
 static int savescript = FALSE;
@@ -732 +732 @@
 }
 
+static void
+UpdateSettings(PymolProxy *proxyPtr)
+{
+    /* Handle all the pending setting changes now. */
+    if (proxyPtr->flags & VIEWPORT_PENDING) {
+        SetViewport(proxyPtr);
+    }
+    if (proxyPtr->flags & ROTATE_PENDING) {
+        SetRotation(proxyPtr);
+    }
+    if (proxyPtr->flags & PAN_PENDING) {
+        SetPan(proxyPtr);
+    }
+    if (proxyPtr->flags & ZOOM_PENDING) {
+        SetZoom(proxyPtr);
+    }
+    if (proxyPtr->flags & ATOM_SCALE_PENDING) {
+        SetSphereScale(proxyPtr);
+    }
+    if (proxyPtr->flags & STICK_RADIUS_PENDING) {
+        SetStickRadius(proxyPtr);
+    }
+}
+
+
 static int
 BmpCmd(ClientData clientData, Tcl_Interp *interp, int argc, const char *argv[])
@@ -748 +773 @@
 
     /* Force pymol to update the current scene. */
+    UpdateSettings(proxyPtr);
+
     Pymol(proxyPtr, "refresh\n");
     Pymol(proxyPtr, "bmp -\n");
@@ -1102 +1129 @@
         FILE *f;
         ssize_t nWritten;
+        static unsigned long count = 0;
 
         proxyPtr->status = TCL_ERROR;
-        sprintf(fileName, "/tmp/pymol%d.pdb", getpid());
+        sprintf(fileName, "/tmp/pymol%d%ld.pdb", getpid(), count);
+        count++;
         f = fopen(fileName, "w");
         if (f == NULL) {
@@ -2138 +2167 @@
 
         /* Handle all the pending setting changes now. */
-        if (proxyPtr->flags & VIEWPORT_PENDING) {
-            SetViewport(proxyPtr);
-        }
-        if (proxyPtr->flags & ROTATE_PENDING) {
-            SetRotation(proxyPtr);
-        }
-        if (proxyPtr->flags & PAN_PENDING) {
-            SetPan(proxyPtr);
-        }
-        if (proxyPtr->flags & ZOOM_PENDING) {
-            SetZoom(proxyPtr);
-        }
-        if (proxyPtr->flags & ATOM_SCALE_PENDING) {
-            SetSphereScale(proxyPtr);
-        }
-        if (proxyPtr->flags & STICK_RADIUS_PENDING) {
-            SetStickRadius(proxyPtr);
-        }
+        UpdateSettings(proxyPtr);
 
         /* Write the current image buffer. */