Merge pull request #1147 from UV-CDAT/vcs3D-fix_2.2_slider_issues

Vcs3 d fix 2.2 slider issues

Author: doutriaux1

Packages/DV3D/ButtonBarWidget.py

@@ -723,14 +723,17 @@ def releaseSliders( self ):
             self.releaseSlider( index )
 
     def positionSlider(self, position_index, n_sliders ):
-        slider_pos = self.slider_postions[ n_sliders ]
-        ( process_mode, interaction_state, swidget ) = self.currentControls[position_index]
-        sliderRep = swidget.GetRepresentation( )
-        sliderRep.GetPoint1Coordinate().SetValue( slider_pos[position_index][0], 0.06, 0 )
-        sliderRep.GetPoint2Coordinate().SetValue( slider_pos[position_index][1], 0.06, 0 )
-        sliderRep.Modified()
-        swidget.Modified()
-        sliderRep.NeedToRenderOn()
+        try:
+            slider_pos = self.slider_postions[ n_sliders ]
+            ( process_mode, interaction_state, swidget ) = self.currentControls[position_index]
+            sliderRep = swidget.GetRepresentation( )
+            sliderRep.GetPoint1Coordinate().SetValue( slider_pos[position_index][0], 0.06, 0 )
+            sliderRep.GetPoint2Coordinate().SetValue( slider_pos[position_index][1], 0.06, 0 )
+            sliderRep.Modified()
+            swidget.Modified()
+            sliderRep.NeedToRenderOn()
+        except Exception, err:
+            print>>sys.stderr, " Error in positionSlider: ", str( err )
 
     def setSliderValues( self, values ):
         for index, value in enumerate(values):

Packages/DV3D/DV3DPlot.py

@@ -932,9 +932,8 @@ def buildPlotButtons( self, **args ):
         if (self.type == '3d_vector') or not enable_3d_plots:
             sliderLabels= 'Slice Position' if enable_3d_plots else []
             b = bbar.addSliderButton( names=['ZSlider'],  key='z', visible=enable_3d_plots, toggle=True, group='SliceRoundRobin', sliderLabels=sliderLabels, label="Slicing", state = 1, interactionHandler=self.processSlicingCommand )
-            if not enable_3d_plots:
-                vs_button = self.buttonBarHandler.findButton( 'VerticalScaling' )
-                if vs_button is not None: vs_button.setVisibility( False )
+            vs_button = self.buttonBarHandler.findButton( 'VerticalScaling' )
+            if vs_button is not None: vs_button.setVisibility( False )
         else:
             b = bbar.addConfigButton( names=['SliceRoundRobin'],  key='p', interactionHandler=bbar.sliceRoundRobin )
             b = bbar.addSliderButton( names=['XSlider'],  key='x', toggle=True, group='SliceRoundRobin', sliderLabels='X Slice Position', label="Slicing", position=[0,3], interactionHandler=self.processSlicingCommand )