Merge branch 'master' into durack1_master

Author: durack1

CMakeLists.txt

@@ -250,13 +250,16 @@ option(CDAT_BUILD_GUI "Builds GUI-based dependencies (Vistrails, ParaView, VisIt
 option(CDAT_BUILD_GRAPHICS "Build graphics-based dependencies (vcs, pyqt, Vistrails, ParaView, VisIt, R, etc.) " ON)
 option(CDAT_BUILD_ESGF "Alias for CDAT_BUILD_LEAN" OFF)
 option(CDAT_BUILD_UVCMETRICSPKG "Builds uvcmetrics package " ON)
-set(CDAT_BUILD_MODE "DEFAULT" CACHE STRING "Build mode for CDAT <ALL, LEAN, DEFAULT>")
-set_property(CACHE CDAT_BUILD_MODE PROPERTY STRINGS "DEFAULT" "ALL" "LEAN")
 
 # If ESGF option is on then our build mode is LEAN.
 if (CDAT_BUILD_ESGF)
+  if( (DEFINED CDAT_BUILD_MODE) AND (NOT "${CDAT_BUILD_MODE}" STREQUAL "LEAN") )
+    message(WARNING "[INFO] CDAT_BUILD_ESGF enabled, forcing CDAT_BUILD_MODE to LEAN")
+  endif()
   set(CDAT_BUILD_MODE "LEAN" CACHE STRING "Build mode for CDAT <ALL, LEAN, DEFAULT>" FORCE)
 endif()
+set(CDAT_BUILD_MODE "DEFAULT" CACHE STRING "Build mode for CDAT <ALL, LEAN, DEFAULT>")
+set_property(CACHE CDAT_BUILD_MODE PROPERTY STRINGS "DEFAULT" "ALL" "LEAN")
 
 # Set the state of LEAN all based on the MODE
 if (CDAT_BUILD_MODE STREQUAL "LEAN")

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()
 

Packages/vcs/Lib/VTKPlots.py

@@ -28,7 +28,9 @@ def __init__(self,parent):
       self.AddObserver("LeftButtonReleaseEvent", parent.leftButtonReleaseEvent )
       self.AddObserver( "ModifiedEvent", parent.configureEvent )
       self.AddObserver( "ConfigureEvent", parent.configureEvent )
-
+      if sys.platform == "darwin":
+          self.AddObserver( "RenderEvent", parent.renderEvent )
+      
 class VTKVCSBackend(object):
   def __init__(self,canvas,renWin=None, debug=False,bg=None):
     self._lastSize = None
@@ -41,16 +43,15 @@ def __init__(self,canvas,renWin=None, debug=False,bg=None):
     self.plotRenderers = set()
     self.renderer = None
     self._plot_keywords = ['renderer',]
-    self.numberOfPlotCalls = 0
+    self.numberOfPlotCalls = 0 
+    self.renderWindowSize=None
     if renWin is not None:
       self.renWin = renWin
       if renWin.GetInteractor() is None and self.bg is False:
         self.createDefaultInteractor()
     self.logo = None
-
-#   def applicationFocusChanged(self):
-#       for plotApp in self.plotApps.values():
-#           if hasattr(plotApp, 'refresh'): plotApp.refresh()
+    if sys.platform == "darwin":
+        self.reRender = False
 
   def setAnimationStepper( self, stepper ):
       for plot in self.plotApps.values():
@@ -61,12 +62,36 @@ def interact(self,*args,**kargs):
           warnings.warn("Cannot interact if you did not open the canvas yet")
           return
       interactor = self.renWin.GetInteractor()
+      ## Mac seems to handle events a bit differently
+      ## Need to add observers on renWin
+      ## Linux is fine w/o it so no need to do it
+      if sys.platform == "darwin":
+          self.renWin.AddObserver( "RenderEvent", self.renderEvent )
+          self.renWin.AddObserver("LeftButtonPressEvent", self.leftButtonPressEvent )
+          self.renWin.AddObserver("LeftButtonReleaseEvent", self.leftButtonReleaseEvent )
+          self.renWin.AddObserver( "ModifiedEvent", self.configureEvent )
+          self.renWin.AddObserver( "ConfigureEvent", self.configureEvent )
+          self.renWin.AddObserver( "EndEvent",self.endEvent)
       if interactor is None:
           warnings.warn("Cannot start interaction. Blank plot?")
           return
       warnings.warn("Press 'Q' to exit interactive mode and continue script execution")
       interactor.Start()
 
+  def endEvent(self,obj,event):
+    if self.renWin is not None:
+      if self.reRender:
+        self.reRender = False
+        self._lastSize = None
+        self.renWin.Render()
+
+  def renderEvent(self,caller,evt):
+    renwin = self.renWin if (caller == None) else caller
+    window_size = renwin.GetSize() 
+    if ( window_size <> self.renderWindowSize ): 
+      self.configureEvent(caller,evt)
+      self.renderWindowSize = window_size
+
   def leftButtonPressEvent(self,obj,event):
     xy = self.renWin.GetInteractor().GetEventPosition()
     sz = self.renWin.GetSize()
@@ -146,16 +171,17 @@ def leftButtonPressEvent(self,obj,event):
 
   def leftButtonReleaseEvent(self,obj,event):
     self.clickRenderer.RemoveAllViewProps()
-    self.clickRenderer.Render()
     self.renWin.RemoveRenderer(self.clickRenderer)
     self.renWin.Render()
 
   def configureEvent(self,obj,ev):
     sz = self.renWin.GetSize()
-    if self._lastSize == sz: # or (self._lastSize is None and hasattr(self,"fromVistrails")):
+    if self._lastSize == sz: 
       # We really only care about resize event
       # this is mainly to avoid segfault vwith Vistraisl which does
       # not catch configure Events but only modifiedEvents....
+      if self.renWin is not None and sys.platform == "darwin":
+        self.renWin.Render()
       return
     self._lastSize = sz
     plots_args = []
@@ -181,13 +207,16 @@ def configureEvent(self,obj,ev):
       self.createLogo()
     if self.renWin.GetSize()!=(0,0):
       self.scaleLogo()
+    if self.renWin is not None and sys.platform == "darwin":
+      self.renWin.Render()
+    if sys.platform == "darwin":
+        ## ON mac somehow we need to issue an extra Render after resize
+        self.reRender = True
 
   def clear(self):
     if self.renWin is None: #Nothing to clear
           return
     renderers = self.renWin.GetRenderers()
-#    plot_renderers = [ id(g.plot.renderer) for g in self.plotApps.values() ]
-#    print " ------------------------------------ ------------------------------------  CLEAR: %s  ------------------------------------ ------------------------------------ " % str( plot_renderers )
     renderers.InitTraversal()
     ren = renderers.GetNextItem()
     hasValidRenderer = True if ren is not None else False
@@ -204,7 +233,6 @@ def clear(self):
   def createDefaultInteractor( self, ren=None ):
     defaultInteractor = self.renWin.GetInteractor()
     if defaultInteractor is None:
-      #defaultInteractor = vtk.vtkGenericRenderWindowInteractor()
       defaultInteractor = vtk.vtkRenderWindowInteractor()
     self.vcsInteractorStyle = VCSInteractorStyle(self)
     if ren:
@@ -310,7 +338,6 @@ def close(self):
     self.renWin = None
 
   def geometry(self,x,y,*args):
-      #screenSize = self.renWin.GetScreenSize()
       self.renWin.SetSize(x,y)
 
   def flush(self):
@@ -331,8 +358,6 @@ def plot(self,data1,data2,template,gtype,gname,bg,*args,**kargs):
         self.renWin.SetOffScreenRendering(True)
         self.renWin.SetSize(self.canvas.bgX,self.canvas.bgY)
     self.cell_coordinates=kargs.get( 'cell_coordinates', None )
-    #self.renWin.Render()
-    #screenSize = self.renWin.GetScreenSize()
     if gtype == "text":
       tt,to = gname.split(":::")
       tt = vcs.elements["texttable"][tt]
@@ -649,13 +674,6 @@ def plotVector(self,data1,data2,tmpl,gm):
     glyphFilter.SetInputArrayToProcess(1,0,0,0,"vectors")
     glyphFilter.SetScaleFactor(2.*gm.scale)
 
-    #if cellData:
-    #    if ug.IsA("vtkUnstructuredGrid"):
-    #        glyphFilter.SetInputConnection(cln.GetOutputPort())
-    #    else:
-    #        glyphFilter.SetInputConnection(c2p.GetOutputPort())
-    #else:
-    #    glyphFilter.SetInputData(ug)
     glyphFilter.SetInputData(ug)
 
     mapper = vtk.vtkPolyDataMapper()
@@ -875,7 +893,6 @@ def plot2D(self,data1,data2,tmpl,gm):
               for j,color in enumerate(COLS[i]):
                   r,g,b = cmap.index[color]
                   lut.SetTableValue(j,r/100.,g/100.,b/100.)
-                  #print l[j],vcs.colors.rgb2str(r*2.55,g*2.55,b*2.55),l[j+1]
               mapper.SetLookupTable(lut)
               mapper.SetScalarRange(0,len(l)-1)
               mapper.SetScalarModeToUseCellData()
@@ -933,8 +950,6 @@ def plot2D(self,data1,data2,tmpl,gm):
               for k in legend.keys():
                   legend[float(numpy.ma.log10(legend[k]))] = legend[k]
                   del(legend[k])
-          #dx = (levs[-1]-levs[0])/(gm.color_2-gm.color_1+1)
-          #levs = numpy.arange(levs[0],levs[-1]+dx,dx)
 
         cols = range(gm.color_1,gm.color_2+1)
       else:

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__':