Changeset 5213


Ignore:
Timestamp:
Apr 13, 2015, 10:59:46 PM (5 years ago)
Author:
ldelgass
Message:

merge r5207 from trunk

Location:
branches/1.4
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/1.4

    • Property svn:mergeinfo changed
      /trunkmerged: 5207
  • branches/1.4/gui/scripts/nanovisviewer.tcl

    r5212 r5213  
    7474    public method get {args}
    7575    public method isconnected {}
    76     public method limits { tf }
    7776    public method parameters {title args} {
    7877        # do nothing
     
    140139                                       ;# to volumes in the server
    141140    private variable _recvdDatasets;    # list of data objs to send to server
    142     private variable _style2datasets;   # maps tf back to list of
    143                                         # dataobj-components using the tf.
    144141
    145142    private variable _reset 1;          # Connection to server has been reset.
     
    13921389                 -command [itcl::code $this updateTransferFunctions]]
    13931390    }
    1394     lappend _style2datasets($cname) $tag
    13951391    return $cname
    13961392}
     
    15631559    $_dispatcher event -idle !send_transfunc
    15641560}
    1565 
    1566 itcl::body Rappture::NanovisViewer::limits { cname } {
    1567     set _limits(min) 0.0
    1568     set _limits(max) 1.0
    1569     if { ![info exists _style2datasets($cname)] } {
    1570         return [array get _limits]
    1571     }
    1572     set min ""; set max ""
    1573     foreach tag [GetDatasetsWithComponent $cname] {
    1574         if { ![info exists _limits($tag)] } {
    1575             continue
    1576         }
    1577         foreach {amin amax} $_limits($tag) break
    1578         if { $min == "" || $min > $amin } {
    1579             set min $amin
    1580         }
    1581         if { $max == "" || $max < $amax } {
    1582             set max $amax
    1583         }
    1584     }
    1585     if { $min != "" } {
    1586         set _limits(min) $min
    1587     }
    1588     if { $max != "" } {
    1589         set _limits(max) $max
    1590     }
    1591     return [list $_limits(min) $_limits(max)]
    1592 }
    1593 
    15941561
    15951562itcl::body Rappture::NanovisViewer::BuildViewTab {} {
Note: See TracChangeset for help on using the changeset viewer.