Merge pull request #2003 from UV-CDAT/fix_broken_dv3d

Fixes failing DV3D tests and VCS behavior

Author: danlipsa

Packages/DV3D/ConfigurationFunctions.py

@@ -245,7 +245,7 @@ def __init__( self, **args ):
         if ( self.parent <> None ):
             for parm_address in self.parent.parameters.keys():
                 basename = get_parameter_name( parm_address )
-                self.parameters[basename] = self.getParameter( basename  )
+                self.parameters[basename] = ConfigParameter(basename, parent=self.parent.getParameter(basename))
         self.initialized = False
 
     def clear( self, cell ):
@@ -264,7 +264,6 @@ def getParameter( self, param_name, **args ):
             if self.parent is None:
                 cparm = ConfigParameter( param_name, **args )
             else:
-#                print "Getting config param from parent: ", param_name
                 cparm_parent = self.parent.getParameter( param_name, cell=self.cell_coordinates )
                 cparm = ConfigParameter( param_name, parent=cparm_parent, **args )
             self.addParam( param_name, cparm )

Packages/vcs/vcs/dv3d.py

@@ -126,19 +126,38 @@ def __init__(self, Gfdv3d_name, Gfdv3d_name_src='default'):
         self.projection = 'default'
         self.provenanceHandler = None
 
+        vcs.elements[self.g_name][Gfdv3d_name] = self
+
+        self._axes = "xyz"
+
+        # Use parent config values if possible
+        if isinstance(Gfdv3d_name_src, (unicode, str)):
+            # Make sure we aren't inheriting from ourself
+            if Gfdv3d_name_src != Gfdv3d_name:
+                parent_cfg = vcs.elements[self.g_name][Gfdv3d_name_src].cfgManager
+                self._axes = vcs.elements[self.g_name][Gfdv3d_name_src]._axes
+            else:
+                parent_cfg = None
+        else:
+            # Make sure we aren't inheriting from ourself
+            if Gfdv3d_name_src.name != self.name:
+                parent_cfg = Gfdv3d_name_src.cfgManager
+                self._axes = Gfdv3d_name_src._axes
+            else:
+                parent_cfg = None
+
+        self.cfgManager = ConfigManager(cm=parent_cfg)
+
         if Gfdv3d_name == "Hovmoller3D":
             self._axes = "xyt"
-        else:
-            self._axes = "xyz"
 
-        self.cfgManager = ConfigManager()
         self.ncores = multiprocessing.cpu_count()
+
         self.addParameters()
 
-        vcs.elements[self.g_name][Gfdv3d_name] = self
         self.plot_attributes['name'] = self.g_name
         self.plot_attributes['template'] = Gfdv3d_name
-#        print "Adding VCS element: %s %s " % ( self.g_name, Gfdv3d_name )
+
 
     def setProvenanceHandler(self, provenanceHandler):
         self.provenanceHandler = provenanceHandler
@@ -215,22 +234,22 @@ class Gf3Dvector(Gfdv3d):
 
     def __init__(self, Gfdv3d_name, Gfdv3d_name_src='default'):
         self.g_name = '3d_vector'
-        Gfdv3d.__init__(self, Gfdv3d_name, Gfdv3d_name_src='default')
+        Gfdv3d.__init__(self, Gfdv3d_name, Gfdv3d_name_src=Gfdv3d_name_src)
 
 
 class Gf3Dscalar(Gfdv3d):
 
     def __init__(self, Gfdv3d_name, Gfdv3d_name_src='default'):
         self.g_name = '3d_scalar'
-        Gfdv3d.__init__(self, Gfdv3d_name, Gfdv3d_name_src='default')
+        Gfdv3d.__init__(self, Gfdv3d_name, Gfdv3d_name_src=Gfdv3d_name_src)
         self.VectorDisplay = Gfdv3d_name
 
 
 class Gf3DDualScalar(Gfdv3d):
 
     def __init__(self, Gfdv3d_name, Gfdv3d_name_src='default'):
         self.g_name = '3d_dual_scalar'
-        Gfdv3d.__init__(self, Gfdv3d_name, Gfdv3d_name_src='default')
+        Gfdv3d.__init__(self, Gfdv3d_name, Gfdv3d_name_src=Gfdv3d_name_src)
 
 if __name__ == '__main__':
     dv3d = vcs.get3d_scalar()

testing/dv3d/TestManager.py

@@ -106,9 +106,8 @@ def build(self):
 
         plot_kwargs = { 'cdmsfile': self.file.id, 'window_size': (900,600) }
         self.canvas.setantialiasing(False)
-        self.canvas.plot( *plot_args, **plot_kwargs )
-        self.plot = self.canvas.backend.plotApps[ self.gm ]
-#        self.applyActions()
+        display = self.canvas.plot( *plot_args, **plot_kwargs )
+        self.plot = self.canvas.backend.plotApps[ vcs.elements[display.g_type][display.g_name] ]
 
     def applyActions(self):
         for action in self.actions: