Changeset 0348245 in sasview

Timestamp:

Feb 16, 2011 3:48:32 PM (14 years ago)

Author:

Gervaise Alina <gervyh@…>

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:

dd03efb

Parents:

0bab10b

Message:

working on data manager

Location:

guiframe

Files:

• data_manager.py (modified) (2 diffs)
• gui_manager.py (modified) (2 diffs)
• local_perspectives/data_loader/data_loader.py (modified) (1 diff)

guiframe/data_manager.py

@@ -16 +16 @@
 """
 import logging
+import os
 from sans.guiframe.data_state import DataState
 from sans.guiframe.utils import parse_name
+import DataLoader.data_info as DataInfo
+from sans.guiframe.dataFitting import Data1D
+from sans.guiframe.dataFitting import Data2D
   
 class DataManager(object):
@@ -36 +40 @@
         self.data_name_dict = {}
       
+    def create_gui_data(self, data, path=None):
+        """
+        Receive data from loader and create a data to use for guiframe
+        """
+        
+        if issubclass(DataInfo.Data2D, data.__class__):
+            new_plot = Data2D(image=None, err_image=None) 
+        else: 
+            new_plot = Data1D(x=[], y=[], dx=None, dy=None)
+           
+        new_plot.copy_from_datainfo(data) 
+        data.clone_without_data(clone=new_plot)  
+        #creating a name for data
+        name = ""
+        title = ""
+        file_name = ""
+        if path is not None:
+            file_name = os.path.basename(path)
+        if data.run:
+            name = data.run[0]
+        if name == "":
+            name = file_name
+        name = self.rename(name)
+        #find title
+        if data.title.strip():
+            title = data.title
+        if title.strip() == "":
+            title = file_name
+        
+        if new_plot.filename.strip() == "":
+            new_plot.filename = file_name
+        
+        new_plot.name = name
+        new_plot.title = title
+        ## allow to highlight data when plotted
+        new_plot.interactive = True
+        ## when 2 data have the same id override the 1 st plotted
+        new_plot.id = name
+        ##group_id specify on which panel to plot this data
+        new_plot.group_id = name
+        new_plot.is_data = True
+        new_plot.path = path
+        ##post data to plot
+        # plot data
+        return new_plot
+ 
     def rename(self, name):
         """

guiframe/gui_manager.py

@@ -48 +48 @@
 from sans.guiframe.panel_base import PanelBase
 from sans.guiframe.gui_toolbar import GUIToolBar
-from sans.guiframe.dataFitting import Data1D
-from sans.guiframe.dataFitting import Data2D
 from DataLoader.loader import Loader
-
-from DataLoader.loader import Loader
-import DataLoader.data_info as DataInfo
 
 
@@ -898 +893 @@
     def create_gui_data(self, data, path=None):
         """
-        Receive data from loader and create a data to use for guiframe
-        """
-        
-        if issubclass(DataInfo.Data2D, data.__class__):
-            new_plot = Data2D(image=None, err_image=None) 
-        else: 
-            new_plot = Data1D(x=[], y=[], dx=None, dy=None)
-           
-        new_plot.copy_from_datainfo(data) 
-        data.clone_without_data(clone=new_plot)  
-        #creating a name for data
-        name = ""
-        title = ""
-        file_name = ""
-        if path is not None:
-            file_name = os.path.basename(path)
-        if data.run:
-            name = data.run[0]
-        if name == "":
-            name = file_name
-        name = self._data_manager.rename(name)
-        #find title
-        if data.title.strip():
-            title = data.title
-        if title.strip() == "":
-            title = file_name
-        
-        if new_plot.filename.strip() == "":
-            new_plot.filename = file_name
-        
-        new_plot.name = name
-        new_plot.title = title
-        ## allow to highlight data when plotted
-        new_plot.interactive = True
-        ## when 2 data have the same id override the 1 st plotted
-        new_plot.id = name
-        ##group_id specify on which panel to plot this data
-        new_plot.group_id = name
-        new_plot.is_data = True
-        new_plot.path = path
-        ##post data to plot
-        # plot data
-        return new_plot
- 
+        """
+        return self._data_manager.create_gui_data(data, path)
+    
     def get_data(self, path):
         """

guiframe/local_perspectives/data_loader/data_loader.py

@@ -26 +26 @@
         #Default location
         self._default_save_location = None  
-        self.data_name_dict = {}
         self.loader = Loader()  
         self._data_menu = None