Ignore:
Timestamp:
Mar 28, 2016 6:45:39 AM (8 years ago)
Author:
ldelgass
Message:

Merge cleanups from trunk (partial hand merge of r6182, not including custom
range support in glyph viewer)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/1.6/gui/scripts/vtkisosurfaceviewer.tcl

    r6212 r6213  
    129129    private variable _arcball ""
    130130
    131     private variable _dlist ""     ;    # list of data objects
    132     private variable _obj2ovride   ;    # maps dataobj => style override
    133     private variable _datasets     ;    # contains all the dataobj-component
    134                                    ;    # datasets in the server
    135     private variable _colormaps    ;    # contains all the colormaps
    136                                    ;    # in the server.
     131    private variable _dlist "";         # list of data objects
     132    private variable _obj2ovride;       # maps dataobj => style override
     133    private variable _datasets;         # contains all the dataobj-component
     134                                        # datasets in the server
     135    private variable _colormaps;        # contains all the colormaps
     136                                        # in the server.
    137137    # The name of the current colormap used.  The colormap is global to all
    138138    # heightmaps displayed.
     
    140140    private variable _currentNumContours -1
    141141
    142     private variable _click        ;    # info used for rotate operations
    143     private variable _limits       ;    # autoscale min/max for all axes
    144     private variable _view         ;    # view params for 3D view
     142    private variable _click;            # info used for rotate operations
     143    private variable _limits;           # autoscale min/max for all axes
     144    private variable _view;             # view params for 3D view
    145145    private variable _settings
    146146    private variable _changed
    147147    private variable _reset 1;          # Connection to server has been reset.
    148148
    149     private variable _first ""     ;    # This is the topmost dataset.
     149    private variable _first "";         # This is the topmost dataset.
    150150    private variable _start 0
    151151    private variable _title ""
     
    161161    private variable _cutplanePending 0
    162162    private variable _field      ""
    163     private variable _colorMode "scalar";   # Mode of colormap (vmag or scalar)
     163    private variable _colorMode "scalar"; # Mode of colormap (vmag or scalar)
    164164    private variable _fields
    165165    private variable _curFldName ""
    166166    private variable _curFldLabel ""
    167     private variable _mouseOver "";     # what called LegendRangeAction, vmin or vmax
    168     private variable _customRangeClick 1;   # what called ToggleCustomRange
     167    private variable _mouseOver "";     # what called LegendRangeAction:
     168                                        # vmin or vmax
     169    private variable _customRangeClick 1; # what called ToggleCustomRange
    169170
    170171    private common _downloadPopup;      # download options from popup
     
    16991700
    17001701itcl::body Rappture::VtkIsosurfaceViewer::BuildIsosurfaceTab {} {
    1701 
    17021702    set fg [option get $itk_component(hull) font Font]
    17031703    #set bfg [option get $itk_component(hull) boldFont Font]
     
    18011801    }
    18021802    $inner.colormap choices insert end [GetColormapList]
    1803 
    18041803    $itk_component(colormap) value "BCGYR"
    18051804    bind $inner.colormap <<Value>> \
     
    24532452# USAGE: LegendPointToValue <x> <y>
    24542453#
    2455 # Convert an x,y point on the legend to a numeric isosurface value.
     2454# Convert an x,y point on the legend to a numeric field value.
    24562455# ----------------------------------------------------------------------
    24572456itcl::body Rappture::VtkIsosurfaceViewer::LegendPointToValue { x y } {
    2458 
    24592457    set fname $_curFldName
    24602458
     
    28002798# ----------------------------------------------------------------------
    28012799itcl::body Rappture::VtkIsosurfaceViewer::LegendRangeValidate {widget which value} {
    2802 
    28032800    #check for a valid value
    28042801    if {[string is double $value] != 1} {
Note: See TracChangeset for help on using the changeset viewer.