Changeset 6331 for qesdi

Timestamp:

18/01/10 17:20:30 (11 years ago)

Author:

pnorton

Message:

Introduced the 'dataVariables' config section to specify which of the many variables actually contains the data and to specify an alias for the variable name.

Location:

qesdi/graphplotter/trunk

Files:

• df_config/co2.ini (modified) (1 diff)
• graphplotter/controllers/buildplot.py (modified) (2 diffs)
• graphplotter/lib/df_config_reader.py (modified) (1 diff)
• graphplotter/lib/plot_builder.py (modified) (3 diffs)
• graphplotter/templates/buildplot.html (modified) (1 diff)

qesdi/graphplotter/trunk/df_config/co2.ini

@@ -7 +7 @@
 sensitivity=sensitivity_name
 model=model_name
+
+[DataVariables]
+data=carbon dioxide

qesdi/graphplotter/trunk/graphplotter/controllers/buildplot.py

@@ -21 +21 @@
         
         c.dataFiles = [''] + cr.getDataFileList()
-        log.debug("c.dataFiles = %s" % (c.dataFiles,))
+        
         params = getParams(request)
         
@@ -38 +38 @@
         dfConfig = cr.getConfig(c.selectedDataFile)
         reader = DataReader(dfConfig['path'], dfConfig['axisLookup'])
+        log.debug("dfConfig = %s" % (dfConfig,))
         
-        c.variables = [''] + reader.getVariableNames()
+        if 'dataVariables' in dfConfig:
+            allVars = reader.getVariableNames()
+            
+            for v in dfConfig['dataVariables'].keys():
+                assert v in allVars, 'Variable %s not found in file. Variables found = %s' % (v, allVars)
+                
+            c.variables = [('','')] + dfConfig['dataVariables'].items()
+            
+        else:
+            c.variables = [''] + reader.getVariableNames()
+        
+        
         c.selectedVariable = params.get('variable', '')
         

qesdi/graphplotter/trunk/graphplotter/lib/df_config_reader.py

@@ -45 +45 @@
                 
             dfConfig['axisLookup'] = axisLookup
+            
+        if self.cp.has_section('DataVariables'):
+            dataVariables = {}
+            for k in self.cp.options('DataVariables'):
+                dataVariables[k] = self.cp.get('DataVariables',k)
+            
+            dfConfig['dataVariables'] = dataVariables
+                        
     
         return dfConfig

qesdi/graphplotter/trunk/graphplotter/lib/plot_builder.py

@@ -37 +37 @@
         plt = Plot()
         
-        plt.setYLabel(self.params['variable'])
+        plt.setYLabel(self._getVariableName())
         plt.setXLabel(self.params['axis'])
         
-        s = set(selections[0].items())
+        commonItems = self._getCommonItems(selections)
         
-        for sel in selections[1:]:
-            s = s.intersection(sel.items())
-            
-        commonItems = dict(s)
-        
-        title = self.params['variable']+ ' vs ' + self.params['axis']
-        
-        if len(commonItems) > 1: 
-            title += ' with ' + self._getLineName(commonItems)
-            
-        plt.setTitle(title)
+        self._setPlotTitle(plt, commonItems)    
         
         log.debug("commonItems = %s" % (commonItems,))
@@ -61 +51 @@
         
             
+            kwargs ={}
+            
             lineName = self._getLineName(sel, commonItems)
             
-            plt.draw(xdata, ydata, label=lineName)
+            if lineName != '':
+                kwargs['label'] = lineName                
+            
+            plt.draw(xdata, ydata, **kwargs)
+            
+            log.debug("xdata = %s, ydata = %s" % (xdata, ydata,))
         
         return plt.getImage()
@@ -111 +108 @@
         name = name[:-2]
         return name
+    
+    def _getCommonItems(self, selections):
+        """
+        Finds all the common items in all the selection dictionaries
+        """
+        
+        if len(selections) > 1:
+            s = set(selections[0].items())
+            
+            for sel in selections[1:]:
+                s = s.intersection(sel.items())
+            
+            commonItems = dict(s)
+        else:
+            commonItems = {}
+        
+        return commonItems
+    
+    def _setPlotTitle(self, plt, commonItems):
+        
+        title = self._getVariableName() + ' vs ' + self.params['axis']
+        
+        if len(commonItems) > 1: 
+            title += ' with ' + self._getLineName(commonItems)
+            
+        plt.setTitle(title)
+        
+    def _getVariableName(self):
+        """
+        Attempt to get the variable name from the dataVariables section of the
+        config file, if not just return the variable from the parameters.
+        """
+        
+        if 'dataVariables' in self.config:
+            
+            if self.params['variable'] in self.config['dataVariables']:
+                return self.config['dataVariables'][self.params['variable']]
+        
+        return self.params['variable']

qesdi/graphplotter/trunk/graphplotter/templates/buildplot.html

@@ -134 +134 @@
         
     </form>
-    <input type="button" value="Remove Selection" onClick="onAddSelectionClick();"></input>
+    <input type="button" value="Remove Selection" onClick=""></input>
     
     <input type="button" value="Refresh" onClick="onRefreshClick();"></input>