Changeset 4759 for branches/1.3


Ignore:
Timestamp:
Nov 21, 2014, 5:38:56 PM (5 years ago)
Author:
ldelgass
Message:

merge r4756:4758 from trunk

Location:
branches/1.3
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • branches/1.3

  • branches/1.3/gui/scripts/flowvisviewer.tcl

    r4750 r4759  
    23082308        entry $inner.${tag} -font "Arial 9"  -bg white \
    23092309            -textvariable [itcl::scope _settings($this-$tag)]
    2310         bind $inner.${tag} <KeyPress-Return> \
     2310        bind $inner.${tag} <Return> \
     2311            [itcl::code $this camera set ${tag}]
     2312        bind $inner.${tag} <KP_Enter> \
    23112313            [itcl::code $this camera set ${tag}]
    23122314        blt::table $inner \

  • branches/1.3/gui/scripts/vtkglyphviewer.tcl

    r4750 r4759  
    17591759        entry $inner.${tag} -font "Arial 9"  -bg white \
    17601760            -textvariable [itcl::scope _view($tag)]
    1761         bind $inner.${tag} <KeyPress-Return> \
     1761        bind $inner.${tag} <Return> \
     1762            [itcl::code $this camera set ${tag}]
     1763        bind $inner.${tag} <KP_Enter> \
    17621764            [itcl::code $this camera set ${tag}]
    17631765        blt::table $inner \

  • branches/1.3/gui/scripts/vtkheightmapviewer.tcl

    r4750 r4759  
    10711071
    10721072            if {$axis == "z" && [$_first hints ${axis}units] == ""} {
    1073                 set units [lindex $_fields($_curFldName) 1]
     1073                if {$_curFldName != ""} {
     1074                    set units [lindex $_fields($_curFldName) 1]
     1075                }
    10741076            } else {
    10751077                set units [$_first hints ${axis}units]
    … …  
    17161718    if { $_currentColormap != ""  } {
    17171719        set cmap $_currentColormap
    1718         SendCmd "legend $cmap scalar $_curFldName {} $w $h 0"
     1720        #SendCmd "legend $cmap scalar $_curFldName {} $w $h 0"
     1721        SendCmd "legend2 $cmap $w $h"
    17191722    }
    17201723}

  • branches/1.3/gui/scripts/vtkimageviewer.tcl

    r4750 r4759  
    10301030
    10311031            if {$axis == "z" && [$_first hints ${axis}units] == ""} {
    1032                 set units [lindex $_fields($_curFldName) 1]
     1032                if {$_curFldName != ""} {
     1033                    set units [lindex $_fields($_curFldName) 1]
     1034                }
    10331035            } else {
    10341036                set units [$_first hints ${axis}units]
    … …  
    15521554    # Set the legend on the first image dataset.
    15531555    if { $_currentColormap != "" && $_currentColormap != "none" } {
    1554         SendCmd "legend $_currentColormap scalar $_curFldName {} $w $h 0"
     1556        #SendCmd "legend $_currentColormap scalar $_curFldName {} $w $h 0"
     1557        SendCmd "legend2 $_currentColormap $w $h"
    15551558    }
    15561559}

  • branches/1.3/gui/scripts/vtkisosurfaceviewer.tcl

    r4750 r4759  
    18401840        entry $inner.${tag} -font "Arial 9"  -bg white \
    18411841            -textvariable [itcl::scope _view(-$tag)]
    1842         bind $inner.${tag} <KeyPress-Return> \
    1843             [itcl::code $this camera set ${tag}]
     1842        bind $inner.${tag} <Return> \
     1843            [itcl::code $this camera set -${tag}]
     1844        bind $inner.${tag} <KP_Enter> \
     1845            [itcl::code $this camera set -${tag}]
    18441846        blt::table $inner \
    18451847            $row,0 $inner.${tag}label -anchor e -pady 2 \

  • branches/1.3/gui/scripts/vtkmeshviewer.tcl

    r4750 r4759  
    14431443        entry $inner.${tag} -font "Arial 9"  -bg white \
    14441444            -textvariable [itcl::scope _view($tag)]
    1445         bind $inner.${tag} <KeyPress-Return> \
     1445        bind $inner.${tag} <Return> \
     1446            [itcl::code $this camera set ${tag}]
     1447        bind $inner.${tag} <KP_Enter> \
    14461448            [itcl::code $this camera set ${tag}]
    14471449        blt::table $inner \

  • branches/1.3/gui/scripts/vtkstreamlinesviewer.tcl

    r4750 r4759  
    18701870        entry $inner.${tag} -font "Arial 9"  -bg white \
    18711871            -textvariable [itcl::scope _view($tag)]
    1872         bind $inner.${tag} <KeyPress-Return> \
     1872        bind $inner.${tag} <Return> \
     1873            [itcl::code $this camera set ${tag}]
     1874        bind $inner.${tag} <KP_Enter> \
    18731875            [itcl::code $this camera set ${tag}]
    18741876        blt::table $inner \

  • branches/1.3/gui/scripts/vtksurfaceviewer.tcl

    r4750 r4759  
    17521752        entry $inner.${tag} -font "Arial 9"  -bg white \
    17531753            -textvariable [itcl::scope _view($tag)]
    1754         bind $inner.${tag} <KeyPress-Return> \
     1754        bind $inner.${tag} <Return> \
     1755            [itcl::code $this camera set ${tag}]
     1756        bind $inner.${tag} <KP_Enter> \
    17551757            [itcl::code $this camera set ${tag}]
    17561758        blt::table $inner \

  • branches/1.3/gui/scripts/vtkviewer.tcl

    r4750 r4759  
    22242224        entry $inner.${tag} -font "Arial 9"  -bg white \
    22252225            -textvariable [itcl::scope _view($tag)]
    2226         bind $inner.${tag} <KeyPress-Return> \
     2226        bind $inner.${tag} <Return> \
     2227            [itcl::code $this camera set ${tag}]
     2228        bind $inner.${tag} <KP_Enter> \
    22272229            [itcl::code $this camera set ${tag}]
    22282230        blt::table $inner \
Note: See TracChangeset for help on using the changeset viewer.