Changeset 3544 for trunk/gui/scripts

Timestamp:

Mar 19, 2013, 6:48:23 PM (11 years ago)

Author:

ldelgass

Message:

Switch clients to use new outline command in vtkvis.

Location:

trunk/gui/scripts

Files:

• vtkheightmapviewer.tcl (modified) (4 diffs)
• vtkisosurfaceviewer.tcl (modified) (3 diffs)

trunk/gui/scripts/vtkheightmapviewer.tcl

@@ -1040 +1040 @@
         #
         SendCmd "axis color all [Color2RGB $itk_option(-plotforeground)]"
-        SendCmd "dataset color [Color2RGB $itk_option(-plotforeground)]"
+        SendCmd "outline color [Color2RGB $itk_option(-plotforeground)]"
         ResetAxes
         set q [list $_view(qw) $_view(qx) $_view(qy) $_view(qz)]
@@ -1586 +1586 @@
         "outline" {
             if { $_settings(isHeightmap) } {
-                SendCmd "dataset outline 0"
+                SendCmd "outline visible 0"
             } else {
                 set _settings(saveOutline) $_settings(outline)
                 set bool $_settings(outline)
-                SendCmd "dataset outline $bool"
+                SendCmd "outline visible $bool"
             }
         }
@@ -1765 +1765 @@
     if { [isconnected] } {
         set rgb [Color2RGB $itk_option(-plotforeground)]
-        SendCmd "dataset color $rgb"
+        SendCmd "outline color $rgb"
         SendCmd "axis color all $rgb"
     }
@@ -2253 +2253 @@
         DrawLegend
     }
-    SendCmd "dataset outline $_settings(outline) $tag"
-    SendCmd "dataset color [Color2RGB $itk_option(-plotforeground)] $tag"
+    SendCmd "outline add $tag"
+    SendCmd "outline color [Color2RGB $itk_option(-plotforeground)] $tag"
+    SendCmd "outline visible $_settings(outline) $tag"
     set scale [GetHeightmapScale]
     SendCmd "heightmap add numcontours $_currentNumIsolines $scale $tag"

trunk/gui/scripts/vtkisosurfaceviewer.tcl

@@ -1445 +1445 @@
         "isosurfaceOutline" {
             set bool $_settings(isosurfaceOutline)
-            SendCmd "dataset outline $bool"
+            SendCmd "outline visible $bool"
         }
         "isolineColor" {
@@ -1561 +1561 @@
         set rgb [Color2RGB $itk_option(-plotforeground)]
         SendCmd "axis color all $rgb"
-        SendCmd "dataset color $rgb"
+        SendCmd "outline color $rgb"
         SendCmd "cutplane ccolor $rgb"
     }
@@ -2177 +2177 @@
     SendCmd [list contour3d add contourlist $_contourList $tag]
     SendCmd "contour3d edges $style(-edges) $tag"
-    SendCmd "dataset outline $style(-outline) $tag"
-    SendCmd "dataset color [Color2RGB $itk_option(-plotforeground)]"
+    SendCmd "outline add $tag"
+    SendCmd "outline color [Color2RGB $itk_option(-plotforeground)] $tag"
+    SendCmd "outline visible $style(-outline) $tag"
     set _settings(isosurfaceOutline) $style(-outline)
     set _settings(isosurfaceEdges) $style(-edges)