Changeset 5349 for branches/1.4/gui


Ignore:
Timestamp:
Apr 28, 2015 10:18:52 PM (9 years ago)
Author:
ldelgass
Message:

merge r5347 from trunk

Location:
branches/1.4
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • branches/1.4

    • Property svn:mergeinfo changed
      /trunkmerged: 5347

  • branches/1.4/gui/scripts/nanovisviewer.tcl

    r5301 r5349  
    155155    private variable _resizeLegendPending 0
    156156
    157     common _downloadPopup              ;# download options from popup
     157    private common _downloadPopup      ;# download options from popup
    158158    private common _hardcopy
    159159}

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

    r5338 r5349  
    133133    private variable _title ""
    134134
    135     common _downloadPopup;              # download options from popup
     135    private common _downloadPopup;      # download options from popup
    136136    private common _hardcopy
    137137    private variable _width 0

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

    r5206 r5349  
    144144    private variable _contourList ""
    145145
    146     common _downloadPopup;              # download options from popup
     146    private common _downloadPopup;      # download options from popup
    147147    private common _hardcopy
    148148    private variable _width 0

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

    r5206 r5349  
    139139    private variable _contourList ""
    140140
    141     common _downloadPopup;              # download options from popup
     141    private common _downloadPopup;      # download options from popup
    142142    private common _hardcopy
    143143    private variable _width 0

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

    r5338 r5349  
    154154    private variable _widget
    155155
    156     common _downloadPopup;              # download options from popup
     156    private common _downloadPopup;      # download options from popup
    157157    private common _hardcopy
    158158    private variable _width 0

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

    r5338 r5349  
    114114    private variable _title ""
    115115
    116     common _downloadPopup;              # download options from popup
     116    private common _downloadPopup;      # download options from popup
    117117    private common _hardcopy
    118118    private variable _width 0

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

    r5338 r5349  
    136136    private variable _seeds
    137137
    138     common _downloadPopup;              # download options from popup
     138    private common _downloadPopup;      # download options from popup
    139139    private common _hardcopy
    140140    private variable _width 0

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

    r5338 r5349  
    135135    private variable _contourList ""
    136136
    137     common _downloadPopup;              # download options from popup
     137    private common _downloadPopup;      # download options from popup
    138138    private common _hardcopy
    139139    private variable _width 0

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

    r5206 r5349  
    144144    private variable _havePolydata 0
    145145
    146     private variable _first ""     ;# This is the topmost dataset.
     146    private variable _first "";         # This is the topmost dataset.
    147147    private variable _start 0
    148148    private variable _title ""
    149149
    150     common _downloadPopup          ;# download options from popup
     150    private common _downloadPopup;      # download options from popup
    151151    private common _hardcopy
    152152    private variable _width 0

  • branches/1.4/gui/scripts/vtkvolumeviewer.tcl

    r5338 r5349  
    138138    private variable _title ""
    139139
    140     common _downloadPopup;              # download options from popup
     140    private common _downloadPopup;      # download options from popup
    141141    private common _hardcopy
    142142    private variable _width 0
Note: See TracChangeset for help on using the changeset viewer.