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

merge r4756:4758 from trunk

Location:
branches/1.3
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/1.3

  • 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}
Note: See TracChangeset for help on using the changeset viewer.