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/vtkglyphviewer.tcl

    r6212 r6213  
    117117    private variable _arcball ""
    118118
    119     private variable _dlist ""     ;    # list of data objects
    120     private variable _obj2ovride   ;    # maps dataobj => style override
    121     private variable _datasets     ;    # contains all the dataobj-component
    122                                    ;    # datasets in the server
    123     private variable _colormaps    ;    # contains all the colormaps
    124                                    ;    # in the server.
     119    private variable _dlist "";         # list of data objects
     120    private variable _obj2ovride;       # maps dataobj => style override
     121    private variable _datasets;         # contains all the dataobj-component
     122                                        # datasets in the server
     123    private variable _colormaps;        # contains all the colormaps
     124                                        # in the server.
    125125    # The name of the current colormap used.  The colormap is global to all
    126126    # heightmaps displayed.
    127127    private variable _currentColormap ""
    128128
    129     private variable _click        ;    # info used for rotate operations
    130     private variable _limits       ;    # autoscale min/max for all axes
    131     private variable _view         ;    # view params for 3D view
     129    private variable _click;            # info used for rotate operations
     130    private variable _limits;           # autoscale min/max for all axes
     131    private variable _view;             # view params for 3D view
    132132    private variable _settings
    133133    private variable _changed
    134134    private variable _reset 1;          # Connection to server has been reset.
    135135
    136     private variable _first ""     ;    # This is the topmost dataset.
     136    private variable _first "";         # This is the topmost dataset.
    137137    private variable _start 0
    138138    private variable _title ""
     
    16231623
    16241624itcl::body Rappture::VtkGlyphViewer::BuildGlyphTab {} {
    1625 
    16261625    set fg [option get $itk_component(hull) font Font]
    16271626    #set bfg [option get $itk_component(hull) boldFont Font]
Note: See TracChangeset for help on using the changeset viewer.