Changeset 6714

Timestamp:

Mar 24, 2020, 4:48:01 PM (4 years ago)

Author:

clarksm

Message:

Make sure all phases/pages get initialized before processing loaders.
There was a problem when new elements were introduced in loader files.
The arbitrary sleep was not long enough.

Location:

branches/1.7/gui/scripts

Files:

• controlOwner.tcl (modified) (3 diffs)
• loader.tcl (modified) (6 diffs)
• main.tcl (modified) (3 diffs)
• page.tcl (modified) (1 diff)

branches/1.7/gui/scripts/controlOwner.tcl

@@ -131 +131 @@
         # register the new widget for the path
         set _path2widget($path) $widget
+#       puts stderr "controlOwner::widgetfor register $path"
 
         # look up the containing panel and store it too
@@ -287 +288 @@
         error "\"$newobj\" is not a Rappture::library"
     }
+#   puts stderr "controlOwner::load"
     foreach path [array names _path2widget] {
         # the following elements do not accept "current" tags, skip them
         set type [[tool] xml element -as type $path]
+#       puts stderr "controlOwner::load path = $path, type = $type"
         if {[lsearch {group separator control} $type] >= 0} {
             continue
@@ -333 +336 @@
         }
     }
+#   puts stderr "controlOwner::load done"
 }
 

branches/1.7/gui/scripts/loader.tcl

@@ -214 +214 @@
                     puts stderr "  $result"
                 } else {
+#                   puts stderr "::load example file = $fname"
                     set label [$obj get about.label]
                     if {$label == ""} {
@@ -227 +228 @@
                     # translate default file name => default label
                     if {[string equal $defval [file tail $fname]]} {
+#                       puts stderr "::load set default file = $fname"
                         $_owner xml put $path.default $label
                     }
@@ -324 +326 @@
 
 itcl::body Rappture::Loader::SetDefaultValue { value } {
+#   puts stderr "Rappture::Loader::SetDefaultValue $value"
     $itk_component(combo) value $value
     _newValue
@@ -337 +340 @@
 #
 itcl::body Rappture::Loader::EventuallySetDefaultValue { value } {
-    after 100 [itcl::code $this SetDefaultValue $value]
+    global env
+    if { [info exists env(RAPPTURE_PHASES_LOADED)] } {
+        set setDefaultValueNow $env(RAPPTURE_PHASES_LOADED)
+    } else {
+        set setDefaultValueNow 2
+    }
+
+#   puts stderr "Rappture::Loader::EventuallySetDefaultValue  $setDefaultValueNow"
+
+    if {$setDefaultValueNow == 0} {
+        after 100 [itcl::code $this EventuallySetDefaultValue $value]
+    } else {
+        [itcl::code $this SetDefaultValue $value]
+    }
 }
 
@@ -350 +366 @@
     set newval [$itk_component(combo) value]
     set obj [$itk_component(combo) translate $newval]
+#   puts stderr "loader::_newValue $obj  $itk_option(-tool)"
     if {$obj == "@upload"} {
         set tool [Rappture::Tool::resources -appname]
@@ -384 +401 @@
             $obj copy $_copyto from $_copyfrom
         }
+#       puts stderr "loader::_newValue $newval $_label2file($newval)"
         $_owner xml put $_path.file $_label2file($newval)
         $itk_option(-tool) load $obj

branches/1.7/gui/scripts/main.tcl

@@ -290 +290 @@
 }
 
+#
+# force loaders to wait until all phases have been created
+# EventuallySetDefaultValue checks RAPPTURE_PHASES_LOADED
+# before loading default loader file
+#
+global env
+set env(RAPPTURE_PHASES_LOADED) 0
+
 foreach comp $phases {
     set title [string trim [$tool xml get $comp.about.label]]
@@ -295 +303 @@
         set title "Input #auto"
     }
+#   puts stderr "main phase name $comp"
+
     $win.pager insert end -name $comp -title $title
 
@@ -304 +314 @@
     pack $f.cntls -expand yes -fill both
 }
+
+set env(RAPPTURE_PHASES_LOADED) 1
 
 # let components (loaders) in the newly created pages settle

branches/1.7/gui/scripts/page.tcl

@@ -77 +77 @@
 
         set type [$xmlobj element -as type $path.$cname]
+#       puts stderr "::Page $type"
         if {$type == "about"} {
             continue