Changeset 1985 for branches/blt4

Timestamp:

Dec 8, 2010 2:47:15 PM (14 years ago)

Author:

gah

Message:

 

Location:

branches/blt4/gui/scripts

Files:

• datatableresult.tcl (modified) (2 diffs)
• heightmapviewer.tcl (modified) (6 diffs)

branches/blt4/gui/scripts/datatableresult.tcl

@@ -244 +244 @@
                         set dlist [linsert $dlist 0 $dataobj]
                     }
-
                     # generate the comma-separated value data for these objects
+
+                    # This is at least better than what was there.
+                    # For each datatable object convert the values 
+                    # in the tree by loading it into a blt::datatable
+                    # and then exporting the comma separated values
                     set csvdata ""
                     foreach dataobj $dlist {
+                        set tree [$dataobj values]
+                        set d0 [blt::datatable create]
+                        package require blt_datatable_tree
+                        $d0 import tree $tree 0 
                         append csvdata "[string repeat - 60]\n"
                         append csvdata " [$dataobj hints label]\n"
@@ -259 +267 @@
                         }
                         append csvdata "[string repeat - 60]\n"
-
-                        append csvdata "[$dataobj hints xlabel], [$dataobj hints ylabel]\n"
-                        set first 1
-                        foreach comp [$dataobj components] {
-                            if {!$first} {
-                                # blank line between components
-                                append csvdata "\n"
-                            }
-                            set xv [$dataobj mesh $comp]
-                            set yv [$dataobj values $comp]
-                            foreach x [$xv values] y [$yv values] {
-                                append csvdata [format "%20.15g, %20.15g\n" $x $y]
-                            }
-                            set first 0
-                        }
+                        append csvdata [$d0 export csv -columnlabels]
                         append csvdata "\n"
+                        blt::datatable destroy $d0
                     }
                     return [list .txt $csvdata]

branches/blt4/gui/scripts/heightmapviewer.tcl

@@ -103 +103 @@
     private variable _resizePending 0
     private variable _resizeLegendPending 0
+    private variable _frame 0;          # Current frame number. 
 }
 
@@ -508 +509 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::HeightmapViewer::Connect {} {
+    global readyForNextFrame
+    set readyForNextFrame 1
     Disconnect
     set _hosts [GetServerList "nanovis"]
@@ -529 +532 @@
     set _outbuf ""
     # disconnected -- no more data sitting on server
+    global readyForNextFrame
+    set readyForNextFrame 1
 }
 
@@ -557 +562 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::HeightmapViewer::ReceiveImage { args } {
+    global readyForNextFrame
+    set readyForNextFrame 1
     if {![IsConnected]} {
         return
@@ -565 +572 @@
     array set info $args
     set bytes [ReceiveBytes $info(-bytes)]
-    ReceiveEcho <<line "<read $info(-bytes) bytes"
+    ReceiveEcho <<line "<read $info(-bytes) bytes args=$args"
+ puts stderr "<read $info(-bytes) bytes"
     if { $info(-type) == "image" } {
         $_image(plot) configure -data $bytes
         ReceiveEcho <<line "<read for [image width $_image(plot)]x[image height $_image(plot)] image>"
+ puts stderr "<read for [image width $_image(plot)]x[image height $_image(plot)] image>"
     } elseif { $info(type) == "print" } {
         set tag $this-print-$info(-token)
@@ -727 +736 @@
     SendBytes $_outbuf;                 
     blt::busy release $itk_component(hull)
+
+    # The "readyForNextFrame" variable throttles the sequence play rate.
+    global readyForNextFrame
+    set readyForNextFrame 0;            # Don't advance to the next frame
+                                        # until we get an image.
     set _buffering 0;                   # Turn off buffering.
     set _outbuf "";                     # Clear the buffer.