Changeset 468


Ignore:
Timestamp:
Jun 8, 2006 6:58:38 PM (18 years ago)
Author:
mmc
Message:

Fixed bugs that showed up in the nanovis viewer when you switch between
two different fields or clear the existing result viewer.

Fixed the download option for 3D fields.

Location:
trunk/gui/scripts
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/gui/scripts/bugreport.tcl

    r465 r468  
    101101}
    102102
    103 Rappture::Scroller .bugreport.details
     103Rappture::Scroller .bugreport.details -xscrollmode auto -yscrollmode auto
    104104text .bugreport.details.text -wrap none
    105105.bugreport.details contents .bugreport.details.text
  • trunk/gui/scripts/field3dresult.tcl

    r462 r468  
    3737    public method delete {args}
    3838    public method scale {args}
    39     public method download {option}
     39    public method download {option args}
    4040
    4141    # resources file tells us the nanovis server
     
    144144# ----------------------------------------------------------------------
    145145# USAGE: download coming
     146# USAGE: download controls <downloadCommand>
    146147# USAGE: download now
    147148#
     
    151152# "string" is the data itself.
    152153# ----------------------------------------------------------------------
    153 itcl::body Rappture::Field3DResult::download {option} {
     154itcl::body Rappture::Field3DResult::download {option args} {
    154155    $itk_component(renderer) download $option
    155156}
  • trunk/gui/scripts/nanovisviewer.tcl

    r465 r468  
    793793    # activate the proper volume
    794794    set first [lindex [get] 0]
    795 
    796     set axis [$first hints updir]
    797     if {"" != $axis} {
    798         _send up $axis
     795    if {"" != $first} {
     796        set axis [$first hints updir]
     797        if {"" != $axis} {
     798            _send up $axis
     799        }
    799800    }
    800801
     
    940941        # nothing to send -- activate the proper volume
    941942        set first [lindex [get] 0]
    942 
    943         set axis [$first hints updir]
    944         if {"" != $axis} {
    945             _send up $axis
     943        if {"" != $first} {
     944            set axis [$first hints updir]
     945            if {"" != $axis} {
     946                _send up $axis
     947            }
    946948        }
    947949        foreach key [array names _obj2id *-*] {
     
    12191221
    12201222    set dataobj [lindex [get] 0]
     1223    if {"" == $dataobj} {
     1224        return
     1225    }
    12211226    set comp [lindex [$dataobj components] 0]
    12221227    if {![info exists _obj2style($dataobj-$comp)]} {
     
    13311336
    13321337    set dataobj [lindex [get] 0]
    1333     set comp [lindex [$dataobj components] 0]
    1334     if {[info exists _obj2id($dataobj-$comp)]} {
    1335         set ivol $_obj2id($dataobj-$comp)
     1338    if {"" != $dataobj} {
     1339        set comp [lindex [$dataobj components] 0]
     1340        if {[info exists _obj2id($dataobj-$comp)]} {
     1341            set ivol $_obj2id($dataobj-$comp)
     1342        }
    13361343    }
    13371344
  • trunk/gui/scripts/resultviewer.tcl

    r464 r468  
    229229                    if {![info exists _mode2widget($mode)]} {
    230230                        set mesh [$dataobj mesh]
    231                         set mode [expr {("" != $mesh) ? "vtk" : "nanovis"}]
     231                        set fmt [expr {("" != $mesh) ? "vtk" : "nanovis"}]
    232232                        set w $itk_interior.field3D
    233                         Rappture::Field3DResult $w -mode $mode
     233                        Rappture::Field3DResult $w -mode $fmt
    234234                        set _mode2widget($mode) $w
    235235                    }
Note: See TracChangeset for help on using the changeset viewer.