Changeset 4735 for trunk/gui/scripts/vtkvolumeviewer.tcl

Timestamp:

Nov 17, 2014, 1:56:13 AM (10 years ago)

Author:

ldelgass

Message:

Try to keep style names more consistent.

File:

• trunk/gui/scripts/vtkvolumeviewer.tcl (modified) (1 diff)

trunk/gui/scripts/vtkvolumeviewer.tcl

@@ -2232 +2232 @@
     set tag $dataobj-$cname
     array set styles {
-        -color BCGYR
-        -volumelighting         1
-        -volumeoutline          0
-        -volumevisible          1
+        -color      BCGYR
+        -lighting   1
+        -outline    0
+        -visible    1
     }
     array set styles [$dataobj style $cname]
-    SendCmd "volume add $tag"
-    set _settings($cname-volumelighting)        $styles(-volumelighting)
-    set _settings($cname-volumeoutline)         $styles(-volumeoutline)
-    set _settings($cname-volumevisible)         $styles(-volumevisible)
+    set _settings($cname-volumelighting)        $styles(-lighting)
+    set _settings($cname-volumeoutline)         $styles(-outline)
+    set _settings($cname-volumevisible)         $styles(-visible)
 
     $itk_component(colormap) value $styles(-color)
+
+    SendCmd "outline add $tag"
+    SendCmd "outline visible $styles(-outline) $tag"
 
     SendCmd "$_cutplaneCmd add $tag"
     SendCmd "$_cutplaneCmd visible 0 $tag"
-    SendCmd "volume lighting $styles(-volumelighting) $tag"
+
+    SendCmd "volume add $tag"
+    SendCmd "volume lighting $styles(-lighting) $tag"
+    SendCmd "volume visible $styles(-visible) $tag"
+
     SetInitialTransferFunction $dataobj $cname
     SendCmd "volume colormap $cname $tag"
     SendCmd "$_cutplaneCmd colormap $cname-opaque $tag"
-    SendCmd "outline add $tag"
-    SendCmd "outline visible $styles(-volumeoutline) $tag"
 }