Changeset 6213

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)

Location:

branches/1.6/gui/scripts

Files:

• vtkglyphviewer.tcl (modified) (2 diffs)
• vtkisosurfaceviewer.tcl (modified) (7 diffs)

branches/1.6/gui/scripts/vtkglyphviewer.tcl

@@ -117 +117 @@
     private variable _arcball ""
 
-    private variable _dlist ""     ;    # list of data objects
-    private variable _obj2ovride   ;    # maps dataobj => style override
-    private variable _datasets     ;    # contains all the dataobj-component
-                                   ;    # datasets in the server
-    private variable _colormaps    ;    # contains all the colormaps
-                                   ;    # in the server.
+    private variable _dlist "";         # list of data objects
+    private variable _obj2ovride;       # maps dataobj => style override
+    private variable _datasets;         # contains all the dataobj-component
+                                        # datasets in the server
+    private variable _colormaps;        # contains all the colormaps
+                                        # in the server.
     # The name of the current colormap used.  The colormap is global to all
     # heightmaps displayed.
     private variable _currentColormap ""
 
-    private variable _click        ;    # info used for rotate operations
-    private variable _limits       ;    # autoscale min/max for all axes
-    private variable _view         ;    # view params for 3D view
+    private variable _click;            # info used for rotate operations
+    private variable _limits;           # autoscale min/max for all axes
+    private variable _view;             # view params for 3D view
     private variable _settings
     private variable _changed
     private variable _reset 1;          # Connection to server has been reset.
 
-    private variable _first ""     ;    # This is the topmost dataset.
+    private variable _first "";         # This is the topmost dataset.
     private variable _start 0
     private variable _title ""
@@ -1623 +1623 @@
 
 itcl::body Rappture::VtkGlyphViewer::BuildGlyphTab {} {
-
     set fg [option get $itk_component(hull) font Font]
     #set bfg [option get $itk_component(hull) boldFont Font]

branches/1.6/gui/scripts/vtkisosurfaceviewer.tcl

@@ -129 +129 @@
     private variable _arcball ""
 
-    private variable _dlist ""     ;    # list of data objects
-    private variable _obj2ovride   ;    # maps dataobj => style override
-    private variable _datasets     ;    # contains all the dataobj-component
-                                   ;    # datasets in the server
-    private variable _colormaps    ;    # contains all the colormaps
-                                   ;    # in the server.
+    private variable _dlist "";         # list of data objects
+    private variable _obj2ovride;       # maps dataobj => style override
+    private variable _datasets;         # contains all the dataobj-component
+                                        # datasets in the server
+    private variable _colormaps;        # contains all the colormaps
+                                        # in the server.
     # The name of the current colormap used.  The colormap is global to all
     # heightmaps displayed.
@@ -140 +140 @@
     private variable _currentNumContours -1
 
-    private variable _click        ;    # info used for rotate operations
-    private variable _limits       ;    # autoscale min/max for all axes
-    private variable _view         ;    # view params for 3D view
+    private variable _click;            # info used for rotate operations
+    private variable _limits;           # autoscale min/max for all axes
+    private variable _view;             # view params for 3D view
     private variable _settings
     private variable _changed
     private variable _reset 1;          # Connection to server has been reset.
 
-    private variable _first ""     ;    # This is the topmost dataset.
+    private variable _first "";         # This is the topmost dataset.
     private variable _start 0
     private variable _title ""
@@ -161 +161 @@
     private variable _cutplanePending 0
     private variable _field      ""
-    private variable _colorMode "scalar";   # Mode of colormap (vmag or scalar)
+    private variable _colorMode "scalar"; # Mode of colormap (vmag or scalar)
     private variable _fields
     private variable _curFldName ""
     private variable _curFldLabel ""
-    private variable _mouseOver "";     # what called LegendRangeAction, vmin or vmax
-    private variable _customRangeClick 1;   # what called ToggleCustomRange
+    private variable _mouseOver "";     # what called LegendRangeAction:
+                                        # vmin or vmax
+    private variable _customRangeClick 1; # what called ToggleCustomRange
 
     private common _downloadPopup;      # download options from popup
@@ -1699 +1700 @@
 
 itcl::body Rappture::VtkIsosurfaceViewer::BuildIsosurfaceTab {} {
-
     set fg [option get $itk_component(hull) font Font]
     #set bfg [option get $itk_component(hull) boldFont Font]
@@ -1801 +1801 @@
     }
     $inner.colormap choices insert end [GetColormapList]
-
     $itk_component(colormap) value "BCGYR"
     bind $inner.colormap <<Value>> \
@@ -2453 +2452 @@
 # USAGE: LegendPointToValue <x> <y>
 #
-# Convert an x,y point on the legend to a numeric isosurface value.
+# Convert an x,y point on the legend to a numeric field value.
 # ----------------------------------------------------------------------
 itcl::body Rappture::VtkIsosurfaceViewer::LegendPointToValue { x y } {
-
     set fname $_curFldName
 
@@ -2800 +2798 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::VtkIsosurfaceViewer::LegendRangeValidate {widget which value} {
-
     #check for a valid value
     if {[string is double $value] != 1} {