Changeset 1abcb04 in sasview

Timestamp:

Jun 5, 2009 9:08:48 PM (16 years ago)

Author:

Mathieu Doucet <doucetm@…>

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

410aad8

Parents:

7d8094b

Message:

guiframe: modified the dataFitting.Data1D to be a child class of DataLoader?.data_info.Data1D, as was originally designed. Added lots of TODOs for refactoring. Inserted a call to bridge the data of the newly defined Data1D to the output of DataLoader?. The data_loader module needs a lot of work.

Location:

guiframe

Files:

• dataFitting.py (modified) (2 diffs)
• data_loader.py (modified) (4 diffs)
• local_perspectives/plotting/Plotter1D.py (modified) (3 diffs)

guiframe/dataFitting.py

@@ -1 +1 @@
 """
-    Adapters for fitting module
+    A Data1D class compatible with guiframe from the output of DataLoader. 
 """
 from danse.common.plottools.plottables import Data1D as plotData1D
 from danse.common.plottools.plottables import Theory1D as plotTheory1D
 
-from DataLoader.data_info import DataInfo
+from DataLoader.data_info import Data1D as loader_data_1D
 
-class Data1D(plotData1D,DataInfo):
-    
+class Data1D(plotData1D, loader_data_1D):
+    """
+        A Data1D class compatible with guiframe from 
+        the output of DataLoader. The new class inherits 
+        from DataLoader.data_info.Data1D
+    """
     def __init__(self,x=[],y=[],dx=None,dy=None,dxl=None, dxw=None):
         plotData1D.__init__(self, x, y, dx, dy)
+        loader_data_1D.__init__(self, x=x, y=y, dx=dx, dy=dy)
         self.smearer=None
        
@@ -16 +21 @@
         self.dxw = dxw
  
-class Theory1D(plotTheory1D,DataInfo):
+class Theory1D(plotTheory1D, loader_data_1D):
+    """
+        A Theory1D class compatible with guiframe from 
+        the output of DataLoader. The new class inherits 
+        from DataLoader.data_info.Data1D
+    """
     def __init__(self,x=[],y=[],dy=None,dxl=None, dxw=None):
         plotTheory1D.__init__(self, x, y)
+        loader_data_1D.__init__(self, x=x, y=y, dx=dx, dy=dy)
         self.smearer=None
         

guiframe/data_loader.py

@@ -74 +74 @@
     """
         Use the DataLoader loader to created data to plot.
+        
+        TODO: this method needs a major cleanup. 
+        It's a complete mess. It needs:
+          - to be cleaned of code duplication
+          - to be cleaned of data duplication: we should not
+            need to reference all the Data1D data members.
+            It should be sufficient to use the Data1D class
+            defined in dataFitting (which btw needs a better name).
+        
         @param path: the path of the data to load
     """
@@ -125 +134 @@
             new_plot = Data1D(x=output.x, y=output.y, dx=output.dx,
                               dy= dy, dxl=dxl, dxw=dxw)
+            # Copy all the data to the new object so that the 
+            # new_plot object properly behaves as a data_info.Data1D.
+            # This also means that we should not have to copy all
+            # the data below...
+            output.clone_without_data(clone=new_plot)
                 
         ## source will request in dataLoader .manipulation module
@@ -160 +174 @@
         
     ## the output of the loader is a list , some xml files contain more than one data
+    #TODO: refactor this so that there is no duplication of code.
+    # There is no reason why the code above shouldn't be put in 
+    # a private method to be used within the loop below.
     else:
         i=1
@@ -176 +193 @@
                
             new_plot = Data1D(x=item.x,y=item.y,dx=dx,dy=item.dy,dxl=dxl,dxw=dxw)
+            # Copy all the data to the new object
+            item.clone_without_data(clone=new_plot)
             new_plot.source=item.source
             

guiframe/local_perspectives/plotting/Plotter1D.py

@@ -419 +419 @@
         """
             Save 1D  Data to  XML file
+            
+            TODO: Refactor and remove this method. See TODO in _onSave.
+            
             @param evt: Menu event
         """
@@ -439 +442 @@
         """
             Save file as txt
+            
+            TODO: Refactor and remove this method. See TODO in _onSave.
         """
         data = self.plots[self.graph.selected_plottable]
@@ -495 +500 @@
                 path = dlg.GetPath()
                 mypath = os.path.basename(path)
+                
+                #TODO: This is bad design. The DataLoader is designed to recognize extensions.
+                # It should be a simple matter of calling the .save(file, data, '.xml') method
+                # of the DataLoader.loader.Loader class. 
+                
                 if os.path.splitext(mypath)[1].lower() ==".txt":
                     self._onsaveTXT(path)