Changeset 4351 for branches/1.3/gui/scripts

Timestamp:

Apr 29, 2014 9:28:09 AM (10 years ago)

Author:

gah

Message:

bug fix: -isosurfacevisible sets all surfaces to visible

Location:

branches/1.3/gui/scripts

Files:

• vtkisosurfaceviewer.tcl (modified) (10 diffs)
• vtkvolumeviewer.tcl (modified) (1 diff)

branches/1.3/gui/scripts/vtkisosurfaceviewer.tcl

@@ -1 +1 @@
 # -*- mode: tcl; indent-tabs-mode: nil -*- 
-
-# ----------------------------------------------------------------------
-#  COMPONENT: vtkisolinesviewer - Vtk 3D contour object viewer
+# ----------------------------------------------------------------------
+#  COMPONENT: vtkisosurfaceviewer - Vtk 3D contour object viewer
 #
 #  It connects to the Vtk server running on a rendering farm,
@@ -223 +222 @@
 
     array set _settings {
+        -axesvisible                    1
+        -axislabelsvisible              1
         -background                     black
         -colormap                       BCGYR
         -colormapvisible                1
-        -field                          "Default"
-        -isolinecolor                   white
-        -axesvisible                    1
-        -axislabelsvisible              1
         -cutplaneedges                  0
         -cutplanelighting               1
@@ -236 +233 @@
         -cutplanesvisible               0
         -cutplanewireframe              0
+        -field                          "Default"
+        -isolinecolor                   white
         -isosurfaceedges                0
         -isosurfacelighting             1
@@ -356 +355 @@
     pack $itk_component(cutplane) -padx 2 -pady 2
 
+
     if { [catch {
         BuildIsosurfaceTab
@@ -969 +969 @@
     }
     set _first ""
-    SendCmd "dataset visible 0"
+    SendCmd "contour3d visible 0"
     foreach dataobj [get -objects] {
         if { [info exists _obj2ovride($dataobj-raise)] &&  $_first == "" } {
@@ -1005 +1005 @@
                 # Setting dataset visible enables outline
                 # and contour3d
-                SendCmd "dataset visible 1 $tag"
+                SendCmd "contour3d visible 1 $tag"
             }
         }
@@ -1419 +1419 @@
         "-isosurfacevisible" {
             set bool $_settings($what)
-            SendCmd "contour3d visible $bool"
+            SendCmd "contour3d visible 0"
+            if { $bool } {
+                foreach tag [CurrentDatasets -visible] {
+                    SendCmd "contour3d visible $bool $tag"
+                }
+            }
             if { $bool } {
                 Rappture::Tooltip::for $itk_component(contour) \
@@ -1469 +1474 @@
             }
             SendCmd "dataset scalar $_curFldName"
-            SendCmd "dataset maprange explicit $_limits($_curFldName) $_curFldName"
+            if { ![info exists _limits($_curFldName)] } {
+                SendCmd "dataset maprange all"
+            } else {
+                SendCmd "dataset maprange explicit $_limits($_curFldName) $_curFldName"
+            }
             SendCmd "cutplane colormode $_colorMode $_curFldName"
             SendCmd "contour3d colormode $_colorMode $_curFldName"
@@ -2109 +2118 @@
     array set style {
         -color BCGYR
+        -cutplanesvisible 0 
+        -edgecolor black
         -edges 0
-        -edgecolor black
+        -isosurfacevisible 1
+        -levels 10
+        -lighting 1
         -linewidth 1.0
         -opacity 0.6
+        -outline 0
         -wireframe 0
-        -lighting 1
-        -outline 0
-        -levels 10
-        -cutplanesvisible 0 
+        -xcutplaneposition 50
         -xcutplanevisible 1
+        -ycutplaneposition 50
         -ycutplanevisible 1
+        -zcutplaneposition 50
         -zcutplanevisible 1
-        -xcutplaneposition 50
-        -ycutplaneposition 50
-        -zcutplaneposition 50
-        -isosurfacevisible 1
     }
     array set style [$dataobj style $comp]
@@ -2378 +2387 @@
         # If there's a legend title, create a text item for the title.
         $c create text $x $y \
-                -anchor ne \
-                -fill $itk_option(-plotforeground) -tags "title legend" \
-                -font $font 
-            incr y $lineht
+            -anchor ne \
+            -fill $itk_option(-plotforeground) -tags "title legend" \
+            -font $font 
+        if { $title != "" } {
+            incr y $lineht
+        }
         $c create text $x $y \
             -anchor ne \

branches/1.3/gui/scripts/vtkvolumeviewer.tcl

@@ -2254 +2254 @@
             set x [expr $x1 + [winfo rootx $itk_component(view)]]
             set y [expr $y2 + [winfo rooty $itk_component(view)]]
-            #puts stderr "combo x=$x y=$y"
             tk_popup $itk_component(fieldmenu) $x $y
         }