Changeset 3302 for branches/Rappture 1.2/gui/scripts/field.tcl

Timestamp:

Feb 17, 2013, 8:27:24 AM (12 years ago)

Author:

gah

Message:

fixes for clientdata output, fix streamlines to use vtkdata

File:

• branches/Rappture 1.2/gui/scripts/field.tcl (modified) (4 diffs)

branches/Rappture 1.2/gui/scripts/field.tcl

@@ -53 +53 @@
 itcl::class Rappture::Field {
     private variable _dim       0;      # Dimension of mesh
-    private variable _xmlobj ""  ;      # ref to XML obj with device data
+    private variable _xmlobj ""  ;      # ref to XML obj with field data
     private variable _limits     ;      # maps box name => {z0 z1} limits
     private variable _field ""
@@ -59 +59 @@
     private variable _fieldUnits ""   ; # list of units of each field name.
     private variable _fieldLabels ""  ; # list of labels of each field name.
-    private variable _viewer            "auto"
+    private variable _viewer            ""
+    private variable _hints 
 
     constructor {xmlobj path} { 
@@ -568 +569 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::Field::hints {{keyword ""}} {
-    set hints(fieldnames)  $_fieldNames
-    set hints(fieldunits)  $_fieldUnits
-    set hints(fieldlabels) $_fieldLabels
-    foreach {key path} {
-        camera          camera.position
-        color           about.color
-        default         about.default
-        group           about.group
-        label           about.label
-        fieldnames      about.fieldnames
-        fieldunits      about.fieldunits
-        fieldlabels     about.fieldlabels
-        scale           about.scale
-        seeds           about.seeds
-        style           about.style
-        toolId          tool.id
-        toolName        tool.name
-        toolTitle       tool.title
-        toolRevision    tool.version.application.revision
-        type            about.type
-        xlabel          about.xaxis.label
-        ylabel          about.yaxis.label
-        zlabel          about.zaxis.label
-        xunits          about.xaxis.units
-        yunits          about.yaxis.units
-        zunits          about.zaxis.units
-        units           units
-        updir           updir
-        vectors         about.vectors
-    } {
-        set str [$_field get $path]
-        if {"" != $str} {
-            set hints($key) $str
-        }
-    }
-    # Set tool and path hints
-    set hints(tool) [$_xmlobj get tool.name]
-    set hints(path) $_path
-    if 0 {
-        # to be compatible with curve objects
-        set hints(xlabel) "Position"
-    }
-    if {[info exists hints(group)] && [info exists hints(label)]} {
-        # pop-up help for each curve
-        set hints(tooltip) $hints(label)
-    }
-
-    if {$keyword != ""} {
-        if {[info exists hints($keyword)]} {
+    if { ![info exists _hints] } {
+        set _hints(fieldnames)  $_fieldNames
+        set _hints(fieldunits)  $_fieldUnits
+        set _hints(fieldlabels) $_fieldLabels
+        foreach {key path} {
+            camera          camera.position
+            color           about.color
+            default         about.default
+            group           about.group
+            label           about.label
+            fieldnames      about.fieldnames
+            fieldunits      about.fieldunits
+            fieldlabels     about.fieldlabels
+            scale           about.scale
+            seeds           about.seeds
+            style           about.style
+            type            about.type
+            xlabel          about.xaxis.label
+            ylabel          about.yaxis.label
+            zlabel          about.zaxis.label
+            xunits          about.xaxis.units
+            yunits          about.yaxis.units
+            zunits          about.zaxis.units
+            units           units
+            updir           updir
+            vectors         about.vectors
+        } {
+            set str [$_field get $path]
+            if { "" != $str } {
+                set _hints($key) $str
+            }
+        }
+        foreach {key path} {
+            toolid          tool.id
+            toolname        tool.name
+            toolcommand     tool.execute
+            tooltitle       tool.title
+            toolrevision    tool.version.application.revision
+        } {
+            set str [$_xmlobj get $path]
+            if { "" != $str } {
+                set _hints($key) $str
+            }
+        }
+        # Set toolip and path hints
+        set _hints(path) $_path
+        if { [info exists _hints(group)] && [info exists _hints(label)] } {
+            # pop-up help for each curve
+            set _hints(tooltip) $_hints(label)
+        }
+    }
+    if { $keyword != "" } {
+        if {[info exists _hints($keyword)]} {
             return $hints($keyword)
         }
         return ""
     }
-    return [array get hints]
+    return [array get _hints]
 }
 
@@ -1054 +1059 @@
         incr _dim
     }
-    if { $_dim == 2 } {
-        set _viewer heightmap
-    } else {
-        set _viewer isosurface
+    if { $_viewer == "" } {
+        if { $_dim == 2 } {
+            set _viewer heightmap
+        } else {
+            set _viewer isosurface
+        }
     }
     set _comp2dims($cname) ${_dim}D