Changeset 2082 for trunk

Timestamp:

Feb 3, 2011 5:23:10 PM (13 years ago)

Author:

mmc

Message:

Final changes for the reorganization of the builder and the new "rappture"
command. The builder seems to be working properly again under this new
scheme with object definitions in the core library.

Location:

trunk

Files:

• builder/scripts/Makefile.in (modified) (1 diff)
• builder/scripts/filmstrip.tcl (modified) (1 diff)
• builder/scripts/main.tcl (modified) (3 diffs)
• builder/scripts/tool.rp (added)
• gui/apps/launcher.tcl (modified) (2 diffs)
• lang/tcl/scripts/library.tcl (modified) (1 diff)
• lang/tcl/scripts/objects.tcl (modified) (2 diffs)

trunk/builder/scripts/Makefile.in

@@ -24 +24 @@
                 $(srcdir)/objpath.tcl \
                 $(srcdir)/slideframes.tcl \
+                $(srcdir)/tool.rp \
                 $(srcdir)/tweener.tcl
 

trunk/builder/scripts/filmstrip.tcl

@@ -278 +278 @@
 
         # fix up the scrolling region to include all of these items
+        set x1 0
+        set y1 0
         foreach {x0 y0 x1 y1} [$itk_component(strip) bbox all] break
         set x1 [expr {$x1+$itk_option(-padding)}]

trunk/builder/scripts/main.tcl

@@ -109 +109 @@
 lappend Rappture::icon::iconpath [file join $dir images]
 
+# automatically load all Rappture object types
+if {[catch {Rappture::objects::init} err]} {
+    puts stderr "Error loading object definitions:\n$err"
+    exit 1
+}
+if {[catch {Rappture::objects::load [file join $dir tool.rp]} err]} {
+    puts stderr "Error loading tool object definition:\n$err"
+    exit 1
+}
+
 # ----------------------------------------------------------------------
 #  HACK ALERT!  Make it so the Analyzer can't possibly enable its
@@ -814 +824 @@
     set f [$win.pager page analyzer]
     # note: simcontrol on but disabled due to _simState code above
-    Rappture::Analyzer $f.analyze $ToolPreview -simcontrol on
+    Rappture::Analyzer $f.analyze $ToolPreview -simcontrol on \
+        -notebookpage about
     pack $f.analyze -expand yes -fill both
 
@@ -896 +907 @@
     pack $iwin.strip -expand yes -fill both
 
-    foreach name [Rappture::objects::get] {
+    foreach name [lsort [Rappture::objects::get]] {
         set imh [Rappture::objects::get $name -image]
         if {"" == $imh} {

trunk/gui/apps/launcher.tcl

@@ -61 +61 @@
                 lappend alist -tool $toolxml
             }
-            -testdir - -nosim {
+            -tool - -testdir - -nosim {
                 lappend alist $opt [lindex $argv 0]
                 set argv [lrange $argv 1 end]
@@ -87 +87 @@
 }
 
-# if we didn't find a tool.xml file, then look for one here
-if {$toolxml eq ""} {
-    if {![file exists tool.xml]} {
-        puts stderr "rappture: can't find tool definition file \"tool.xml\""
-        puts stderr "  Use the -tool option to specify the location of this file."
-        exit 1
-    }
-    set alist [linsert $alist 0 -tool tool.xml]
-}
-
 # invoke the main program with the args
 eval exec wish [list $mainscript] $alist

trunk/lang/tcl/scripts/library.tcl

@@ -16 +16 @@
 namespace eval Rappture {
     variable stdlib ""
-}
-
-# automatically load all Rappture object types
-if {[catch {Rappture::objects::init} err]} {
-    puts stderr "Error loading object definitions:\n$err"
-    exit 1
 }
 

trunk/lang/tcl/scripts/objects.tcl

@@ -79 +79 @@
     # load supporting type definitions
     foreach fname [glob [file join $installdir types *.tcl]] {
-        source $fname
+        uplevel #0 source $fname
     }
 
     # load supporting validation procs
     foreach fname [glob [file join $installdir validations *.tcl]] {
-        source $fname
+        uplevel #0 source $fname
     }
 
@@ -137 +137 @@
                     set errs($tname) 1
                 }
+            } else {
+                lappend newilist $obj
             }
             $objDefs($name) configure -inherit $newilist