Changeset 3959 for branches/blt4/builder


Ignore:
Timestamp:
Sep 24, 2013 4:43:55 PM (8 years ago)
Author:
gah
Message:

sync with trunk

Location:
branches/blt4/builder
Files:
20 edited

Legend:

Unmodified
Added
Removed
  • branches/blt4/builder/Makefile.in

    r2170 r3959  
    2929destdir         = $(libdir)/$(name)
    3030
     31.PHONY: all install install-pkg install-scripts clean distclean
     32
    3133all:
    3234        $(MAKE) -C scripts all
     
    4648
    4749distclean: clean
    48         $(RM) Makefile *~
     50        $(RM) Makefile pkgIndex.tcl *~
  • branches/blt4/builder/scripts/Makefile.in

    r2936 r3959  
    4545destdir         = $(libdir)/$(name)/scripts
    4646
     47.PHONY: all install install_scripts install_templates install_images clean distclean
     48
    4749all: tclIndex
    4850
     
    5153                --outfile tclIndex
    5254
    53 install: install_scripts install_templates install_images
     55install: all install_scripts install_templates install_images
    5456
    5557install_scripts:
  • branches/blt4/builder/scripts/dragdrop.tcl

    r2170 r3959  
    2121# ======================================================================
    2222#  AUTHOR:  Michael McLennan, Purdue University
    23 #  Copyright (c) 2004-2010  Purdue Research Foundation
     23#  Copyright (c) 2004-2012  HUBzero Foundation, LLC
    2424#
    2525#  See the file "license.terms" for information on usage and
  • branches/blt4/builder/scripts/filmstrip.tcl

    r2170 r3959  
    77# ======================================================================
    88#  AUTHOR:  Michael McLennan, Purdue University
    9 #  Copyright (c) 2004-2010  Purdue Research Foundation
     9#  Copyright (c) 2004-2012  HUBzero Foundation, LLC
    1010#
    1111#  See the file "license.terms" for information on usage and
  • branches/blt4/builder/scripts/hierlist.tcl

    r2275 r3959  
    66# ======================================================================
    77#  AUTHOR:  Michael McLennan, Purdue University
    8 #  Copyright (c) 2004-2010  Purdue Research Foundation
     8#  Copyright (c) 2004-2012  HUBzero Foundation, LLC
    99#
    1010#  See the file "license.terms" for information on usage and
    1111#  redistribution of this file, and for a DISCLAIMER OF ALL WARRANTIES.
    1212# ======================================================================
    13 #package require Itk
     13package require Itk
    1414package require BLT
    1515
     
    9393    dragdrop source $itk_component(area)
    9494
    95     set _imh(open) [image create picture]
    96     set _imh(close) [image create picture]
     95    set _imh(open) [image create photo]
     96    set _imh(close) [image create photo]
    9797
    9898    eval itk_initialize $args
     
    371371# ----------------------------------------------------------------------
    372372itcl::body Rappture::Hierlist::dd_get_source {widget x y} {
     373    # convert from screen coords to canvas coords (for scrollbars)
     374    set x [$widget canvasx $x]
     375    set y [$widget canvasy $y]
     376
    373377    set data ""
    374     foreach id [$itk_component(area) find overlapping $x $y $x $y] {
    375         foreach tag [$itk_component(area) gettags $id] {
     378    foreach id [$widget find overlapping $x $y $x $y] {
     379        foreach tag [$widget gettags $id] {
    376380            # search for a tag like item:NNN and make sure it's selected
    377381            if {[regexp {^item:([0-9]+)$} $tag match node]
  • branches/blt4/builder/scripts/main.tcl

    r2294 r3959  
    1414# ======================================================================
    1515#  AUTHOR:  Michael McLennan, Purdue University
    16 #  Copyright (c) 2004-2010  Purdue Research Foundation
     16#  Copyright (c) 2004-2012  HUBzero Foundation, LLC
    1717#
    1818#  See the file "license.terms" for information on usage and
     
    8787
    8888switch $tcl_platform(platform) {
    89     unix - windows {
     89    unix {
     90        event add <<PopupMenu>> <ButtonPress-3>
     91
     92        # make Ctrl-V binding work:
     93        # not strict Motif, and remove conflicting binding in Tk library
     94        set tk_strictMotif 0
     95        bind Text <Control-v> ""
     96    }
     97    windows {
    9098        event add <<PopupMenu>> <ButtonPress-3>
    9199    }
     
    659667# ----------------------------------------------------------------------
    660668proc main_saveas {{option "start"}} {
    661     global SaveAs ToolXml LastToolXmlFile LastToolXmlLoaded
     669    global tcl_platform SaveAs ToolXml LastToolXmlFile LastToolXmlLoaded
    662670
    663671    switch -- $option {
     
    673681                # something went wrong while saving the xml
    674682                # pull up the build tab, so we can see the error
    675                 .func select "Build"
     683                .func select [.func index -name "Build"]
    676684                return
    677685            }
    678686
    679687            if {[main_errors]} {
    680                 .func select "Build"
     688                .func select [.func index -name "Build"]
    681689                pack .func.build.options.errs \
    682690                    -before .func.build.options.panes \
     
    846854                    set pfile "main$SaveAs(ext)"
    847855                }
     856                set fname [file tail $pfile]
    848857                set mfile [file join [file dirname $pfile] Makefile]
    849858                if {[file exists $mfile]} {
     
    858867                }
    859868
    860                 set fname [file tail $pfile]
    861                 set dir [file dirname [file dirname $::Rappture::installdir]]
     869                # /apps/rappture/current for 32-bit systems
     870                # /apps/share64/rappture/current for 64-bit systems
     871                if {$tcl_platform(wordSize) == 8
     872                      && [file isdirectory /apps/share64/rappture/current]} {
     873                    set dir /apps/share64/rappture/current
     874                } else {
     875                    set dir /apps/rappture/current
     876                }
     877                if {![file isdirectory $dir]} {
     878                    # if all else fails, ask the current Rappture for its install dir
     879                    set dir [file dirname [file dirname $::Rappture::installdir]]
     880                }
     881
    862882                set macros [list @@RAPPTUREDIR@@ $dir]
    863883                lappend macros @@FILENAME@@ $fname
     
    10031023        # something went wrong while saving the xml
    10041024        # pull up the build tab, so we can see the error
    1005         .func select "Build"
     1025        .func select [.func index -name "Build"]
    10061026        return
    10071027    }
    10081028
    1009     if {[main_errors]} {
    1010         .func select "Build"
     1029    if {[main_errors -strict]} {
     1030        .func select [.func index -name "Build"]
    10111031        pack .func.build.options.errs -before .func.build.options.panes \
    10121032            -pady {10 0} -fill x
     
    10831103    # turn off download options and clear button
    10841104    $f.analyze component download configure -state disabled
    1085     $f.analyze component resultset component clear configure -state disabled
    1086     # remove the "---" and "Download..." options from the result selector
    1087     $f.analyze component resultselector choices delete end
    1088     $f.analyze component resultselector choices delete end
     1105    $f.analyze component resultselector component clear configure -state disabled
     1106    # remove the "---" and "Download..." options from the view selector
     1107    $f.analyze component viewselector choices delete end
     1108    $f.analyze component viewselector choices delete end
    10891109}
    10901110
     
    14671487
    14681488# use this frame to cover preview before it appears
    1469 set bg [blt::bgpattern create tile -image [Rappture::icon diag]]
    1470 blt::tk::frame .func.preview.stripes -bg $bg
     1489blt::tile::frame .func.preview.stripes -tile [Rappture::icon diag]
    14711490
    14721491# ----------------------------------------------------------------------
     
    15281547set ErrFocusAttr ""
    15291548
    1530 if {"" != $params(-tool)} {
     1549if {$params(-tool) ne ""} {
    15311550    if {![file exists $params(-tool)]} {
    15321551        puts stderr "can't find tool \"$params(-tool)\""
     
    15341553    }
    15351554    main_open $params(-tool)
     1555} elseif {[file exists tool.xml]} {
     1556    main_open tool.xml
    15361557} else {
    15371558    main_open -new
  • branches/blt4/builder/scripts/objpath.tcl

    r2170 r3959  
    88# ======================================================================
    99#  AUTHOR:  Michael McLennan, Purdue University
    10 #  Copyright (c) 2004-2010  Purdue Research Foundation
     10#  Copyright (c) 2004-2012  HUBzero Foundation, LLC
    1111#
    1212#  See the file "license.terms" for information on usage and
  • branches/blt4/builder/scripts/slideframes.tcl

    r2170 r3959  
    88# ======================================================================
    99#  AUTHOR:  Michael McLennan, Purdue University
    10 #  Copyright (c) 2004-2010  Purdue Research Foundation
     10#  Copyright (c) 2004-2012  HUBzero Foundation, LLC
    1111#
    1212#  See the file "license.terms" for information on usage and
  • branches/blt4/builder/scripts/templates.tcl

    r2170 r3959  
    1515# ======================================================================
    1616#  AUTHOR:  Michael McLennan, Purdue University
    17 #  Copyright (c) 2004-2011  Purdue Research Foundation
     17#  Copyright (c) 2004-2012  HUBzero Foundation, LLC
    1818#
    1919#  See the file "license.terms" for information on usage and
  • branches/blt4/builder/scripts/templates/clang.tl

    r3017 r3959  
    33# ======================================================================
    44#  AUTHOR:  Michael McLennan, Purdue University
    5 #  Copyright (c) 2004-2011  Purdue Research Foundation
     5#  Copyright (c) 2004-2012  HUBzero Foundation, LLC
    66#
    77#  See the file "license.terms" for information on usage and
     
    134134    code "\n/* save output value for $path */"
    135135    code "/* this shows just one point -- modify as needed */"
    136     code "/* (x,y) = x-label, y-coordinate is height of bar */"
    137     code "sprintf(line, \"%s %g\\n\", x, y);"
    138     code "rpPutString(io,\"$path.component.xy\", line, RPLIB_APPEND);"
     136    code "/* (x,h,w) = x-coord, height of bar, and width of bar (optional) */"
     137    code "sprintf(line, \"%g %g %g\\n\", x, h, w);"
     138    code "rpPutString(io,\"$path.component.xhw\", line, RPLIB_APPEND);"
    139139  }
    140140  output image {
  • branches/blt4/builder/scripts/templates/fortran77.tl

    r3017 r3959  
    33# ======================================================================
    44#  AUTHOR:  Michael McLennan, Purdue University
    5 #  Copyright (c) 2004-2011  Purdue Research Foundation
     5#  Copyright (c) 2004-2012  HUBzero Foundation, LLC
    66#
    77#  See the file "license.terms" for information on usage and
     
    130130    code "\nc       save output value for $path"
    131131    code "c       this shows just one point -- modify as needed"
    132     code "c       (x,y) = x-label, y-coordinate is height of bar"
    133     code "        write(strVal,'(A20,E20.12,A)') label, x, h, char(10)"
    134     code "        call rp_lib_put_str(io,\n     +    \"$path.component.xy\",strVal,1)"
     132    code "c       (x,h,w) = x-coord, height of bar, and width of bar (optional)"
     133    code "        write(strVal,'(E20.12,E20.12,E20.12,A)') x, h, w, char(10)"
     134    code "        call rp_lib_put_str(io,\n     +    \"$path.component.xhw\",strVal,1)"
    135135  }
    136136  output image {
  • branches/blt4/builder/scripts/templates/java.tl

    r3017 r3959  
    33# ======================================================================
    44#  AUTHOR:  Michael McLennan, Purdue University
    5 #  Copyright (c) 2004-2011  Purdue Research Foundation
     5#  Copyright (c) 2004-2012  HUBzero Foundation, LLC
    66#
    77#  See the file "license.terms" for information on usage and
     
    9191    code "\n// save output value for $path"
    9292    code "// this shows just one point -- modify as needed"
    93     code "// (x,y) = x-label, y-coordinate is height of bar"
    94     code "str = String.format(\"%s %g\\n\", x, y);"
    95     code "io.put(\"$path.component.xy\", line, true);"
     93    code "// (x,h,w) = x-coord, height of bar, and width of bar (optional)"
     94    code "str = String.format(\"%g %g %g\\n\", x, h, w);"
     95    code "io.put(\"$path.component.xhw\", line, true);"
    9696  }
    9797  output image {
  • branches/blt4/builder/scripts/templates/matlab.tl

    r3017 r3959  
    33# ======================================================================
    44#  AUTHOR:  Michael McLennan, Purdue University
    5 #  Copyright (c) 2004-2011  Purdue Research Foundation
     5#  Copyright (c) 2004-2012  HUBzero Foundation, LLC
    66#
    77#  See the file "license.terms" for information on usage and
     
    8383  output histogram {
    8484    code "\n% save output value for $path"
    85     code "% vectors x,y: x-label, y-coordinate is height of bar"
    86     code "xydata = \[x;y\];"
    87     code "str = sprintf('%s %12g\\n', x, y);"
    88     code "rpLibPutString(io,'$path.component.xy',str,0);"
     85    code "% vectors x,h,w: x-coord, height of bar, and width of bar (optional)"
     86    code "xhwdata = \[x;h;w\];"
     87    code "str = sprintf('%12g %12g %12g\\n', xhwdata);"
     88    code "rpLibPutString(io,'$path.component.xhw',str,0);"
    8989  }
    9090  output image {
  • branches/blt4/builder/scripts/templates/octave.tl

    r3017 r3959  
    33# ======================================================================
    44#  AUTHOR:  Michael McLennan, Purdue University
    5 #  Copyright (c) 2004-2011  Purdue Research Foundation
     5#  Copyright (c) 2004-2012  HUBzero Foundation, LLC
    66#
    77#  See the file "license.terms" for information on usage and
     
    9595  output integer {
    9696    code "\n% save output value for $path"
    97     code "rpLibPutString(io,'$path.current',int2str($id),0);"
     97    code "rpLibPutString(io,'$path.current',num2str($id),0);"
    9898  }
    9999  output number {
  • branches/blt4/builder/scripts/templates/perl.tl

    r3017 r3959  
    33# ======================================================================
    44#  AUTHOR:  Michael McLennan, Purdue University
    5 #  Copyright (c) 2004-2011  Purdue Research Foundation
     5#  Copyright (c) 2004-2012  HUBzero Foundation, LLC
    66#
    77#  See the file "license.terms" for information on usage and
     
    7979    code "\n# save output value for $path"
    8080    code "# this shows just one point -- modify as needed"
    81     code "# (x,y) = x-label, y-coordinate is height of bar"
    82     code "\$io->put(\"$path.component.xy\", \"\$x \$y\\n\", 1);"
     81    code "# (x,h,w) = x-coord, height of bar, and width of bar (optional)"
     82    code "\$io->put(\"$path.component.xhw\", \"\$x \$h \$w\\n\", 1);"
    8383  }
    8484  output image {
  • branches/blt4/builder/scripts/templates/python.tl

    r3017 r3959  
    33# ======================================================================
    44#  AUTHOR:  Michael McLennan, Purdue University
    5 #  Copyright (c) 2004-2011  Purdue Research Foundation
     5#  Copyright (c) 2004-2012  HUBzero Foundation, LLC
    66#
    77#  See the file "license.terms" for information on usage and
     
    8585    code "\n# save output value for $path"
    8686    code "# this shows just one point -- modify as needed"
    87     code "# (x,y) = x-label, y-coordinate is  height of bar"
    88     code "line = \"%s %g\n\" % (x, y)"
    89     code "io.put('$path.component.xy', line, append=1)"
     87    code "# (x,h,w) = x-coord, height of bar, and width of bar (optional)"
     88    code "line = \"%g %g %g\n\" % (x, h, w)"
     89    code "io.put('$path.component.xhw', line, append=1)"
    9090  }
    9191  output image {
  • branches/blt4/builder/scripts/templates/r.tl

    r3017 r3959  
    33# ======================================================================
    44#  AUTHOR:  Michael McLennan, Purdue University
    5 #  Copyright (c) 2004-2011  Purdue Research Foundation
     5#  Copyright (c) 2004-2012  HUBzero Foundation, LLC
    66#
    77#  See the file "license.terms" for information on usage and
     
    7979    code "\n# save output value for $path"
    8080    code "# assumes output in vectors x and y"
    81     code "str <- paste(sprintf(\"%s %g\\n\",x,y), collapse=\"\")"
     81    code "str <- paste(sprintf(\"%g %g\\n\",x,y), collapse=\"\")"
    8282    code "rp_lib_put_string(io,\"$path.component.xy\",str,FALSE)"
    8383  }
  • branches/blt4/builder/scripts/templates/ruby.tl

    r3017 r3959  
    33# ======================================================================
    44#  AUTHOR:  Michael McLennan, Purdue University
    5 #  Copyright (c) 2004-2011  Purdue Research Foundation
     5#  Copyright (c) 2004-2012  HUBzero Foundation, LLC
    66#
    77#  See the file "license.terms" for information on usage and
     
    7979    code "\n# save output value for $path"
    8080    code "# this shows just one point -- modify as needed"
    81     code "# (x,y) = x-label, y-coordinate is height of bar"
    82     code "str = sprintf(\"%g %g %g\\n\", x, y)"
     81    code "# (x,h,w) = x-coord, height of bar, and width of bar (optional)"
     82    code "str = sprintf(\"%g %g %g\\n\", x, h, w)"
    8383    code "io.put(\"$path.component.xhw\", str, Rappture::APPEND)"
    8484  }
     
    8686    code "\n# save output value for $path"
    8787    code "# data should be base64-encoded image data"
    88     code "io.put(\"$path.current\", imdata)"
     88    code "io.put(\"$path.current\", imdata, Rappture::OVERWRITE)"
    8989  }
    9090  output * {
    9191    code "\n# save output value for $path"
    92     code "io.put(\"$path.current\",$id)"
     92    code "io.put(\"$path.current\",$id, Rappture::OVERWRITE)"
    9393  }
    9494}
  • branches/blt4/builder/scripts/templates/tcl.tl

    r3017 r3959  
    33# ======================================================================
    44#  AUTHOR:  Michael McLennan, Purdue University
    5 #  Copyright (c) 2004-2011  Purdue Research Foundation
     5#  Copyright (c) 2004-2012  HUBzero Foundation, LLC
    66#
    77#  See the file "license.terms" for information on usage and
     
    1616# ----------------------------------------------------------------------
    1717package require Rappture
     18package require Img
    1819
    1920# open the XML file containing the run parameters
     
    7980    code "\n# save output value for $path"
    8081    code "# this shows just one point -- modify as needed"
    81     code "# (x,y) = x-label, y-coordinate is height of bar"
    82     code "\$io put -append yes $path.component.xy \"\$x \$y\\n\""
     82    code "# (x,h,w) = x-coord, height of bar, and width of bar (optional)"
     83    code "\$io put -append yes $path.component.xy \"\$x \$h \$w\\n\""
    8384  }
    8485  output image {
     
    8990  output * {
    9091    code "\n# save output value for $path"
    91     code "\$io put $path.current \$id"
     92    code "\$io put $path.current \$$id"
    9293  }
    9394}
  • branches/blt4/builder/scripts/tweener.tcl

    r2170 r3959  
    1010# ======================================================================
    1111#  AUTHOR:  Michael McLennan, Purdue University
    12 #  Copyright (c) 2004-2010  Purdue Research Foundation
     12#  Copyright (c) 2004-2012  HUBzero Foundation, LLC
    1313#
    1414#  See the file "license.terms" for information on usage and
Note: See TracChangeset for help on using the changeset viewer.