Changeset 1211

Timestamp:

Nov 12, 2008 9:42:16 AM (15 years ago)

Author:

gah

Message:

new version of pymol + server patches

Location:

trunk/packages/vizservers

Files:

• nanovis/nanovis.cpp (modified) (1 diff)
• pymolproxy/pymolproxy.c (modified) (5 diffs)

trunk/packages/vizservers/nanovis/nanovis.cpp

@@ -651 +651 @@
         return;
     }
-    if (NanoVis::stdin != ::stdin) {
-        return;
-    }
-
     if (debug_flag) {
         fprintf(stderr, "in resize_offscreen_buffer(%d, %d)\n", w, h);

trunk/packages/vizservers/pymolproxy/pymolproxy.c

@@ -68 +68 @@
 
 static FILE *flog;
-static int debug = FALSE;
+static int debug = TRUE;
 
 typedef struct {
@@ -1197 +1197 @@
     char buffer[800];
     unsigned int nBytes=0;
-    float samples = 0.0;
+    float samples = 10.0;
     PymolProxy *pymol = (PymolProxy *) cdata;
 
@@ -1213 +1213 @@
     waitForString(pymol, "image follows: ", buffer, 800);
 
-    sscanf(buffer, "image follows: %d %f\n", &nBytes, &samples);
+    sscanf(buffer, "image follows: %d\n", &nBytes);
  
     write(3, &samples, sizeof(samples));
@@ -1240 +1240 @@
     char buffer[800];
     unsigned int nBytes=0;
-    float samples = 0.0;
+    float samples = 10.0;
     PymolProxy *pymol = (PymolProxy *) cdata;
 
@@ -1256 +1256 @@
     waitForString(pymol, "image follows: ", buffer, 800);
 
-    sscanf(buffer, "image follows: %d %f\n", &nBytes, &samples);
+    sscanf(buffer, "image follows: %d\n", &nBytes);
     write(3,&samples,sizeof(samples));