Changeset 2294

Timestamp:

Jul 5, 2011, 2:41:41 PM (13 years ago)

Author:

gah

Message:

 

Location:

branches/blt4/builder/scripts

Files:

• main.tcl (modified) (7 diffs)
• templates/python.tl (modified) (2 diffs)

branches/blt4/builder/scripts/main.tcl

@@ -323 +323 @@
 
 # ----------------------------------------------------------------------
-# USAGE: main_errors
+# USAGE: main_errors ?-strict?
 #
 # Checks the values of all objects in the tree to look for errors
-# before previewing and saving.  If any errors are found, the user
-# is prompted to look at them, and they can be popped up in a viewer
-# above the object tree.
-# ----------------------------------------------------------------------
-proc main_errors {} {
+# before previewing and saving.  If any errors are found and the
+# -strict flag is set, the user is forced to look at them before
+# continuing on.  Otherwise, the user may choose to look at warnings
+# and errors before continuing.  Usually called before previewing
+# and saving the tool definition.  Returns 1 if there are errors that
+# should be viewed/fixed, and 0 otherwise.
+# ----------------------------------------------------------------------
+proc main_errors {args} {
     global ErrList ErrListPos
+
+    set strict no
+    while {[llength $args] > 0} {
+        set flag [lindex $args 0]
+        set args [lrange $args 1 end]
+        if {$flag eq "-strict"} {
+            set strict yes
+        } else {
+            error "bad option \"$flag\": should be -strict"
+        }
+    }
 
     set ErrList ""
@@ -443 +457 @@
                 set errors "these errors"
             } else {
-                set errors "at least the $nerrs errors"
+                set errors "at least the $nerrs error"
+                if {$nerrs > 1} {lappend errors "s"}
             }
         }
@@ -449 +464 @@
         # if there are errors, we can't continue on
         if {$nerrs > 0} {
-            tk_messageBox -icon error -type ok -title "Rappture: Problems with your tool definition" -message "$thereis $phrases for your current tool definition.  You must resolve $errors before you continue with the preview."
-            return 1
+            if {$strict} {
+                tk_messageBox -icon error -type ok -title "Rappture: Problems with your tool definition" -message "$thereis $phrases for your current tool definition.  You must resolve $errors before you continue with the preview."
+                return 1
+            } else {
+                set resp [tk_messageBox -icon error -type yesno -title "Rappture: Problems with your tool definition" -message "$thereis $phrases for your current tool definition.  Examine and resolve $problem?"]
+                return $resp
+            }
         }
 
@@ -649 +669 @@
             $win.scrl.skel select none
 
-            # generate now to catch any errors
-            main_generate_xml
+            # freshen up the ToolXml
+            if {![main_generate_xml]} {
+                # something went wrong while saving the xml
+                # pull up the build tab, so we can see the error
+                .func select "Build"
+                return
+            }
+
+            if {[main_errors]} {
+                .func select "Build"
+                pack .func.build.options.errs \
+                    -before .func.build.options.panes \
+                    -pady {10 0} -fill x
+                main_errors_nav 0
+                return
+            }
 
             # get the language choice and update the skeleton program option
@@ -750 +784 @@
                 main_generate_xml
 
+                # change any !Language for the command into a proper
+                # invocation command.  Grab the XML before we do this
+                # as the last official XML that's been saved.  We'll
+                # know later if things changed and we need to save again.
+                set xmlBeforeCmdSubst [$ToolXml xml]
+
                 set cmd [$ToolXml get tool.command]
                 if {[string index $cmd 0] eq "!"} {
@@ -773 +813 @@
                     set status "error"
                 } else {
-                    set LastToolXmlLoaded [$ToolXml xml]
+                    set LastToolXmlLoaded $xmlBeforeCmdSubst
                 }
             }
@@ -932 +972 @@
 
     if {[$ToolXml xml] ne $LastToolXmlLoaded} {
-        set choice [tk_messageBox -icon warning -type yesno -title "Rappture: Save Changes?" -message "Changes to the current tool haven't been saved.\n\nSave changes?"]
+        set choice [tk_messageBox -icon warning -type yesnocancel -title "Rappture: Save Changes?" -message "Changes to the current tool haven't been saved.\n\nSave changes?"]
         if {$choice == "yes" && ![main_saveas]} {
+            return
+        } elseif {$choice == "cancel"} {
             return
         }

branches/blt4/builder/scripts/templates/python.tl

@@ -79 +79 @@
     code "\n# save output value for $path"
     code "# this shows just one (x,y) point -- modify as needed"
-    code "line = "%g %g\n" % (x, y)"
+    code "line = \"%g %g\n\" % (x, y)"
     code "io.put('$path.component.xy', line, append=1)"
   }
@@ -86 +86 @@
     code "# this shows just one point -- modify as needed"
     code "# (x,h,w) = x-coord, height of bar, and width of bar (optional)"
-    code "line = "%g %g %g\n" % (x, h, w)"
+    code "line = \"%g %g %g\n\" % (x, h, w)"
     code "io.put('$path.component.xhw', line, append=1)"
   }