Changeset 4537

Timestamp:

Jul 17, 2014 2:07:05 PM (10 years ago)

Author:

ldelgass

Message:

rename -surfaceoutline to -outline setting, since outline is of dataset, not
surface.

File:

• trunk/gui/scripts/vtksurfaceviewer.tcl (modified) (6 diffs)

trunk/gui/scripts/vtksurfaceviewer.tcl

@@ -215 +215 @@
         -surfacelighting                1
         -surfaceopacity                 100
-        -surfaceoutline                 0
+        -outline                        0
         -surfacevisible                 1
         -surfacewireframe               0
@@ -984 +984 @@
         $itk_component(field) value $_curFldLabel
     }
-    InitSettings -isolinesvisible -surfacevisible -surfaceoutline
+    InitSettings -isolinesvisible -surfacevisible -outline
     if { $_reset } {
         # These are settings that rely on a dataset being loaded.
@@ -1368 +1368 @@
             SendCmd "polydata edges $bool"
         }
-        "-surfaceoutline" {
+        "-outline" {
             set bool $_settings($what)
             SendCmd "outline visible $bool"
@@ -1551 +1551 @@
     checkbutton $inner.outline \
         -text "Outline" \
-        -variable [itcl::scope _settings(-surfaceoutline)] \
-        -command [itcl::code $this AdjustSetting -surfaceoutline] \
+        -variable [itcl::scope _settings(-outline)] \
+        -command [itcl::code $this AdjustSetting -outline] \
         -font "Arial 9"
 
@@ -1926 +1926 @@
     set _settings(-surfacevisible) $style(-surfacevisible)
  
-    SendCmd "polydata add $tag"
-    SendCmd "polydata edges $style(-edges) $tag"
-    SendCmd [list contour2d add contourlist $_contourList $tag]
-    SendCmd "contour2d colormode constant {} $tag"
-    SendCmd "contour2d color [Color2RGB $style(-isolinecolor)] $tag"
     SendCmd "outline add $tag"
     SendCmd "outline color [Color2RGB $itk_option(-plotforeground)] $tag"
     SendCmd "outline visible $style(-outline) $tag"
-    set _settings(-surfaceoutline) $style(-outline)
+    set _settings(-outline) $style(-outline)
+
+    SendCmd "polydata add $tag"
+    SendCmd "polydata edges $style(-edges) $tag"
     set _settings(-surfaceedges) $style(-edges)
     #SendCmd "polydata color [Color2RGB $settings(-color)] $tag"
@@ -1946 +1944 @@
     SendCmd "polydata wireframe $style(-wireframe) $tag"
     set _settings(-surfacewireframe) $style(-wireframe)
+
+    SendCmd [list contour2d add contourlist $_contourList $tag]
+    SendCmd "contour2d colormode constant {} $tag"
+    SendCmd "contour2d color [Color2RGB $style(-isolinecolor)] $tag"
 }