Changeset 2736

Timestamp:

Dec 27, 2011 8:55:00 AM (11 years ago)

Author:

gah

Message:

 

Location:

trunk/gui/scripts

Files:

• field.tcl (modified) (2 diffs)
• resultviewer.tcl (modified) (1 diff)
• sequenceresult.tcl (modified) (1 diff)
• vtkheightmapviewer.tcl (modified) (7 diffs)

trunk/gui/scripts/field.tcl

@@ -696 +696 @@
                 set element [$_xmlobj element -as type $path]
                 if { $element == "unirect2d" } {
-                    global env
                     set _comp2dims($cname) "2D"
                     set _comp2unirect2d($cname) \
@@ -702 +701 @@
                              $extents]
                     set _comp2style($cname) [$_field get $cname.style]
-                    if { [info exists env(VTKHEIGHTMAP)] } {
-                        set type "vtkheightmap"
-                    } else {
                     if {[$_field element $cname.flow] != ""} {
                         set _comp2flowhints($cname) \
                             [Rappture::FlowHints ::\#auto $_field $cname $_units]
                     }
-                    }
                     incr _counter
                 } elseif { $element == "unirect3d" } {

trunk/gui/scripts/resultviewer.tcl

@@ -266 +266 @@
                             if { [$dataobj hints type] == "contour" } {
                                 set resultMode "vtkcontour" 
+                            } elseif { [info exists env(VTKHEIGHTMAP)] } {
+                                set resultMode "vtkheightmap"
                             } else {
-                                set resultMode "vtkheightmap"
+                                set resultMode "heightmap"
                             }
                         } else {

trunk/gui/scripts/sequenceresult.tcl

@@ -471 +471 @@
                     2D {
                         if { [$dataobj isunirect2d] } {
+                            global env
                             if { [$dataobj hints type] == "contour" } {
                                 set mode "vtkcontour" 
+                            } elseif { [info exists env(VTKHEIGHTMAP)] } {
+                                set resultMode "vtkheightmap"
                             } else {
-                                set mode "vtkheightmap"
+                                set resultMode "heightmap"
                             }
                         } else {

trunk/gui/scripts/vtkheightmapviewer.tcl

@@ -228 +228 @@
         xpan            0
         ypan            0
-        ortho           0
+        ortho           1
     }
     set _arcball [blt::arcball create 100 100]
@@ -993 +993 @@
     #
     set q [list $_view(qw) $_view(qx) $_view(qy) $_view(qz)]
-    $_arcball quaternion $q
-    if {$_view(ortho)} {
+    $_arcball quaternion $q 
+    SendCmd "camera mode persp"
+   if {$_view(ortho)} {
         SendCmd "camera mode ortho"
     } else {
@@ -1021 +1022 @@
             if { ![info exists _datasets($tag)] } {
                 set bytes [ConvertToVtkData $dataobj $comp]
-                puts stderr contents=$bytes
+                puts stderr [GetVtkData]
                 set length [string length $bytes]
                 append _outbuf "dataset add $tag data follows $length\n"
@@ -1082 +1083 @@
         }
         foreach { name title units } [$_first hints scalars] {
+            set _scalarFields($title) $name
+            $itk_component(field) choices insert end "$name" "$title"
+            $itk_component(fieldmenu) add radiobutton -label "$title" \
+                -value $title -variable [itcl::scope _currentField] \
+                -selectcolor red \
+                -activebackground black \
+                -activeforeground white \
+                -font "Arial 8" \
+                -command [itcl::code $this Combo invoke]
+            set _fields($name) [list $title $units]
+        }
+        foreach { name title units } { default Default ??? } {
             set _scalarFields($title) $name
             $itk_component(field) choices insert end "$name" "$title"
@@ -2331 +2344 @@
     append out "SPACING 1 1 1 \n"
     append out "POINT_DATA [expr $xN * $yN] \n"
-    append out "SCALARS field float 1 \n"
+    append out "SCALARS default float 1 \n"
     append out "LOOKUP_TABLE default \n"
     append out [join $values "\n"]
@@ -2345 +2358 @@
             set tag $dataobj-$comp
             set contents [ConvertToVtkData $dataobj $comp]
-            puts stderr contents=$contents
             #set contents [$dataobj vtkdata $comp]
             append bytes "$contents\n\n"
@@ -2423 +2435 @@
     array set settings $style
     SendCmd "heightmap add $tag"
-    SendCmd "cutplane add $tag"
-    SendCmd "cutplane edges 0 $tag"
-    SendCmd "cutplane wireframe 0 $tag"
-    SendCmd "cutplane lighting 1 $tag"
-    SendCmd "cutplane linewidth 1 $tag"
+    #SendCmd "cutplane add $tag"
+    #SendCmd "cutplane edges 0 $tag"
+    #SendCmd "cutplane wireframe 0 $tag"
+    #SendCmd "cutplane lighting 1 $tag"
+    #SendCmd "cutplane linewidth 1 $tag"
     #SendCmd "cutplane linecolor 1 1 1 $tag"
     #SendCmd "cutplane visible $tag"
     foreach axis { x y z } {
-        SendCmd "cutplane slice $axis 1.0 $tag"
-        SendCmd "cutplane axis $axis 0 $tag"
+        #SendCmd "cutplane slice $axis 1.0 $tag"
+        #SendCmd "cutplane axis $axis 0 $tag"
     }