Changeset 4774 for branches/1.3/gui/scripts

Timestamp:

Nov 23, 2014 8:59:51 AM (10 years ago)

Author:

ldelgass

Message:

Merge some changes from trunk (mostly still unused)

File:

• branches/1.3/gui/scripts/vtkvolumeviewer.tcl (modified) (15 diffs)

branches/1.3/gui/scripts/vtkvolumeviewer.tcl

@@ -61 +61 @@
     }
     public method scale {args}
+
+    private method GetDatasetsWithComponent { cname } 
+
+    private variable _volcomponents   ; # Array of components found 
+    private variable _componentsList   ; # List of component names
 
     # The following methods are only used by this class.
@@ -146 +151 @@
     private variable _curFldName ""
     private variable _curFldLabel ""
-    private variable _colorMode "vmag";#  Mode of colormap (vmag or scalar)
+    private variable _colorMode "scalar"; #  Mode of colormap (vmag or scalar)
     private variable _cutplaneCmd "cutplane"
+    private variable _allowMultiComponent 0
 }
 
@@ -222 +228 @@
         -axisminorticks                 1
         -background                     black
+        -color                          BCGYR
         -cutplanelighting               1
         -cutplaneopacity                100
@@ -642 +649 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::VtkVolumeViewer::scale {args} {
+    array unset _limits
+    array unset _volcomponents
+    set _componentsList ""
+
     foreach dataobj $args {
         if { ![$dataobj isvalid] } {
             continue;                     # Object doesn't contain valid data.
         }
+        # Determine limits for each axis.
         foreach axis { x y z } {
             set lim [$dataobj limits $axis]
@@ -662 +674 @@
             set _limits($axis) [list $amin $amax]
         }
+        # Determine limits for each field.
         foreach { fname lim } [$dataobj fieldlimits] {
             if { ![info exists _limits($fname)] } {
@@ -676 +689 @@
             }
             set _limits($fname) [list $fmin $fmax]
+        }
+        # Get limits for each component.
+        foreach cname [$dataobj components] {
+            if { ![info exists _volcomponents($cname)] } {
+                lappend _componentsList $cname
+            }
+            lappend _volcomponents($cname) $dataobj-$cname
+            array unset limits
+            array set limits [$dataobj valueLimits $cname]
+            if { ![info exists _limits($cname)] } {
+                set _limits($cname) $limits(v)
+                continue
+            }
+            foreach {min max} $limits(v) break
+            foreach {vmin vmax} $_limits($cname) break
+            if { $vmin > $min } {
+                set vmin $min
+            }
+            if { $vmax < $max } {
+                set vmax $max
+            }
+            set _limits($cname) [list $vmin $vmax]
         }
     }
@@ -1031 +1066 @@
                     [$_first fieldinfo $fname] break
                 # Only scalar fields are valid
-                if {$components == 1} {
+                if {$_allowMultiComponent || $components == 1} {
                     $itk_component(field) choices insert end "$fname" "$label"
                     $itk_component(fieldmenu) add radiobutton -label "$label" \
@@ -1051 +1086 @@
     }
 
-    InitSettings -volumepalette \
+    InitSettings -color \
         -volumematerial \
         -volumelighting -volumeopacity -volumequality -volumeoutline -volumevisible \
@@ -1442 +1477 @@
             set _cutplanePending 0
         }
-        "-volumepalette" {
-            set palette [$itk_component(palette) value]
-            set _settings($what) $palette
+        "-color" {
+            set color [$itk_component(colormap) value]
+            set _settings($what) $color
             foreach dataset [CurrentDatasets -visible $_first] {
                 foreach {dataobj comp} [split $dataset -] break
-                ChangeColormap $dataobj $comp $palette
+                ChangeColormap $dataobj $comp $color
             }
             set _legendPending 1
@@ -1457 +1492 @@
             if { [info exists _fields($fname)] } {
                 foreach { label units components } $_fields($fname) break
-                if { $components > 1 } {
+                if { !$_allowMultiComponent && $components > 1 } {
                     puts stderr "Can't use a vector field in a volume"
                     return
                 } else {
-                    set _colorMode scalar
+                    if { $components > 1 } {
+                        set _colorMode vmag
+                    } else {
+                        set _colorMode scalar
+                    }
                 }
                 set _curFldName $fname
@@ -1470 +1509 @@
             }
             foreach dataset [CurrentDatasets -visible $_first] {
-                #SendCmd "volume colormode $_colorMode ${fname} $dataset"
-                SendCmd "$_cutplaneCmd colormode $_colorMode ${fname} $dataset"
+                #SendCmd "$_cutplaneCmd colormode $_colorMode $_curFldName $dataset"
+                SendCmd "dataset scalar $_curFldName $dataset"
             }
             SendCmd "camera reset"
@@ -1503 +1542 @@
         if { [info exists _dataset2style($dataset)] } {
             SendCmdNoWait \
-                "legend $_dataset2style($dataset) $_colorMode $_curFldName {} $w $h 0"
+                "legend2 $_dataset2style($dataset) $w $h"
+                #"legend $_dataset2style($dataset) $_colorMode $_curFldName {} $w $h 0"
             break;
         }
@@ -1709 +1749 @@
         [itcl::code $this AdjustSetting -field]
 
-    label $inner.palette_l -text "Palette" -font $font
-    itk_component add palette {
-        Rappture::Combobox $inner.palette -editable no
-    }
-    $inner.palette choices insert end [GetColormapList]
-    $itk_component(palette) value "BCGYR"
-    bind $inner.palette <<Value>> \
-        [itcl::code $this AdjustSetting -volumepalette]
+    label $inner.colormap_l -text "Colormap" -font $font
+    itk_component add colormap {
+        Rappture::Combobox $inner.colormap -editable no
+    }
+    $inner.colormap choices insert end [GetColormapList]
+    bind $inner.colormap <<Value>> \
+        [itcl::code $this AdjustSetting -color]
+    $itk_component(colormap) value $_settings(-color)
 
     blt::table $inner \
@@ -1730 +1770 @@
         6,0 $inner.quality_l -anchor w -pady 2 -cspan 4 \
         7,0 $inner.quality   -fill x   -pady 2 -cspan 4 \
-        8,0 $inner.palette_l -anchor w -pady 2  \
-        8,1 $inner.palette   -fill x   -pady 2 -cspan 3 \
+        8,0 $inner.colormap_l -anchor w -pady 2  \
+        8,1 $inner.colormap   -fill x   -pady 2 -cspan 3 \
 
     blt::table configure $inner r* c0 c1 c3 -resize none
@@ -2376 +2416 @@
     set _view(-zoom) 1.0
 }
+
+#
+# GetDatasetsWithComponents --
+#
+#       Returns a list of all the datasets (known by the combination of
+#       their data object and component name) that match the given 
+#       component name.  For example, this is used where we want to change 
+#       the settings of volumes that have the current component.
+#
+itcl::body Rappture::VtkVolumeViewer::GetDatasetsWithComponent { cname } { 
+    if { ![info exists _volcomponents($cname)] } {
+        return ""
+    }
+    return $_volcomponents($cname)
+}