Changeset 1249 for trunk

Timestamp:

Dec 1, 2008 12:50:26 PM (15 years ago)

Author:

gah

Message:

Fix for interrupted nanovis session

Location:

trunk

Files:

• gui/scripts/nanovisviewer.tcl (modified) (4 diffs)
• packages/vizservers/nanovis/nanovis.cpp (modified) (3 diffs)

trunk/gui/scripts/nanovisviewer.tcl

@@ -862 +862 @@
     set outbuf_ ""
 
-    $_dispatcher event -idle !legend
+    #_fixLegend
+    #$_dispatcher event -idle !legend
 }
 
@@ -926 +927 @@
 #       "_rebuild", "add", etc.
 #
-itcl::body Rappture::NanovisViewer::_ReceiveLegend { ivol vmin vmax size } {
+itcl::body Rappture::NanovisViewer::_ReceiveLegend { tf vmin vmax size } {
     if { ![isconnected] } {
         return
@@ -937 +938 @@
     set w [winfo width $c]
     set h [winfo height $c]
-    foreach { dataobj comp } $_id2obj($ivol) break
+    #foreach { dataobj comp } $_id2obj($ivol) break
     set lx 10
     set ly [expr {$h - 1}]
@@ -952 +953 @@
     }
     # Display the markers used by the active transfer function.
-    set tf $activeTf_
+    #set tf $activeTf_
 
     array set limits [GetLimits $tf]

trunk/packages/vizservers/nanovis/nanovis.cpp

@@ -2167 +2167 @@
 
     int status = TCL_OK;
-    int npass = 0;
 
     //
     //  Read and execute as many commands as we can from stdin...
     //
+    bool isComplete = false;
     while (status == TCL_OK) {
         //
@@ -2190 +2190 @@
             char ch;
             if (c <= 0) {
-                if (npass == 0) {
-                    DoExit(0);
-                } else {
+                if (errno == EWOULDBLOCK) {
                     break;
-                }
+                }
+                DoExit(0);
             }
             ch = (char)c;
             Tcl_DStringAppend(&cmdbuffer, &ch, 1);
-            if (ch=='\n' && Tcl_CommandComplete(Tcl_DStringValue(&cmdbuffer))) {
-                break;
+            if (ch == '\n') {
+                isComplete = Tcl_CommandComplete(Tcl_DStringValue(&cmdbuffer));
+                if (isComplete) {
+                    break;
+                }
             }
         }
@@ -2207 +2209 @@
         }
 
-        // back to original flags during command evaluation...
-        fcntl(0, F_SETFL, flags & ~O_NONBLOCK);
-        status = ExecuteCommand(interp, &cmdbuffer);
-        // non-blocking for next read -- we might not get anything
-        fcntl(0, F_SETFL, flags | O_NONBLOCK);
-        npass++;
+        if (isComplete) {
+            // back to original flags during command evaluation...
+            fcntl(0, F_SETFL, flags & ~O_NONBLOCK);
+            status = ExecuteCommand(interp, &cmdbuffer);
+            // non-blocking for next read -- we might not get anything
+            fcntl(0, F_SETFL, flags | O_NONBLOCK);
+            isComplete = false;
+        }
     }
     fcntl(0, F_SETFL, flags);