Changeset 168


Ignore:
Timestamp:
Feb 8, 2006 5:18:56 PM (15 years ago)
Author:
mmc
Message:
  • Fixed the license terms to comply with the official open source license from Purdue's OTC office.
  • Fixed the scroller to handle scrollbars properly. They weren't always popping up when needed. Sometimes you had to scroll a little first. Better now.
  • Fixed the DeviceEditor? to pack its internal widgets better, so images within a DeviceViewer1D structure can change size and will show up properly.
  • Fixed the analyzer to take down the progress bar properly when there's an error during execution.
  • Fixed the Rappture::exec command to initialize execctl properly, in case there's an error during execution.
Location:
trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/README

    r115 r168  
    1212
    1313 See the following web site for an overview and documentation:
    14    http://developer.nanohub.org/projects/rappture
     14   http://www.rappture.org
    1515
    1616----------------------------------------------------------------------
  • trunk/gui/scripts/analyzer.tcl

    r115 r168  
    156156    pack $itk_component(abort) -side left -expand yes -padx 4 -pady 4
    157157
    158     Rappture::Scroller $w.info -xscrollmode off -yscrollmode auto
     158    Rappture::Scroller $w.info -xscrollmode auto -yscrollmode auto
    159159    pack $w.info -expand yes -fill both -padx 4 -pady 4
    160160    itk_component add runinfo {
     
    348348        $itk_component(notebook) current analyze
    349349    }
     350
     351    # do this last -- after _simOutput above
     352    pack forget $itk_component(progress)
    350353}
    351354
  • trunk/gui/scripts/deviceEditor.tcl

    r115 r168  
    4545    }
    4646    pack $itk_component(top) -fill x
    47 
    48     itk_component add editors {
    49         Rappture::Notebook $itk_interior.editors
    50     }
    51     pack $itk_component(editors) -expand yes -fill both
    5247
    5348    eval itk_initialize $args
     
    117112    switch -- [_type $_xmlobj] {
    118113        molecule {
    119             if {[catch {$itk_component(editors) page molecule} p]} {
    120                 set p [$itk_component(editors) insert end molecule]
    121                 Rappture::MoleculeViewer $p.mol $this
    122                 pack $p.mol -expand yes -fill both
     114            if {![winfo exists $itk_component(hull).mol]} {
     115                catch {destroy $itk_component(hull).dev}
     116                Rappture::MoleculeViewer $itk_component(hull).mol $this
     117                pack $itk_component(hull).mol -expand yes -fill both
    123118            }
    124             $p.mol configure -device $_xmlobj
    125             $itk_component(editors) current molecule
     119            $itk_component(hull).mol configure -device $_xmlobj
    126120
    127             set _current $p.mol
     121            set _current $itk_component(hull).mol
    128122        }
    129123        device1D {
    130             if {[catch {$itk_component(editors) page device1D} p]} {
    131                 set p [$itk_component(editors) insert end device1D]
    132                 Rappture::DeviceViewer1D $p.dev $this
    133                 pack $p.dev -expand yes -fill both
     124            if {![winfo exists $itk_component(hull).dev]} {
     125                catch {destroy $itk_component(hull).mol}
     126                Rappture::DeviceViewer1D $itk_component(hull).dev $this
     127                pack $itk_component(hull).dev -expand yes -fill both
    134128            }
    135             $p.dev configure -device $_xmlobj
    136             $itk_component(editors) current device1D
     129            $itk_component(hull).dev configure -device $_xmlobj
    137130
    138             set _current $p.dev
     131            set _current $itk_component(hull).dev
    139132        }
    140133    }
  • trunk/gui/scripts/exec.tcl

    r158 r168  
    3333    set execout(channel) ""
    3434    set execout(extra) ""
     35    set execctl ""
    3536
    3637    set status [catch {eval blt::bgexec ::Rappture::execctl \
  • trunk/gui/scripts/scroller.tcl

    r115 r168  
    7878        scrollbar $itk_interior.ysbar -orient vertical
    7979    }
     80
     81    # we don't fix scrollbars when window is withdrawn, so
     82    # fix them whenever a window pops up
     83    bind $itk_component(hull) <Map> "
     84        [itcl::code $this _fixsbar x]
     85        [itcl::code $this _fixsbar y]
     86    "
    8087
    8188    grid rowconfigure $itk_component(hull) 0 -weight 1
     
    177184# ----------------------------------------------------------------------
    178185itcl::body Rappture::Scroller::_fixsbar {which {state ""}} {
     186    if {![winfo ismapped $itk_component(hull)]} {
     187        #
     188        # If we're not on yet screen, bail out!  This keeps bad
     189        # numbers (from an empty or partially constructed widget)
     190        # from prematurely influencing the scrollbar.
     191        #
     192        return
     193    }
     194
    179195    if {$state == ""} {
    180196        switch -- [string tolower $itk_option(-${which}scrollmode)] {
  • trunk/license.terms

    r115 r168  
    11
    2 Copyright (c) 2004-2005, Purdue Research Foundation
     2Copyright (c) 2004-2006, Purdue Research Foundation
    33All rights reserved.
    44
    5 The authors hereby grant permission to use, copy, modify, distribute,
    6 and license this software and its documentation for any purpose,
    7 provided that the following conditions are met:
     5Developed by:  Network for Computational Nanotechnology
     6               Purdue University, West Lafayette, Indiana
     7               http://www.rappture.org
    88
    9   * Redistributions of source code must retain the above copyright
    10     notice, this list of conditions and the following disclaimer.
     9Permission is hereby granted, free of charge, to any person obtaining a
     10copy of this software and associated documentation files (the "Software"),
     11to deal with the Software without restriction, including without
     12limitation the rights to use, copy, modify, merge, publish, distribute,
     13sublicense, and/or sell copies of the Software, and to permit persons
     14to whom the Software is furnished to do so, subject to the following
     15conditions:
    1116
    12   * Redistributions in binary form must reproduce the above copyright
    13     notice, this list of conditions and the following disclaimer in
    14     the documentation and/or other materials provided with the
    15     distribution.
     17    * Redistributions of source code must retain the above copyright
     18        notice, this list of conditions and the following disclaimers.
    1619
    17   * No written agreement, license, or royalty fee is required for
    18     any of the authorized uses.  Modifications to this software may
    19     be copyrighted by their authors and need not follow the licensing
    20     terms described here, provided that the new terms are clearly
    21     indicated on the first page of each file where they apply.
     20    * Redistributions in binary form must reproduce the above copyright
     21        notice, this list of conditions and the following disclaimers
     22        in the documentation and/or other materials provided with the
     23        distribution.
    2224
    23   * Neither the name of the Purdue Research Foundation nor the names
    24     of its contributors may be used to endorse or promote products
    25     derived from this software without specific prior written
    26     permission.
     25    * Neither the names of the Network for Computational Nanotechnology,
     26        Purdue University, nor the names of its contributors may be used
     27        to endorse or promote products derived from this Software without
     28        specific prior written permission.
    2729
    28 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
    29 "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
    30 LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
    31 FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE
    32 COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
    33 INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
    34 BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
    35 OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
    36 AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
    37 OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
    38 OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
    39 SUCH DAMAGE.
     30THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
     31EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
     32MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
     33IN NO EVENT SHALL THE CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR
     34ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
     35TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
     36SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE SOFTWARE.
     37
Note: See TracChangeset for help on using the changeset viewer.