Changeset 4735 for trunk/gui/scripts

Timestamp:

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

Author:

ldelgass

Message:

Try to keep style names more consistent.

Location:

trunk/gui/scripts

Files:

• vtkglyphviewer.tcl (modified) (2 diffs)
• vtkisosurfaceviewer.tcl (modified) (6 diffs)
• vtkvolumeviewer.tcl (modified) (1 diff)

trunk/gui/scripts/vtkglyphviewer.tcl

@@ -1856 +1856 @@
         0,0 $inner.view_l -anchor e -pady 2 \
         0,1 $inner.view -anchor w -pady 2
+    blt::table configure $inner r0 -resize none
 
     set labels { qx qy qz qw xpan ypan zoom }
@@ -1881 +1882 @@
     incr row
 
-    blt::table configure $inner c* r* -resize none
+    blt::table configure $inner c* -resize none
     blt::table configure $inner c2 -resize expand
     blt::table configure $inner r$row -resize expand

trunk/gui/scripts/vtkisosurfaceviewer.tcl

@@ -1829 +1829 @@
         0,0 $inner.view_l -anchor e -pady 2 \
         0,1 $inner.view -anchor w -pady 2
+    blt::table configure $inner r0 -resize none
 
     set labels { qx qy qz qw xpan ypan zoom }
@@ -1854 +1855 @@
     incr row
 
-    blt::table configure $inner c* r* -resize none
+    blt::table configure $inner c* -resize none
     blt::table configure $inner c2 -resize expand
     blt::table configure $inner r$row -resize expand
@@ -2128 +2129 @@
         -edgecolor              black
         -edges                  0
-        -isosurfaceopacity      0.6
         -isosurfacevisible      1
         -levels                 10
         -lighting               1
         -linewidth              1.0
+        -opacity                0.6
         -outline                0
         -wireframe              0
@@ -2144 +2145 @@
     array set style [$dataobj style $comp]
     if { $dataobj != $_first || $style(-levels) == 1 } {
-        set style(-isosurfaceopacity) 1.0
+        set style(-opacity) 1.0
     }
 
@@ -2157 +2158 @@
 
     if { $_changed(-isosurfaceopacity) } {
-        set style(-isosurfaceopacity) $_settings(-isosurfaceopacity)
+        set style(-opacity) $_settings(-isosurfaceopacity)
     }
     if { $_changed(-numcontours) } {
@@ -2206 +2207 @@
     SendCmd "contour3d linecolor [Color2RGB $style(-edgecolor)] $tag"
     SendCmd "contour3d linewidth $style(-linewidth) $tag"
-    SendCmd "contour3d opacity $style(-isosurfaceopacity) $tag"
-    set _settings(-isosurfaceopacity) $style(-isosurfaceopacity)
+    SendCmd "contour3d opacity $style(-opacity) $tag"
+    set _settings(-isosurfaceopacity) $style(-opacity)
     SetCurrentColormap $style(-color) 
     SendCmd "contour3d wireframe $style(-wireframe) $tag"

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"
 }