Changeset 3700

Timestamp:

Jun 20, 2013, 11:26:41 AM (11 years ago)

Author:

gah

Message:

add experimental tool parameter handling to strings (textentry)

Location:

trunk/gui/scripts

Files:

• field.tcl (modified) (4 diffs)
• main.tcl (modified) (1 diff)
• textentry.tcl (modified) (1 diff)
• xyresult.tcl (modified) (3 diffs)

trunk/gui/scripts/field.tcl

@@ -53 +53 @@
 # to if the same dataset can be viewed in more than one way.
 #  o Any 2D dataset can be viewed as a contour/heightmap. 
-#  o Any 3D dataset can be viewed as a isosurface.  
+#  o Any 3D dataset can be viewed as a isosurface.  o
 #  o Any 2D dataset with vector data can be streamlines.  
 #  o Any 3D uniform rectilinear dataset can be viewed as a volume.
 #  o Any 3D dataset with vector data can be streamlines or flow.
+#   
+#  Vector data 2/3 streamlines
+#  Scalar data 1/
 #
 # Need <views> to properly do things like qdot: volume with a polydata
@@ -1291 +1294 @@
         }
     }
+    
     lappend limits v [list $vmin $vmax]
     set _comp2limits($cname) $limits
@@ -1335 +1339 @@
             set vtkassoc "CELL_DATA"
         } elseif { $_comp2assoc($cname) == "fielddata" } {
-            set vtkassoc "FIELD_DATA"
+            set vtkassoc "FIELD"
         } else {
             error "unknown association \"$_comp2assoc($cname)\""
@@ -1350 +1354 @@
             error "unknown element type \"$_comp2type($cname)\""
         }
-        append out "[$vector range 0 end]\n"
+        append out [$vector range 0 end] 
+        append out "\n"
         if 0 {
             VerifyVtkDataSet $out

trunk/gui/scripts/main.tcl

@@ -96 +96 @@
 }
 
+proc ReadToolParameters { numTries } {
+    incr numTries -1 
+    if { $numTries < 0 } {
+        return
+    }
+    global env
+    set paramsFile $env(TOOL_PARAMETERS)
+    if { ![file readable $paramsFile] } {
+        after 500 ReadToolParmeters $numTries
+        return
+    }
+    catch { 
+        set f [open $paramsFile "r"]
+        set contents [read $f]
+        close $f
+        set pattern {^file\((.*)\):(.*)$} 
+        foreach line [split $contents "\n"] {
+            if { [regexp $pattern $line match path rest] } {
+                set ::Rappture::parameters($path) $rest
+            }
+        }
+    }
+}
+
+if { [info exists env(TOOL_PARAMETERS)] } {
+    ReadToolParameters 10
+}
+
 set loadobjs {}
 foreach runfile $params(-load) {

trunk/gui/scripts/textentry.tcl

@@ -106 +106 @@
     # the string alone. 
     set str [string trim [$_owner xml get $path.default]]
+    if { [info exists ::Rappture::parameters($path.default)] } {
+        set fileName $::Rappture::parameters($path.default)
+        catch { 
+            set f [open $fileName "r"]
+            set contents [read $f]
+            close $f
+            set str $contents
+        } 
+    }
     if {"" != $str} {
         value $str

trunk/gui/scripts/xyresult.tcl

@@ -104 +104 @@
     private variable _dataobj2raise  ;# maps dataobj => raise flag 0/1
     private variable _dataobj2desc   ;# maps dataobj => description of data
+    private variable _dataobj2type   ;# maps dataobj => type of graph element
     private variable _elem2dataobj   ;# maps graph element => dataobj
     private variable _label2axis   ;# maps axis label => axis ID
@@ -343 +344 @@
         set _dataobj2raise($dataobj) $params(-raise)
         set _dataobj2desc($dataobj) $params(-description)
+        set _dataobj2type($dataobj) $params(-type)
 
         $_dispatcher event -idle !rebuild
@@ -569 +571 @@
                         set inner [$popup component inner]
                         # Create the print dialog widget and add it to the
-                        # the balloon popup.
+                        # balloon popup.
                         Rappture::XyPrint $inner.print 
                         $popup configure \