Changeset 4776 for trunk/gui

Timestamp:

Nov 23, 2014 9:06:09 AM (9 years ago)

Author:

ldelgass

Message:

sync with release branch changes

Location:

trunk/gui/scripts

Files:

• flowvisviewer.tcl (modified) (1 diff)
• nanovisviewer.tcl (modified) (1 diff)
• vtkvolumeviewer.tcl (modified) (10 diffs)

trunk/gui/scripts/flowvisviewer.tcl

@@ -766 +766 @@
                 if { ![info exists _limits($axis)] } {
                     set _limits($axis) [list $min $max]
-                } else {
-                    foreach {amin amax} $_limits($axis) break
-                    if {$min < $amin} {
-                        set amin $min
-                    }
-                    if {$max > $amax} {
-                        set amax $max
-                    }
-                    set _limits($axis) [list $amin $amax]
+                    continue
                 }
+                foreach {amin amax} $_limits($axis) break
+                if {$min < $amin} {
+                    set amin $min
+                }
+                if {$max > $amax} {
+                    set amax $max
+                }
+                set _limits($axis) [list $amin $amax]
             }
         }

trunk/gui/scripts/nanovisviewer.tcl

@@ -588 +588 @@
                 if { ![info exists _limits($axis)] } {
                     set _limits($axis) [list $min $max]
-                } else {
-                    foreach {amin amax} $_limits($axis) break
-                    if {$min < $amin} {
-                        set amin $min
-                    }
-                    if {$max > $amax} {
-                        set amax $max
-                    }
-                    set _limits($axis) [list $amin $amax]
+                    continue
                 }
+                foreach {amin amax} $_limits($axis) break
+                if {$min < $amin} {
+                    set amin $min
+                }
+                if {$max > $amax} {
+                    set amax $max
+                }
+                set _limits($axis) [list $amin $amax]
             }
         }

trunk/gui/scripts/vtkvolumeviewer.tcl

@@ -82 +82 @@
     private variable _current "";       # Currently selected component 
     private variable _volcomponents   ; # Array of components found 
-    private variable _componentsList   ; # Array of components found 
+    private variable _componentsList   ; # List of component names
     private variable _cname2style
     private variable _cname2transferFunction
@@ -173 +173 @@
     private variable _curFldName ""
     private variable _curFldLabel ""
+    private variable _colorMode "scalar"; #  Mode of colormap (vmag or scalar)
     private variable _cutplaneCmd "imgcutplane"
     private variable _allowMultiComponent 0
@@ -250 +251 @@
         -axisminorticks                 1
         -background                     black
+        -color                          "default"
         -cutplanelighting               1
         -cutplaneopacity                100
@@ -679 +681 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::VtkVolumeViewer::scale {args} {
-    array unset _limits 
-    array unset _volcomponents 
+    array unset _limits
+    array unset _volcomponents
+    set _componentsList ""
 
     foreach dataobj $args {
@@ -688 +691 @@
         # Determine limits for each axis.
         foreach axis { x y z } {
-            foreach { min max } [$dataobj limits $axis] break
-            if {"" != $min && "" != $max} {
-                if { ![info exists _limits($axis)] } {
-                    set _limits($axis) [list $min $max]
-                } else {
-                    foreach {amin amax} $_limits($axis) break
-                    if {$min < $amin} {
-                        set amin $min
-                    }
-                    if {$max > $amax} {
-                        set amax $max
-                    }
-                    set _limits($axis) [list $amin $amax]
-                }
-            }
+            set lim [$dataobj limits $axis]
+            if { ![info exists _limits($axis)] } {
+                set _limits($axis) $lim
+                continue
+            }
+            foreach {min max} $lim break
+            foreach {amin amax} $_limits($axis) break
+            if { $amin > $min } {
+                set amin $min
+            }
+            if { $amax < $max } {
+                set amax $max
+            }
+            set _limits($axis) [list $amin $amax]
         }
         # Determine limits for each field.
@@ -728 +730 @@
             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
-            if { ![info exists _limits($cname)] } {
-                set _limits($cname) [list $min $max]
-            } else {
-                foreach {vmin vmax} $_limits($cname) break
-                if { $min < $vmin } {
-                    set vmin $min
-                }
-                if { $max > $vmax } {
-                    set vmax $max
-                }
-                set _limits($cname) [list $vmin $vmax]
-            }
+            foreach {vmin vmax} $_limits($cname) break
+            if { $vmin > $min } {
+                set vmin $min
+            }
+            if { $vmax < $max } {
+                set vmax $max
+            }
+            set _limits($cname) [list $vmin $vmax]
         }
     }
@@ -1593 +1595 @@
                     puts stderr "Can't use a vector field in a volume"
                     return
+                } else {
+                    if { $components > 1 } {
+                        set _colorMode vmag
+                    } else {
+                        set _colorMode scalar
+                    }
                 }
                 set _curFldName $fname
@@ -1601 +1609 @@
             }
             foreach dataset [CurrentDatasets -visible $_first] {
+                #SendCmd "$_cutplaneCmd colormode $_colorMode $_curFldName $dataset"
                 SendCmd "dataset scalar $_curFldName $dataset"
             }
@@ -1633 +1642 @@
             SendCmdNoWait \
                 "legend2 $_dataset2style($dataset) $w $h"
-                #"legend $_dataset2style($dataset) scalar $_curFldName {} $w $h 0"
+                #"legend $_dataset2style($dataset) $_colorMode $_curFldName {} $w $h 0"
             break;
         }
@@ -1828 +1837 @@
     bind $inner.colormap <<Value>> \
         [itcl::code $this AdjustSetting -color]
-    $itk_component(colormap) value "default"
-    set _settings(-color) "default"
+    $itk_component(colormap) value $_settings(-color)
 
     label $inner.blendmode_l -text "Blend Mode" -font $font