Changeset 3557

Timestamp:

Mar 22, 2013, 7:04:43 PM (12 years ago)

Author:

gah

Message:

Bug: don't override user selected viewer in field

Location:

trunk/gui/scripts

Files:

• field.tcl (modified) (10 diffs)
• mesh.tcl (modified) (2 diffs)
• nanovisviewer.tcl (modified) (1 diff)

trunk/gui/scripts/field.tcl

@@ -817 +817 @@
             set _comp2dx($cname)  [$_fldObj get -decode no $cname.dx]
             if 0 {
-                set data  [$_fldObj get -decode yes $cname.dx]
-                set file "/tmp/junk.dx"
-                set f [open $file "w"]
+                set hdr "@@RP-ENC:zb64\n"
+                set data  [$_fldObj get -decode no $cname.dx]
+                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
-                if { [string match "<ODX>*" $data] } {
-                    set data [string range $data 5 end]
-                    set _comp2dx($cname) \
-                        [Rappture::encoding::encode -as zb64 $data]
-                } 
             }
             set _comp2style($cname) [$_fldObj get $cname.style]
@@ -1058 +1056 @@
         }
         "dx" {
-            return [Rappture::ConvertDxToVtk $_comp2dx($cname)]
+            return [Rappture::DxToVtk $_comp2dx($cname)]
         }
         default {
@@ -1209 +1207 @@
     # DX: Convert DX to VTK 
     if {[info exists _comp2dx($cname)]} {
-        return [Rappture::ConvertDxToVtk $_comp2dx($cname)]
+        return [Rappture::DxToVtk $_comp2dx($cname)]
     }
     # Unirect3d: isosurface 
@@ -1230 +1228 @@
         append out [$mesh vtkdata]
         append out "POINT_DATA [$vector length]\n"
-        append out "SCALARS $label double\n"
+        append out "SCALARS $label double 1\n"
         append out "LOOKUP_TABLE default\n"
         append out "[$vector range 0 end]\n"
@@ -1255 +1253 @@
         return
     }
+    set _viewer [$_fldObj get "about.view"]
     set element [$_xmlobj element -as type $path]
     set name $cname
@@ -1276 +1275 @@
         }
         set _dim 3
-        set _viewer flowvis
+        if { $_viewer == "" } {
+            set _viewer flowvis
+        }
         set _comp2dims($cname) "3D"
         set _comp2unirect3d($cname) \
@@ -1296 +1297 @@
         }
         set _dim 2
-        set _viewer "flowvis"
+        if { $_viewer == "" } {
+            set _viewer "flowvis"
+        }
         set _comp2dims($cname) "2D"
         set _comp2unirect2d($cname) \
@@ -1317 +1320 @@
         return
     }
-    set _viewer "contour"
     switch -- $element {
         "cloud" {
@@ -1326 +1328 @@
         }           
         "unirect2d" {
+            if { $_viewer == "" } {
+                set _viewer "heightmap"
+            }
             set mesh [Rappture::Unirect2d::fetch $_xmlobj $path]
-            set _viewer "heightmap"
         }
     }
@@ -1382 +1386 @@
             $farray InsertNextValue $v
         }
-        set _viewer "isosurface"
+        if { $_viewer == "" } {
+            set _viewer "isosurface"
+        }
         set _type "isosurface"
         set vector [blt::vector create \#auto]

trunk/gui/scripts/mesh.tcl

@@ -533 +533 @@
             append out "DATASET STRUCTURED_POINTS\n"
             append out "DIMENSIONS $xNum $yNum 1\n"
+            append out "ORIGIN $xMin $yMin 0\n"
             append out "SPACING $xSpace $ySpace 0\n"
-            append out "ORIGIN $xMin $yMin 0\n"
             set _vtkdata $out
             foreach axis {x y} {
@@ -543 +543 @@
             set ySpace [expr ($yMax - $yMin) / double($yNum - 1)]
             set zSpace [expr ($zMax - $zMin) / double($zNum - 1)]
-            set _numPoints [expr $xNum * $yNum * zNum]
+            set _numPoints [expr $xNum * $yNum * $zNum]
             append out "DATASET STRUCTURED_POINTS\n"
             append out "DIMENSIONS $xNum $yNum $zNum\n"
+            append out "ORIGIN $xMin $yMin $zMin\n"
             append out "SPACING $xSpace $ySpace $zSpace\n"
-            append out "ORIGIN $xMin $yMin $zMin\n"
             set _vtkdata $out
             foreach axis {x y z} {

trunk/gui/scripts/nanovisviewer.tcl

@@ -894 +894 @@
             if { ![info exists _serverDatasets($tag)] } {
                 # Send the data as one huge base64-encoded mess -- yuck!
-                set data [$dataobj values $cname]
+                if { [$dataobj type] == "dx" } {
+                    set data [$dataobj values $cname]
+                } else {
+                    set data [$dataobj vtkdata $cname]
+                    if 0 {
+                        set f [open "/tmp/volume.vtk" "w"]
+                        puts $f $data
+                        close $f
+                    }
+                }
                 set nbytes [string length $data]
                 if { $_reportClientInfo }  {