Changeset 1142

Timestamp:

Sep 5, 2008, 10:01:52 AM (16 years ago)

Author:

gah

Message:

 

Location:

trunk

Files:

• gui/scripts/molvisviewer.tcl (modified) (3 diffs)
• gui/scripts/visviewer.tcl (modified) (1 diff)
• lang/tcl/scripts/library.tcl (modified) (1 diff)
• packages/vizservers/pymolproxy/pymolproxy.c (modified) (4 diffs)

trunk/gui/scripts/molvisviewer.tcl

@@ -30 +30 @@
 }
 
-set debug 1
+set debug 0
 proc debug { args } {
     global debug
@@ -518 +518 @@
                 _send "loadpdb -defer \"$data1\" $model $state"
                 set _dataobjs($model-$state)  1
-                puts stderr "loaded model $model into state $state"
             }
             if {"" != $data2} {
                 _send "loadpdb -defer \"$data2\" $model $state"
                 set _dataobjs($model-$state)  1
-                puts stderr "loaded model $model into state $state"
             }
         }
@@ -597 +595 @@
         _update
     }
+    set w  [winfo width $itk_component(3dview)] 
+    set h  [winfo height $itk_component(3dview)] 
+    _send "screen $w $h"
 
     set _inrebuild 0

trunk/gui/scripts/visviewer.tcl

@@ -23 +23 @@
     set _servers(nanovis) "" 
     set _servers(pymol)   "" 
-    set _servers(nanovis) "128.210.189.216:2000" 
-    set _servers(pymol) "128.210.189.216:2020" 
 
     protected variable _dispatcher ""   ;# dispatcher for !events

trunk/lang/tcl/scripts/library.tcl

@@ -410 +410 @@
     }
     set path [lindex $args 0]
-
     set node [find $path]
     if {$node == ""} {

trunk/packages/vizservers/pymolproxy/pymolproxy.c

@@ -49 +49 @@
 
 static FILE *flog;
-static int debug = 0;
+static int debug = 1;
 
 static void
@@ -831 +831 @@
     PymolProxy *pymol = (PymolProxy *) cdata;
     int state = 1;
-    int tmpf;
     int arg, defer = 0, push = 0, varg = 1;
-    char filename[] = "/tmp/fileXXXXXX.pdb";
     
     if (pymol == NULL)
         return(TCL_ERROR);
-    
     clear_error(pymol);
     pdbdata = name = NULL;      /* Suppress compiler warning. */
@@ -859 +856 @@
     pymol->need_update = !defer || push;
     pymol->immediate_update |= push;
-    
-    tmpf = open(filename,O_RDWR|O_TRUNC|O_CREAT,0700);
-    
-    if (tmpf <= 0) 
-        fprintf(stderr,"pymolproxy: error opening file %d\n",errno);
-    
-    write(tmpf,pdbdata,strlen(pdbdata));
-    close(tmpf);
-    
-    sendf(pymol, "load %s, %s, %d\n", filename, name, state);
+
+    {
+        char fileName[200];
+        FILE *f;
+        size_t nBytes, nWritten;
+
+        sprintf(fileName, "/tmp/pymol%d.pdb", getpid());
+        f = fopen(fileName, "w");
+        trace("pymolproxy: open file %s as %x\n", fileName, f);
+        if (f == NULL) {
+            trace("pymolproxy: failed to open %s %d\n", fileName, errno);
+            perror("pymolproxy");
+        }
+        nBytes = strlen(pdbdata);
+        nWritten = fwrite(pdbdata, sizeof(char), nBytes, f);
+        if (nBytes != nWritten) {
+            trace("pymolproxy: short write %d wanted %d bytes\n", nWritten,
+                  nBytes);
+            perror("pymolproxy");
+        }
+        fclose(f);
+        sendf(pymol, "load %s, %s, %d\n", fileName, name, state);
+    }
     sendf(pymol, "zoom buffer=2\n");
-    /* Can't clean up the temporary file, since we don't when pymol will be
-     * done reading it. */
     return(pymol->status);
 }
@@ -1389 +1397 @@
 main(int argc, char *argv[])
 {
+    flog = stderr;
     if (debug) {
-        flog = stderr;
-        flog = fopen("/tmp/pymolproxy.log", "w");
+        char fileName[200];
+        sprintf(fileName, "/tmp/pymolproxy%d.log", getpid());
+        flog = fopen(fileName, "w");
     }    
     ProxyInit(fileno(stdout), fileno(stdin), argv + 1);