Changeset 5539 for trunk

Timestamp:

May 17, 2015 11:10:45 PM (9 years ago)

Author:

ldelgass

Message:

Remove extents method from field: the <extents> tag is deprecated, and is a
synonym for the new <elemsize> tag.

Location:

trunk/gui/scripts

Files:

• field.tcl (modified) (14 diffs)
• flowvisviewer.tcl (modified) (4 diffs)

trunk/gui/scripts/field.tcl

@@ -76 +76 @@
     public method components {args}
     public method controls {option args}
-    public method extents {{cname -overall}}
     public method fieldinfo { fname } {
         lappend out $_fld2Label($fname)
@@ -159 +158 @@
     private variable _comp2style;       # cname => style settings
     private variable _comp2cntls;       # cname => x,y control points (1D only)
-    private variable _comp2extents;     # cname => extents (Only for unirect)
     private variable _comp2limits;      # Array of limits per component
     private variable _comp2flowhints
@@ -768 +766 @@
     array unset _comp2unirect2d
     array unset _comp2unirect3d
-    array unset _comp2extents
     array unset _dataobj2type
     #
@@ -786 +783 @@
         } elseif { [$_field element $cname.vtk] != ""} {
             set type "vtk"
-            set viewer [$_field get "about.view"]
-            if { $viewer != "" } {
-                set _viewer $viewer
-            }
         } elseif {[$_field element $cname.opendx] != ""} {
-            global env
-            if { [info exists env(VTKVOLUME)] } {
-                set _viewer "vtkvolume"
-            }
             set type "opendx"
         } elseif {[$_field element $cname.dx] != ""} {
-            global env
-            if { [info exists env(VTKVOLUME)] } {
-                set _viewer "vtkvolume"
-            }
             set type "dx"
         } elseif {[$_field element $cname.ucd] != ""} {
@@ -812 +797 @@
             continue
         }
-        # Save the extents of the component
-        if { [$_field element $cname.extents] != "" } {
-            set extents [$_field get $cname.extents]
-        } else {
-            set extents 1
-        }
-        set _comp2extents($cname) $extents
         set _type $type
 
         GetTypeAndSize $cname
         GetAssociation $cname
-        if { $_comp2size($cname) > 1 } {
-            set viewer [$_field get "about.view"]
-            if { $viewer == "" } {
+
+        if { [$_field element $cname.flow] != "" } {
+            set haveFlow 1
+        } else {
+            set haveFlow 0
+        }
+        set viewer [$_field get "about.view"]
+        if { $viewer != "" } {
+            set _viewer $viewer
+        }
+        if { $_viewer == "" } { 
+            if { $_comp2size($cname) > 1 && ! $haveFlow } {
                 set _viewer "glyphs"
-            }
-        }
+            } elseif { $_comp2size($cname) > 1 && $haveFlow } {
+                set _viewer "flowvis"
+            }
+        }
+
         if {$type == "1D"} {
             #
@@ -896 +886 @@
             # Extract gzipped, base64-encoded OpenDX data
             #
-            set viewer [$_field get "about.view"]
-            if { $viewer != "" } {
-                set _viewer $viewer
-            }
             if { $_viewer == "" } {
+                global env
+                if { [info exists env(VTKVOLUME)] } {
+                    set _viewer "vtkvolume"
+                }
                 if {[$_field element $cname.flow] != ""} {
                     set _viewer "flowvis"
@@ -947 +937 @@
             unset vtkdata
             set _comp2style($cname) [$_field get $cname.style]
-            if {[$_field element $cname.flow] != ""} {
+            if {$hasFlow} {
                 set _comp2flowhints($cname) \
                     [Rappture::FlowHints ::\#auto $_field $cname $_units]
@@ -956 +946 @@
             if { $contents == "" } {
                 continue;               # Ignore this component
-            }
-            set viewer [$_field get "about.view"]
-            if { $viewer != "" } {
-                set _viewer $viewer
             }
             set vtkdata [DicomToVtk $cname $contents]
@@ -1137 +1123 @@
     }
     return 1;                           # Default to scalar.
-}
-
-#
-# extents --
-#
-# Returns the extents of the named component
-#
-itcl::body Rappture::Field::extents {{cname -overall}} {
-    if {$cname == "-overall" } {
-        set max 0
-        foreach cname [$_field children -type component] {
-            if { ![info exists _comp2extents($cname)] } {
-                continue
-            }
-            set value $_comp2extents($cname)
-            if { $max < $value } {
-                set max $value
-            }
-        }
-        return $max
-    }
-    if { $cname == "component0"} {
-        set cname [lindex [components -name] 0]
-    }
-    return $_comp2extents($cname)
 }
 
@@ -1423 +1384 @@
         return 0
     }
-    set viewer [$_field get "about.view"]
-    if { $viewer != "" } {
-        set _viewer $viewer
-    }
     set element [$_xmlobj element -as type $path]
     set name $cname
@@ -1442 +1399 @@
     if { $element == "unirect3d" } {
         # Special case: unirect3d (deprecated) + flow.
-        if { [$_field element $cname.extents] != "" } {
-            set vectorsize [$_field get $cname.extents]
-        } else {
-            set vectorsize 1
-        }
+        set vectorsize [numComponents $cname]
         set _type unirect3d
         set _dim 3
@@ -1475 +1428 @@
     if { $element == "unirect2d" && [$_field element $cname.flow] != "" } {
         # Special case: unirect2d (deprecated) + flow.
-        if { [$_field element $cname.extents] != "" } {
-            set vectorsize [$_field get $cname.extents]
-        } else {
-            set vectorsize 1
-        }
+        set vectorsize [numComponents $cname]
         set _type unirect2d
         set _dim 2
@@ -1752 +1701 @@
     }
     set type [$_field get $cname.elemtype]
+    # <extents> is a deprecated synonym for <elemsize>
+    set extents  [$_field get $cname.extents]
     if { $type == "" } {
-        set type "scalars"
+        if { $extents != "" && $extents > 1 } {
+            set type "vectors"
+        } else {
+            set type "scalars"
+        }
     }
     if { ![info exists type2components($type)] } {
@@ -1760 +1715 @@
     set size [$_field get $cname.elemsize]
     if { $size == "" } {
-        set size $type2components($type)
+        if { $extents != "" } {
+            set size $extents
+        } else {
+            set size $type2components($type)
+        }
     }
     set _comp2type($cname) $type

trunk/gui/scripts/flowvisviewer.tcl

@@ -109 +109 @@
     private method ReceiveLegend { tf vmin vmax size }
     private method Rotate {option x y}
-    private method SendFlowCmd { dataobj comp nbytes extents }
+    private method SendFlowCmd { dataobj comp nbytes numComponents }
     private method SendTransferFunctions {}
     private method SetOrientation { side }
@@ -1152 +1152 @@
                 SendCmd "clientinfo [list $info]"
             }
-            set extents [$dataobj extents $cname]
+            set numComponents [$dataobj numComponents $cname]
             # I have a field. Is a vector field or a volume field?
-            if { !$isvtk && $extents == 1 } {
+            if { !$isvtk && $numComponents == 1 } {
                 SendCmd "volume data follows $nbytes $tag"
             } else {
-                if {[SendFlowCmd $dataobj $cname $nbytes $extents] < 0} {
+                if {[SendFlowCmd $dataobj $cname $nbytes $numComponents] < 0} {
                     continue
                 }
@@ -2513 +2513 @@
 }
 
-itcl::body Rappture::FlowvisViewer::SendFlowCmd { dataobj comp nbytes extents } {
+itcl::body Rappture::FlowvisViewer::SendFlowCmd { dataobj comp nbytes numComponents } {
     set tag "$dataobj-$comp"
     if { ![info exists _dataset2flow($tag)] } {
         SendCmd "flow add $tag"
-        SendCmd "$tag data follows $nbytes $extents"
+        SendCmd "$tag data follows $nbytes $numComponents"
         return 0
     }
@@ -2572 +2572 @@
         SendCmd $cmd
     }
-    SendCmd "$tag data follows $nbytes $extents"
+    SendCmd "$tag data follows $nbytes $numComponents"
     return 0
 }