Changeset 1441 for trunk/gui/scripts

Timestamp:

May 14, 2009 10:26:34 PM (15 years ago)

Author:

gah

Message:

added flow detection and flow hints

File:

• trunk/gui/scripts/field.tcl (modified) (11 diffs)

trunk/gui/scripts/field.tcl

@@ -31 +31 @@
     public method isunirect3d {}
     public method extents {{what -overall}}
-
+    public method flowhints { cname }
     protected method _build {}
     protected method _getValue {expr}
@@ -50 +50 @@
     private variable _comp2cntls ;# maps component name => x,y control points
     private variable _comp2extents 
+    private variable _comp2flowhints 
     private common _counter 0    ;# counter for unique vector names
 }
@@ -119 +120 @@
         itcl::delete object $_comp2unirect3d($name)
     }
+    foreach name [array names _comp2flowhints] {
+        itcl::delete object $_comp2flowhints($name)
+    }
 }
 
@@ -133 +137 @@
         flag what -dimensions
         flag what -style
+        flag what -particles
+        flag what -flow
+        flag what -box
     }
 
@@ -553 +560 @@
         
         # Save the extents of the component
-        set extents [$_field element $cname.extents]
-        if { $extents == "" } {
+        if { [$_field element $cname.extents] != "" } {
+            set extents [$_field get $cname.extents]
+        } else {
             set extents 1 
         }
@@ -622 +630 @@
                         [Rappture::Unirect2d \#auto $_xmlobj $_field $cname]
                     set _comp2style($cname) [$_field get $cname.style]
+                    if {[$_field element $cname.flow] != ""} {
+                        set _comp2flowhints($cname) \
+                            [Rappture::FlowHints ::\#auto $_field $cname $_units]
+                    }
                     incr _counter
                 } elseif { $element == "unirect3d" } {
@@ -628 +640 @@
                         [Rappture::Unirect3d \#auto $_xmlobj $_field $cname]
                     set _comp2style($cname) [$_field get $cname.style]
+                    if {[$_field element $cname.flow] != ""} {
+                        set _comp2flowhints($cname) \
+                            [Rappture::FlowHints ::\#auto $_field $cname $_units]
+                    }
                     incr _counter
                 } elseif { $element == "cloud" || $element == "mesh" } {
@@ -715 +731 @@
             #
             set _comp2dims($cname) "3D"
-            set _comp2dx($cname) [$_field get -decode no $cname.dx]
+            set _comp2dx($cname)  [$_field get -decode no $cname.dx]
             set _comp2style($cname) [$_field get $cname.style]
+            if {[$_field element $cname.flow] != ""} {
+                set _comp2flowhints($cname) \
+                    [Rappture::FlowHints ::\#auto $_field $cname $_units]
+            }
             incr _counter
         } elseif {$type == "opendx"} {
@@ -732 +752 @@
             set _comp2dx($cname) $data
             set _comp2style($cname) [$_field get $cname.style]
+            if {[$_field element $cname.flow] != ""} {
+                set _comp2flowhints($cname) \
+                    [Rapture::FlowHints ::\#auto $_field $cname $_units]
+            }
             incr _counter
         }
@@ -799 +823 @@
 
 #
+# flowhints  --
+#
+# Returns the hints associated with a flow vector field.  
+#
+itcl::body Rappture::Field::flowhints { cname } {
+    if { [info exists _comp2flowhints($cname)] } {
+        return $_comp2flowhints($cname)
+    }
+    return ""
+}
+
+#
 # extents --
 #
@@ -807 +843 @@
         set max 0
         foreach cname [$_field children -type component] {
-            set extents [info exists _comp2extents($cname)]
-            if { $max < $extents } {
-                set max $extents
+            if { [info exists _comp2extents($cname)] } {
+                if { $max < $_comp2extents($cname) } {
+                    set max $_comp2extents($cname)
+                }
             }
         }