Changeset 3877 for branches/1.3/gui/scripts/field.tcl

Timestamp:

Aug 21, 2013 10:52:23 AM (11 years ago)

Author:

ldelgass

Message:

Merge from trunk

Location:

branches/1.3

Files:

• . (modified) (1 prop)
• gui/scripts/field.tcl (modified) (2 diffs)

branches/1.3/gui/scripts/field.tcl

@@ -868 +868 @@
             # off to the NanoVis visualizer.
             #
-            set _viewer "nanovis"
+            set _viewer "nanovis"
             set _dim 3
-            set _type "dx"
             set _comp2dims($cname) "3D"
-            set contents [$_field get -decode no $cname.$type]
-            if { $contents == "" } {
-                puts stderr "WARNING: no data for \"$_path.$cname.$type\""
-                continue;               # Ignore this component
-            }
-            set _comp2dx($cname) $contents
             if 0 {
-                set hdr "@@RP-ENC:zb64\n"
-                set data  [$_field get -decode no $cname.$type]
-                set data "$hdr$data"
-                set data  [Rappture::encoding::decode $data]
-                set data  [Rappture::DxToVtk $data]
-                set f [open /tmp/$_path.$cname.vtk "w"]
-                puts $f $data
-                close $f
+                set vtkdata  [$_field get -decode yes $cname.$type]
+                if { $vtkdata == "" } {
+                    puts stderr "WARNING: no data for \"$_path.$cname.$type\""
+                    continue;               # Ignore this component
+                }
+                set vtkdata  [Rappture::DxToVtk $vtkdata]
+                if 0 {
+                    set f [open /tmp/$_path.$cname.vtk "w"]
+                    puts $f $vtkdata
+                    close $f
+                }
+                ReadVtkDataSet $cname $vtkdata
+                set _type "vtk"
+                set _comp2vtk($cname) $vtkdata
+            } else {
+                set contents [$_field get -decode no $cname.$type]
+                if { $contents == "" } {
+                    puts stderr "WARNING: no data for \"$_path.$cname.$type\""
+                    continue;               # Ignore this component
+                }
+                set _type "dx"
+                set _comp2dx($cname) $contents
+            }
+            set viewer [$_field get "about.view"]
+            if { $viewer != "" } {
+                set _viewer $viewer
             }
             set _comp2style($cname) [$_field get $cname.style]
@@ -1508 +1519 @@
     }
     if { ![$mesh isvalid] } {
+        puts stderr "Mesh is invalid"
         return 0
     }
     set _dim [$mesh dimensions]
+    if { $_dim == 3 } {
+        set dim 0 
+        foreach axis {x y z} {
+            foreach {min max} [$mesh limits $axis] { 
+                if { $min < $max } {
+                    incr dim
+                }
+            }
+        }
+        if { $dim  != 3 } {
+            set _dim $dim
+        }
+    }
+        
     if {$_dim == 1} {
         # 1D data: Create vectors for graph widget.