Merge pull request #907 from UV-CDAT/vcs3D-fix_z_axis_problems

Vcs3 d fix z axis problems

ok tests pass on my ubuntu no need to update any files. Merging

Author: doutriaux1

Packages/DV3D/ButtonBarWidget.py

@@ -12,11 +12,6 @@
 DataDir = os.path.join( PackagePath, 'data' )
 ButtonDir = os.path.join( DataDir, 'buttons' )
 
-def get_scalar_value( tvals ):
-    if hasattr( tvals, '__iter__' ):
-        return get_scalar_value( tvals[0] )
-    else: return tvals
-
 class OriginPosition:
     Upper_Left = [ 0, 1 ] 
     Upper_Right = [ 1, 1 ]  

Packages/DV3D/ConfigurationFunctions.py

@@ -25,6 +25,11 @@
 SLIDER_MAX_VALUE = 100
 MAX_IMAGE_SIZE = 1000000
 
+def get_scalar_value( tvals ):
+    if hasattr( tvals, '__iter__' ):
+        return get_scalar_value( tvals[0] )
+    else: return tvals
+    
 def isNumerical( vals ):
     for val in vals:
         if type( val ) not in [ int, float ]: return False  
@@ -616,6 +621,7 @@ def serialize( self ):
         return str( self.values )
 
     def getValue( self, key=0, default_value=None ):
+        if key == None: return default_value
         return self.values.get( key, default_value )
 
     def getState( self ):

Packages/DV3D/DV3DPlot.py

@@ -288,12 +288,14 @@ def getConstituentSelectionButton(self, config_function, build_args, position, *
         control_bar.reposition()
         return control_bar
 
-    def processConfigParameterChange( self, parameter ):
-        values = parameter.getValues()
+    def processConfigParameterChange( self, parameter, val_key = None ):
+        values = parameter.getValue(val_key)
+        if values == None: values = parameter.getValues() 
+        if not hasattr( values, '__iter__' ): values = [ values ]
         state = parameter.getState()
         if state <> None: addState( values, state )
         argList = [ parameter.name, parameter.ptype, str(values) ] 
-#        print " ..........>>>>>> Process Config Parameter Change: %s " % str(argList)  
+        #print " ..........>>>>>> Process Config Parameter Change: %s ( key: %s ) " % ( str(argList), str( val_key ) )  
         self.ParameterValueChanged( argList )
 
     def processConfigStateChange( self, parameter ):
@@ -333,7 +335,6 @@ def terminate( self ):
     def quit( self, **args ):
         eventArgs = args.get( 'args', None )
         if eventArgs and ( eventArgs[1] == 'Q' ):
-            self.recordCamera()
             self.saveState()
         self.onClosing()
         sys.exit( 0 )
@@ -405,6 +406,7 @@ def changeButtonActivations(self, activation_list ):
             self.changeButtonActivation( *activation_spec )
 
     def saveState(self, **args): 
+        self.recordCamera()
         self.cfgManager.saveState()
 
     def getStateData(self, **args): 
@@ -856,7 +858,8 @@ def buildPlotButtons( self, **args ):
         bbar = self.buttonBarHandler.createButtonBarWidget( bbar_name, self.renderWindowInteractor, position=( 0.0, 0.96) )
         self.buttonBarHandler.DefaultGroup = 'SliceRoundRobin'
         if (self.type == '3d_vector') or not enable_3d_plots:
-            b = bbar.addSliderButton( names=['ZSlider'],  key='z', toggle=True, group='SliceRoundRobin', sliderLabels='Slice Position', label="Slicing", state = 1, interactionHandler=self.processSlicingCommand )            
+            sliderLabels= 'Slice Position' if enable_3d_plots else []
+            b = bbar.addSliderButton( names=['ZSlider'],  key='z', toggle=True, group='SliceRoundRobin', sliderLabels=sliderLabels, label="Slicing", state = 1, interactionHandler=self.processSlicingCommand )            
         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 )

Packages/DV3D/RectilinearGridPlot.py

@@ -10,12 +10,8 @@
 from ImagePlaneWidget import *  
 from StructuredGridPlot import  *
 from StructuredDataset import *
+from ConfigurationFunctions import get_scalar_value
 import numpy as np
-
-def get_scalar_value( tvals ):
-    if hasattr( tvals, '__iter__' ):
-        return get_scalar_value( tvals[0] )
-    else: return tvals
 
 LegacyAbsValueTransferFunction = 0
 LinearTransferFunction = 1 
@@ -382,7 +378,8 @@ def processSlicingCommand( self, args, config_function = None ):
                 self.ProcessIPWAction( plane_widget, ImagePlaneWidget.InteractionUpdateEvent, action = ImagePlaneWidget.Pushing )
         elif args and args[0] == "EndConfig":
             plane_widget.endSlicing()
-            self.processConfigParameterChange( slicePosition )
+            val_key = 'relative' if (plane_index == 2) else None
+            self.processConfigParameterChange( slicePosition, val_key )
         elif args and args[0] == "InitConfig":
             self.skipIndex = 4
             bbar = self.getPlotButtonbar()

Packages/DV3D/StructuredVariableReader.py

@@ -103,7 +103,7 @@ def __init__(self, **args):
             self.vars =  args.get( 'vars', None )
             if self.vars <> None:
                 dfile = self.vars[0].parent
-                self.subSpace = args.get( 'axes', 'xyz' )
+                self.subSpace = get_scalar_value( args.get( 'axes', 'xyz' ) )
                 if dfile <> None:
                     self.datasetId = dfile.Title if hasattr( dfile, 'Title' ) else dfile.id
                     self.fileSpecs = dfile.id

Packages/DV3D/demo/demo_plots/clt_xyt_demo.py

@@ -5,8 +5,14 @@
 dv3d = vcs.get3d_scalar('Hovmoller3D')
 dv3d.ToggleSurfacePlot = vcs.on
 dv3d.ToggleVolumePlot = vcs.on
-dv3d.IsosurfaceValue = [11.4]
+dv3d.IsosurfaceValue = [ 10.0  ]
+dv3d.ToggleClipping = [-180.0, 175.0, -22.0, 90.0,  0.0, 119.0 ]
 dv3d.ScaleTransferFunction = [80, 100, 1]
+dv3d.ScaleOpacity={ 'Volume': [0.0, 0.2] }
+dv3d.ZSlider = ( 0.0, vcs.on )
+dv3d.YSlider = ( 20.0, vcs.on )
+dv3d.Camera={'Position': (436.8, -126.3, 285.2), 'ViewUp': (-0.5, 0.25, 0.83), 'FocalPoint': (9.6, 19.9, -3.2)}
+
 x.plot( v, dv3d )
 x.interact()
 

testing/dv3d/CMakeLists.txt

@@ -22,3 +22,9 @@ add_test(dv3d_constituents_test
 )
 
 
+add_test(dv3d_hovmoller_test
+  ${CMAKE_INSTALL_PREFIX}/bin/python
+  ${cdat_SOURCE_DIR}/testing/dv3d/dv3d_hovmoller_test.py
+)
+
+

testing/dv3d/TestDefinitions.py

@@ -47,7 +47,7 @@
                                  'YSlider': ( vcs.off ), 
                                  }  )       
 
-test3 =  vcsTest( 'dv3d_constituents_test', file="geos5-sample.nc", vars = [ 'uwnd' ], 
+test4 =  vcsTest( 'dv3d_constituents_test', file="geos5-sample.nc", vars = [ 'uwnd' ], 
                      parameters={'VerticalScaling': 5.0,
                                  'ToggleClipping': ( 40, 360, -28, 90 ),
                                  'ToggleVolumePlot': vcs.on,  
@@ -62,6 +62,14 @@
                                  'YSlider': ( 0.0,   vcs.off ), 
                                  'Camera': { 'Position': (-161, -171, 279), 'ViewUp': (.29, 0.67, 0.68), 'FocalPoint': (146.7, 8.5, -28.6)  }
                                  }  )       
+
+test5 =  vcsTest( 'dv3d_hovmoller_test', file="clt.nc", vars = [ 'clt' ], template = 'Hovmoller3D',
+                     parameters={'BasemapOpacity': 0.5,
+                                 'XSlider': ( 77.8, vcs.on ),
+                                 'ZSlider': ( 0.1,   vcs.on ),
+                                 'YSlider': ( 49.0,   vcs.on ), 
+                                 'Camera': {'Position': (-300, -409, 400), 'ViewUp': (0.156, 0.64, 0.75), 'FocalPoint': (-23.2, 14.2, -20)}
+                                 }  )
 
 if __name__ == '__main__':
 

testing/dv3d/TestManager.py

@@ -154,5 +154,5 @@ def writeCMakeDef( self, f ):
 if __name__ == '__main__':
     from TestDefinitions import testManager    
 #    testManager.runTests()
-    testManager.runTest( 'dv3d_slider_test', True )
+    testManager.runTest( 'dv3d_hovmoller_test', True )
 #    testManager.showTest( 'dv3d_constituents_test' )

testing/dv3d/dv3d_hovmoller_test.py

@@ -0,0 +1,4 @@
+import sys
+from TestDefinitions import testManager
+interactive = ( len(sys.argv) > 1 ) and ( sys.argv[1] == '-i' )
+testManager.runTest( 'dv3d_hovmoller_test', interactive )