Changeset 6690

Timestamp:

Feb 14, 2018 1:55:36 PM (6 years ago)

Author:

clarksm

Message:

Pass structure.current.components and structure.current.fields
from input driver file to executed driver file when doing
rappture -execute or using TOOL_PARAMETERS with file(execute).
components and fields have no current child but the information
may still be required for simulation.

Location:

branches/1.7

Files:

• gui/apps/execute.tcl (modified) (2 diffs)
• lang/tcl/scripts/library.tcl (modified) (4 diffs)

branches/1.7/gui/apps/execute.tcl

@@ -78 +78 @@
 set installdir [file dirname [file normalize $toolxml]]
 set toolobj [Rappture::library $toolxml]
+
+# copy structure.current.fields and structure.current.components
+foreach path [Rappture::entities -as path $driverobj input] {
+    if {[$driverobj element -as type $path.current] eq ""} {
+        $toolobj copy $path from $driverobj $path
+    }
+}
+
 set TaskObj [Rappture::Task ::#auto $toolobj $installdir]
 set LogFid ""
@@ -151 +159 @@
 foreach path [Rappture::entities -as path $driverobj input] {
     if {[$driverobj element -as type $path.current] ne ""} {
-        lappend args $path [$driverobj get $path.current]
+        set currentVal [$driverobj get $path.current]
+# do not replace empty paths - in particular structures
+        if {$currentVal ne {}} {
+            lappend args $path $currentVal
+        }
     }
 }

branches/1.7/lang/tcl/scripts/library.tcl

@@ -161 +161 @@
                         lappend queue $cpath.current.parameters
                     }
+                    if {[$xmlobj element $cpath.current.fields] != ""} {
+                        lappend rlist $cpath.current.fields
+                    }
+                    if {[$xmlobj element $cpath.current.components] != ""} {
+                        lappend rlist $cpath.current.components
+                    }
                 }
                 drawing {
@@ -185 +191 @@
                         lappend rlist [$xmlobj element -as $params(-as) $cpath]
                     }
-                }
+                }
                 default {
                     if {[catch {Rappture::objects::get $type}] == 0} {
@@ -528 +534 @@
     set string [string trim [$node text]]
     if {$params(-decode)} {
-        set string [Rappture::encoding::decode -- $string]
+        set string [Rappture::encoding::decode -- $string]
     }
     return $string
@@ -614 +620 @@
     if {[Rappture::library isvalid $str]} {
         foreach n [[$str info variable _node -value] childNodes] {
-            if { [$n nodeType] == "COMMENT_NODE" } {
-                continue
-            }
+            if { [$n nodeType] == "COMMENT_NODE" } {
+                continue
+            }
             $node appendXML [$n asXML]
         }