Changeset 2155 for trunk

Timestamp:

Mar 27, 2011, 11:34:36 AM (14 years ago)

Author:

mmc

Message:

Added some fixes to the error/warning system. You cannot preview any
object that gives errors. This helps guard against unexpected errors
later due to missing default values, etc. Also, fixed the error
navigation code to highlight the attribute that needs attention.

Location:

trunk/builder/scripts

Files:

• main.tcl (modified) (15 diffs)
• tool.rp (modified) (1 diff)

trunk/builder/scripts/main.tcl

@@ -40 +40 @@
 option add *BugReport*banner*font -*-helvetica-bold-r-normal-*-18-*
 option add *Filmstrip.background #aaaaaa
+option add *Hierlist.selectBackground #9999ff
+option add *errorHighlightColor #9999ff
 option add *previewButtonBackground #4a758c
 option add *previewButtonActiveBackground #a3c3cc
@@ -52 +54 @@
 option add *build*cntls*Button.padX 2
 option add *build*cntls*Editor.background white
+option add *build*editelem*background #cccccc
+option add *build*editelem*font {helvetica -12}
+option add *build*editelem*title.font {helvetica -12 italic}
+option add *build*editelem*vopt.font {helvetica -12 italic}
 option add *options*Entry.background white
+option add *options*Listbox.background white
 option add *options*Text.background white
 option add *options*Text.font {Helvetica -12}
@@ -153 +160 @@
     set vname "value[incr ValueId]"
     set type [string totitle $type]
-    return [list node: id $vname type $type terminal $term attributes ""]
+    return [list node: id $vname type $type terminal $term \
+        attributes [list label $type]]
 }
 
@@ -175 +183 @@
 
     if {[string length $LastToolXmlLoaded] > 0 && [$ToolXml xml] ne $LastToolXmlLoaded} {
-puts ">>>>"
-puts $LastToolXmlLoaded
-puts "----"
-puts [$ToolXml xml]
-puts "<<<<"
         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?"]
         if {$choice == "yes" && ![main_saveas]} {
@@ -289 +292 @@
     set alist ""
     set type [$xmlobj element -as type $path]
+    set side [lindex [split $path .] 0]
 
     if {[catch {Rappture::objects::get $type -attributes} attr] == 0} {
@@ -296 +300 @@
             catch {unset info}
             array set info [lrange $rec 1 end]
+
+            # see if this attribute is excluded based on the -only option
+            if {$info(-only) ne "" && [lsearch $info(-only) $side] < 0} {
+                continue  ;# skip it!
+            }
 
             set atype [lindex [split $info(-type) :] 0]
@@ -342 +351 @@
         set type [string tolower [$hlist tree get $node type]]
 
+        # make sure this object has a viewer
+        if {[catch {Rappture::objects::get $type -palettes} pals]} {
+            # must not have an object definition
+            continue
+        }
+        set debug [list -node $node -counter [incr counter]]
+
+        set path [$hlist tree path $node "%lc:type(%id)"]
+        regsub -all {\(%id\)} $path "" path
+        # convert input.foo to palette name "Inputs"
+        set side [lindex [split $path .] 0]
+        set pname "[string totitle $side]s"
+
+        if {$side ne "tool" && [lsearch $pals $pname] < 0} {
+            lappend ErrList [list error "This object doesn't yet have a visualizer that lets it be used as an $side to the program.  Support for this probably will be added in a future version of Rappture, but for now, it must be removed from the $side section." $debug]
+            continue
+        }
+
+        # query attributes for this type and check their values
         if {[catch {Rappture::objects::get $type -attributes} attrdef]
              || [catch {$hlist tree get $node attributes} attrlist]} {
@@ -355 +383 @@
             }
         }
-        set debug [list -node $node -counter [incr counter]]
 
         # perform all checks for this attribute type and append to ErrList
         eval lappend ErrList [Rappture::objects::check $type \
-            [array get ainfo] $debug]
+            $side [array get ainfo] $debug]
     }
 
@@ -406 +433 @@
             set thereis "There is"
             set problem "this problem"
+            set errors "this error"
         } else {
             set thereis "There are"
             set problem "these problems"
-        }
-
+            if {$nwarn+$nother == 0} {
+                set errors "these errors"
+            } else {
+                set errors "at least the $nerrs errors"
+            }
+        }
+
+        # 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
+        }
+
+        # let the user decide whether to proceed
         set choice [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?"]
         if {$choice == "yes"} {
@@ -464 +504 @@
 
     set win [.func.build.options.panes pane 0]
-    set ErrFocusAttr $debug(-attribute)
+    if {[info exists debug(-attribute)]} {
+        set ErrFocusAttr $debug(-attribute)
+    } else {
+        set ErrFocusAttr ""
+    }
     $win.scrl.skel select none -silent  ;# force a reload of options
     $win.scrl.skel select $debug(-node) ;# so we can highlight ErrFocusAttr
 
+    # fix the navigation buttons for next/prev error
     .func.build.options.errs.nav.prev configure \
         -state [expr {($ErrListPos == 0) ? "disabled" : "normal"}]
@@ -551 +596 @@
         regsub -all {\(%id\)} $path "" path
         set type [string tolower [$hlist tree get $node type]]
+        set side [lindex [split $path .] 0]
 
         if {[catch {Rappture::objects::get $type -attributes} attrdef]
@@ -565 +611 @@
             }
             array set info [lrange $rec 1 end]
+
+            # see if this attribute is excluded based on the -only option
+            if {$info(-only) ne "" && [lsearch $info(-only) $side] < 0} {
+                continue  ;# skip it!
+            }
+
             set atype [lindex [split $info(-type) :] 0]
             set proc "Attr[string totitle $atype]::export"
@@ -1136 +1188 @@
     set path [$hlist curselection -path "%lc:type(%id)"]
     regsub -all {\(%id\)} $path "" path
+    set side [lindex [split $path .] 0]
 
     # set the value column to expand
@@ -1176 +1229 @@
             array set info [lrange $rec 1 end]
 
+            # see if this attribute is excluded based on the -only option
+            if {$info(-only) ne "" && [lsearch $info(-only) $side] < 0} {
+                continue  ;# skip it!
+            }
+
+            # create the widget to edit this attribute
             set atype [split $info(-type) :]
             set atname [lindex $atype 0]
@@ -1212 +1271 @@
             if {$name eq $ErrFocusAttr} {
                 $obj edit
+                set errbg [option get $frame errorHighlightColor Background]
+                $frame.l$wnum configure -background $errbg
                 set ErrFocusAttr ""
             }

trunk/builder/scripts/tool.rp

@@ -21 +21 @@
         set cmd [string trim $attr(command)]
         if {[string length $cmd] == 0} {
-            return [list error "Must set the command associated with the underlying tool that will be invoked to handle the simulation."]
+            return [list warning "You should set the program type or enter a custom command that will be used to invoke the simulation program.  This is necessary in order for the tool to compute any results.  If you select a programming language, the builder will let you save a skeleton program that you can use as a starting point."]
         }
-        if {![regexp @tool $cmd]} {
-            return [list warning "The command string usually contains @tool, which represents the directory containing the tool.xml file.  The program is usually located relative to this directory.  Avoid hard-coded directory paths."]
-        }
-        if {![regexp @driver $cmd]} {
-            return [list warning "The command should contain the argument @driver, which represents the driver input file generated by Rappture."]
+        if {[string index $cmd 0] ne "!"} {
+            if {![regexp @tool $cmd]} {
+                return [list warning "The command string usually contains @tool, which represents the directory containing the tool.xml file.  The program is usually located relative to this directory.  Avoid hard-coded directory paths."]
+            }
+            if {![regexp @driver $cmd]} {
+                return [list warning "The command should contain the argument @driver, which represents the driver input file generated by Rappture."]
+            }
         }
     }