Changeset 1807 for branches/blt4/gui/scripts

Timestamp:

Jul 14, 2010, 3:54:10 PM (14 years ago)

Author:

gah

Message:

 

File:

• branches/blt4/gui/scripts/molvisviewer.tcl (modified) (8 diffs)

branches/blt4/gui/scripts/molvisviewer.tcl

@@ -53 +53 @@
     private variable _obj2models;       # array containing list of models 
                                         # for each data object.
-
+    private variable _waitForImage 0
     private variable _view
     private variable _click
@@ -678 +678 @@
 set count 0
 itcl::body Rappture::MolvisViewer::ReceiveImage { size cacheid frame rock } {
+    set _waitForImage 0;                # Turn off wait loop.
     set tag "$frame,$rock"
     global count
@@ -769 +770 @@
             }
             if {"" != $data1} {
+                # Save the PDB data in case the user wants to later save it.
                 set _pdbdata $data1
-                SendCmd "loadpdb -defer \"$data1\" $model $state"
+                set nBytes [string length $data1]
+
+                # We know we're buffered here, so append the "loadpdb" command
+                # with the data payload immediately afterwards.
+                append _outbuf "loadpdb -defer $nBytes $model $state\n"
+                append _outbuf $data1
                 set _dataobjs($model-$state)  1
             }
@@ -776 +783 @@
             set data2 [$dataobj get components.molecule.pdb]
             if {"" != $data2} {
+                # Save the PDB data in case the user wants to later save it.
                 set _pdbdata $data2
-                SendCmd "loadpdb -defer \"$data2\" $model $state"
+                set nBytes [string length $data2]
+
+                # We know we're buffered here, so append the "loadpdb" command
+                # with the data payload immediately afterwards.
+                append _outbuf "loadpdb -defer $nBytes $model $state\n"
+                append _outbuf $data2
                 set _dataobjs($model-$state)  1
             }
@@ -820 +833 @@
                 }
                 if {"" != $data3} {
+                    # Save the PDB data in case the user wants to later save it.
                     set _pdbdata $data3
-                    SendCmd "loadpdb -defer \"$data3\" $model $state"
-                    set _dataobjs($model-$state) 1
+                    set nBytes [string length $data3]
+
+                    # We know we're buffered here, so append the "loadpdb" 
+                    # command with the data payload immediately afterwards.
+                    append _outbuf "loadpdb -defer $nBytes $model $state\n"
+                    append _outbuf $data3
                 }
+                set _dataobjs($model-$state) 1
             }
         }
@@ -934 +953 @@
     if { $flush } {
         SendCmd "bmp";                  # Flush the results.
+        set _waitForImage 1 
     }
     set _buffering 0;                   # Turn off buffering.
@@ -945 +965 @@
     blt::busy release $itk_component(hull)
 
+    if { $_waitForImage } {
+        tkwait variable [itcl::scope _waitForImage]
+    }
     debug "exiting rebuild"
 }
@@ -1441 +1464 @@
         }
     }
+    update idletasks
+    update 
 }