Changeset 4554 for branches/1.3


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

merge r4165 from trunk

Location:
branches/1.3
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/1.3

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

    r4550 r4554  
    332332    set _image(legend) [image create photo]
    333333    itk_component add legend {
    334         canvas $itk_component(plotarea).legend \
    335             -height 50 -highlightthickness 0 -background black
     334        canvas $itk_component(plotarea).legend -height 50 -highlightthickness 0
    336335    } {
    337336        usual
     
    10241023    set h [winfo height $c]
    10251024    set lx 10
    1026     # FIXME:  I don't know what I have to do this for the 2D flow
    1027     #         example.  Otherwise the canvas background is white.
    1028     #         I'll get to this when we add background changes into
    1029     #         nanvis.
    1030     $c configure -background black
    10311025    set ly [expr {$h - 1}]
    1032     if {"" == [$c find withtag transfunc]} {
     1026    if {"" == [$c find withtag colorbar]} {
    10331027        $c create image 10 10 -anchor nw \
    1034             -image $_image(legend) -tags transfunc
     1028            -image $_image(legend) -tags colorbar
    10351029        $c create text $lx $ly -anchor sw \
    10361030            -fill $itk_option(-plotforeground) -tags "limits vmin"
    10371031        $c create text [expr {$w-$lx}] $ly -anchor se \
    10381032            -fill $itk_option(-plotforeground) -tags "limits vmax"
    1039         $c lower transfunc
    1040         $c bind transfunc <ButtonRelease-1> \
    1041             [itcl::code $this AddIsoMarker %x %y]
     1033        $c lower colorbar
     1034        $c bind colorbar <ButtonRelease-1> [itcl::code $this AddIsoMarker %x %y]
    10421035    }
    10431036    # Display the markers used by the active transfer function.
Note: See TracChangeset for help on using the changeset viewer.