Changeset 447 for trunk/gui/scripts/field.tcl

Timestamp:

May 29, 2006 7:59:02 PM (18 years ago)

Author:

mmc

Message:

Fixed the nanovisviewer so that it supports multiple volumes, and
so you can switch back and forth between volumes. Also, guarded
against lock-ups by sending volume data a chunk at a time and
updating events in between. That way, we can read results coming
back from the application, and avoid a deadlock where both client
and server are writing to a full buffer.

File:

• trunk/gui/scripts/field.tcl (modified) (7 diffs)

trunk/gui/scripts/field.tcl

@@ -41 +41 @@
     private variable _comp2xy    ;# maps component name => x,y vectors
     private variable _comp2vtk   ;# maps component name => vtkFloatArray
+    private variable _comp2dx    ;# maps component name => OpenDX data
     private variable _comp2style ;# maps component name => style settings
     private variable _comp2cntls ;# maps component name => x,y control points
@@ -161 +162 @@
         return [$mobj mesh]
     }
+    if {[info exists _comp2dx($what)]} {
+        return ""  ;# no mesh -- it's embedded in the value data
+    }
     error "bad option \"$what\": should be [join [lsort [array names _comp2dims]] {, }]"
 }
@@ -180 +184 @@
     if {[info exists _comp2vtk($what)]} {
         return [lindex $_comp2vtk($what) 1]  ;# return vtkFloatArray
+    }
+    if {[info exists _comp2dx($what)]} {
+        return $_comp2dx($what)  ;# return gzipped, base64-encoded DX data
     }
     error "bad option \"$what\": should be [join [lsort [array names _comp2dims]] {, }]"
@@ -237 +244 @@
             }
             2D - 3D {
-                foreach {xv yv} $_comp2vtk($comp) break
-                switch -- $which {
-                    x - xlin - xlog {
-                        foreach {vmin vmax} [$xv limits x] break
-                        set axis xaxis
-                    }
-                    y - ylin - ylog {
-                        foreach {vmin vmax} [$xv limits y] break
-                        set axis yaxis
-                    }
-                    z - zlin - zlog {
-                        foreach {vmin vmax} [$xv limits z] break
-                        set axis zaxis
-                    }
-                    v - vlin - vlog {
-                        catch {unset style}
-                        array set style $_comp2style($comp)
-                        if {[info exists style(-min)] && [info exists style(-max)]} {
-                            # This component has its own hard-coded
-                            # min/max range.  Ignore it for overall limits.
-                            set vmin $min
-                            set vmax $max
-                        } else {
-                            foreach {vmin vmax} [$yv GetRange] break
-                        }
-                        set axis vaxis
-                    }
-                    default {
-                        error "bad option \"$which\": should be x, xlin, xlog, y, ylin, ylog, v, vlin, vlog"
-                    }
+                if {[info exists _comp2vkt($comp)]} {
+                    foreach {xv yv} $_comp2vtk($comp) break
+                    switch -- $which {
+                        x - xlin - xlog {
+                            foreach {vmin vmax} [$xv limits x] break
+                            set axis xaxis
+                        }
+                        y - ylin - ylog {
+                            foreach {vmin vmax} [$xv limits y] break
+                            set axis yaxis
+                        }
+                        z - zlin - zlog {
+                            foreach {vmin vmax} [$xv limits z] break
+                            set axis zaxis
+                        }
+                        v - vlin - vlog {
+                            catch {unset style}
+                            array set style $_comp2style($comp)
+                            if {[info exists style(-min)] && [info exists style(-max)]} {
+                                # This component has its own hard-coded
+                                # min/max range.  Ignore it for overall limits.
+                                set vmin $min
+                                set vmax $max
+                            } else {
+                                foreach {vmin vmax} [$yv GetRange] break
+                            }
+                            set axis vaxis
+                        }
+                        default {
+                            error "bad option \"$which\": should be x, xlin, xlog, y, ylin, ylog, v, vlin, vlog"
+                        }
+                    }
+                } else {
+                    set vmin 0  ;# HACK ALERT! must be OpenDX data
+                    set vmax 1
+                    set axis vaxis
                 }
             }
@@ -392 +405 @@
     catch {unset _comp2xy}
     catch {unset _comp2vtk}
+    catch {unset _comp2dx}
     catch {unset _comp2dims}
     catch {unset _comp2style}
@@ -410 +424 @@
         } elseif {[$_field element $cname.vtk] != ""} {
             set type "vtk"
+        } elseif {[$_field element $cname.dx] != ""} {
+            set type "dx"
         }
 
@@ -550 +566 @@
             set _comp2dims($cname) "[$mobj dimensions]D"
             set _comp2vtk($cname) [list $mobj $farray]
+            set _comp2style($cname) [$_field get $cname.style]
+            incr _counter
+        } elseif {$type == "dx"} {
+            #
+            # HACK ALERT!  Extract gzipped, base64-encoded OpenDX
+            # data.  Assume that it's 3D.  Pass it straight
+            # off to the NanoVis visualizer.
+            #
+            set _comp2dims($cname) "3D"
+            set _comp2dx($cname) [$_field get $cname.dx]
             set _comp2style($cname) [$_field get $cname.style]
             incr _counter