Changeset 4391 for branches/1.3

Timestamp:

Jun 17, 2014, 3:13:44 PM (10 years ago)

Author:

gah

Message:

fix for extra outlines, cutplanes

Location:

branches/1.3/gui/scripts

Files:

• visviewer.tcl (modified) (1 diff)
• vtkisosurfaceviewer.tcl (modified) (5 diffs)

branches/1.3/gui/scripts/visviewer.tcl

@@ -1100 +1100 @@
 # StopBufferingCommands --
 #
+#       This gets called when we want to stop buffering the commands for
+#       the server and actually send then to the server.  Note that there's
+#       a reference count on buffering.  This is so that you can can
+#       Start/Stop multiple times without worrying about the current state.
+#
 itcl::body Rappture::VisViewer::StopBufferingCommands { } {
     incr _buffering -1

branches/1.3/gui/scripts/vtkisosurfaceviewer.tcl

@@ -1003 +1003 @@
             lappend _obj2datasets($dataobj) $tag
             if { [info exists _obj2ovride($dataobj-raise)] } {
-                # Setting dataset visible enables outline
-                # and contour3d
                 SendCmd "contour3d visible 1 $tag"
             }
@@ -1070 +1068 @@
         set _reset 0
     }
+    # Redraw the legend even if we're using the same colormap. The position
+    # of the isolines may have changed because the range of data changed.
+    DrawLegend
 
     # Actually write the commands to the server socket.  If it fails, we don't
@@ -1348 +1349 @@
         "-cutplanesvisible" {
             set bool $_settings($what)
-            SendCmd "cutplane visible $bool"
+            SendCmd "cutplane visible 0"
+            if { $bool } {
+                foreach tag [CurrentDatasets -visible] {
+                    SendCmd "cutplane visible $bool $tag"
+                }
+            }
+            if { $bool } {
+                Rappture::Tooltip::for $itk_component(cutplane) \
+                    "Hide the cutplanes"
+            } else {
+                Rappture::Tooltip::for $itk_component(cutplane) \
+                    "Show the cutplanes"
+            }
         }
         "-cutplanewireframe" {
@@ -1432 +1445 @@
                     "Show the isosurface"
             }
-            DrawLegend
         }
         "-isosurfacelighting" {
@@ -1444 +1456 @@
         "-isosurfaceoutline" {
             set bool $_settings($what)
-            SendCmd "outline visible $bool"
+            SendCmd "outline visible 0"
+            if { $bool } {
+                foreach tag [CurrentDatasets -visible] {
+                    SendCmd "outline visible $bool $tag"
+                }
+            }
+            if { $bool } {
+                Rappture::Tooltip::for $itk_component(contour) \
+                    "Hide the isosurface"
+            } else {
+                Rappture::Tooltip::for $itk_component(contour) \
+                    "Show the isosurface"
+            }
         }
         "-isolinecolor" {