Changeset 4736 for branches/1.3/gui/scripts

Timestamp:

Nov 17, 2014 2:27:24 AM (10 years ago)

Author:

ldelgass

Message:

merge r4735 from trunk

Location:

branches/1.3

Files:

• . (modified) (1 prop)
• gui/scripts/vtkglyphviewer.tcl (modified) (2 diffs)
• gui/scripts/vtkisosurfaceviewer.tcl (modified) (6 diffs)
• gui/scripts/vtkvolumeviewer.tcl (modified) (4 diffs)

branches/1.3/gui/scripts/vtkglyphviewer.tcl

@@ -1750 +1750 @@
         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 }
@@ -1775 +1776 @@
     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

branches/1.3/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"

branches/1.3/gui/scripts/vtkvolumeviewer.tcl

@@ -1518 +1518 @@
         -color BCGYR
         -levels 6
-        -opacity 1.0
     }
     set tag $dataobj-$comp
@@ -1535 +1534 @@
     array set style $_style($tag)
 
-    set name "$style(-color):$style(-levels):$style(-opacity)"
+    set name "$style(-color):$style(-levels)"
     if { ![info exists _colormaps($name)] } {
         BuildColormap $name [array get style]
@@ -1557 +1556 @@
         set cmap "0.0 0.0 0.0 0.0 1.0 1.0 1.0 1.0"
     }
-    if { ![info exists _settings(-volumeopacity)] } {
-        set _settings(-volumeopacity) $style(-opacity)
-    }
-    set max $_settings(-volumeopacity)
+    set max 1.0
 
     set opaqueWmap "0.0 1.0 1.0 1.0"
@@ -2094 +2090 @@
 }
 
-itcl::body Rappture::VtkVolumeViewer::SetObjectStyle { dataobj comp } {
+itcl::body Rappture::VtkVolumeViewer::SetObjectStyle { dataobj cname } {
     # Parse style string.
-    set tag $dataobj-$comp
-    set style [$dataobj style $comp]
-    array set settings {
-        -color \#808080
-        -edges 0
-        -edgecolor black
-        -linewidth 1.0
-        -opacity 0.4
-        -wireframe 0
-        -lighting 1
-        -seeds 1
-        -seedcolor white
-        -visible 1
-    }
-    if { $dataobj != $_first } {
-        set settings(-opacity) 1
-    }
-    array set settings $style
-    SendCmd "volume add $tag"
+    set tag $dataobj-$cname
+    set style [$dataobj style $cname]
+    array set styles {
+        -lighting   1
+        -opacity    0.5
+        -outline    0
+        -visible    1
+    }
+    array set styles [$dataobj style $cname]
+    set _settings(-volumelighting) $styles(-lighting)
+    set _settings(-volumeoutline) $styles(-outline)
+    set _settings(-volumeopacity) [expr $styles(-opacity) * 100.0]
+    set _settings(-volumevisible) $styles(-visible)
+
+    SendCmd "outline add $tag"
+    SendCmd "outline visible $styles(-outline) $tag"
+
+    SendCmd "outline add $tag"
+    SendCmd "outline visible $styles(-outline) $tag"
+
     SendCmd "$_cutplaneCmd add $tag"
     SendCmd "$_cutplaneCmd visible 0 $tag"
 
-    SendCmd "volume lighting $settings(-lighting) $tag"
-    set _settings(-volumelighting) $settings(-lighting)
-    SetColormap $dataobj $comp
-    SendCmd "outline add $tag"
-    SendCmd "outline visible 0 $tag"
+    SendCmd "volume add $tag"
+    SendCmd "volume lighting $styles(-lighting) $tag"
+    SendCmd "volume opacity $styles(-opacity) $tag"
+    SendCmd "volume visible $styles(-visible) $tag"
+    SetColormap $dataobj $cname
 }