Changeset 4555 for branches/1.3


Ignore:
Timestamp:
Jul 18, 2014, 12:42:49 AM (5 years ago)
Author:
ldelgass
Message:

merge r4166 from trunk

Location:
branches/1.3
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/1.3

    • Property svn:mergeinfo changed
      /trunkmerged: 4166
  • branches/1.3/gui/scripts/flowvisviewer.tcl

    r4554 r4555  
    6969    public method isconnected {}
    7070    public method limits { cname }
    71     public method overmarker { m x }
     71    public method overMarker { m x }
    7272    public method parameters {title args} {
    7373        # do nothing
    7474    }
    75     public method rmdupmarker { m x }
     75    public method removeDuplicateMarker { m x }
    7676    public method scale {args}
    77     public method updatetransferfuncs {}
     77    public method updateTransferFunctions {}
    7878
    7979    protected method Connect {}
     
    10831083    unset _recvObjs($tag)
    10841084    if { [array size _recvObjs] == 0 } {
    1085         updatetransferfuncs
     1085        updateTransferFunctions
    10861086    }
    10871087}
     
    15831583                set tf $_activeTf
    15841584                set _settings($this-$tf-opacity) $opacity
    1585                 updatetransferfuncs
     1585                updateTransferFunctions
    15861586            }
    15871587        }
     
    15941594                set tf $_activeTf
    15951595                set _settings($this-$tf-thickness) $sval
    1596                 updatetransferfuncs
     1596                updateTransferFunctions
    15971597            }
    15981598        }
     
    18571857        SendCmd "grid axiscolor $rgb"
    18581858        SendCmd "grid linecolor $rgb"
    1859         $itk_component(legend) itemconfigure labels -fill $color 
    1860         $itk_component(legend) itemconfigure limits -fill $color 
     1859        $itk_component(legend) itemconfigure labels -fill $color
     1860        $itk_component(legend) itemconfigure limits -fill $color
    18611861    }
    18621862}
     
    18921892            set x [expr {double($i)/($levels+1)}]
    18931893            set m [Rappture::IsoMarker \#auto $c $this $tf]
     1894            $itk_component(legend) itemconfigure labels -fill $itk_option(-plotforeground)
    18941895            $m relval $x
    18951896            lappend _isomarkers($tf) $m
     
    18981899        foreach x $levels {
    18991900            set m [Rappture::IsoMarker \#auto $c $this $tf]
     1901            $itk_component(legend) itemconfigure labels -fill $itk_option(-plotforeground)
    19001902            $m relval $x
    19011903            lappend _isomarkers($tf) $m
     
    19251927            set value [expr {$value * 0.01}]
    19261928            set m [Rappture::IsoMarker \#auto $c $this $tf]
     1929            $itk_component(legend) itemconfigure labels -fill $itk_option(-plotforeground)
    19271930            $m relval $value
    19281931            lappend _isomarkers($tf) $m
     
    19301933            # ${n} : Set absolute value.
    19311934            set m [Rappture::IsoMarker \#auto $c $this $tf]
     1935            $itk_component(legend) itemconfigure labels -fill $itk_option(-plotforeground)
    19321936            $m absval $value
    19331937            lappend _isomarkers($tf) $m
     
    19391943# USAGE: UndateTransferFuncs
    19401944# ----------------------------------------------------------------------
    1941 itcl::body Rappture::FlowvisViewer::updatetransferfuncs {} {
     1945itcl::body Rappture::FlowvisViewer::updateTransferFunctions {} {
    19421946    $_dispatcher event -after 100 !send_transfunc
    19431947}
     
    19501954    set c $itk_component(legend)
    19511955    set m [Rappture::IsoMarker \#auto $c $this $tf]
     1956    $itk_component(legend) itemconfigure labels -fill $itk_option(-plotforeground)
    19521957    set w [winfo width $c]
    19531958    $m relval [expr {double($x-10)/($w-20)}]
    19541959    lappend _isomarkers($tf) $m
    1955     updatetransferfuncs
     1960    updateTransferFunctions
    19561961    return 1
    19571962}
    19581963
    1959 itcl::body Rappture::FlowvisViewer::rmdupmarker { marker x } {
     1964itcl::body Rappture::FlowvisViewer::removeDuplicateMarker { marker x } {
    19601965    set tf [$marker transferfunc]
    19611966    set bool 0
     
    19771982        }
    19781983        set _isomarkers($tf) $list
    1979         updatetransferfuncs
     1984        updateTransferFunctions
    19801985    }
    19811986    return $bool
    19821987}
    19831988
    1984 itcl::body Rappture::FlowvisViewer::overmarker { marker x } {
     1989itcl::body Rappture::FlowvisViewer::overMarker { marker x } {
    19851990    set tf [$marker transferfunc]
    19861991    if { [info exists _isomarkers($tf)] } {
Note: See TracChangeset for help on using the changeset viewer.