Changeset f1e06a8e in sasview

Timestamp:

Jan 19, 2011 12:13:54 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:

890a909b

Parents:

ca4c150

Message:

working on loading data to invariant panel

Location:

invariantview/perspectives/invariant

Files:

• invariant.py (modified) (9 diffs)
• invariant_panel.py (modified) (6 diffs)

invariantview/perspectives/invariant/invariant.py

@@ -23 +23 @@
 from sans.guiframe.dataFitting import Data1D
 
-from sans.guicomm.events import NewPlotEvent
-from sans.guicomm.events import ERR_DATA
-from invariant_state import Reader as reader
+from sans.guiframe.events import NewPlotEvent
+from sans.guiframe.events import ERR_DATA
+from .invariant_state import Reader as reader
 from DataLoader.loader import Loader
-from invariant_panel import InvariantPanel
+from .invariant_panel import InvariantPanel
 from sans.guicomm.events import EVT_INVSTATE_UPDATE
 
@@ -57 +57 @@
         Show a general help dialog. 
         """
-        from help_panel import  HelpWindow
+        from .help_panel import  HelpWindow
         frame = HelpWindow(None, -1)    
         frame.Show(True)
@@ -144 +144 @@
         data.dy = dy
         data.name = item.name
+        data.title = item.title
         
         ## allow to highlight data when plotted
@@ -178 +179 @@
                 self.compute_helper(data=data)
                 
+    def set_data(self, data_list):
+        """
+        receive a list of data and compute invariant
+        """
+        if len(data_list) > 1:
+            msg = "invariant panel does not allow more than one value"
+            msg += " at this time"
+            raise ValueError, msg
+        elif len(data_list) == 1:
+            if issubclass(data_list[0].__class__, LoaderData1D):
+                self.compute_helper(data_list[0])
+                wx.PostEvent(self.parent, NewPlotEvent(plot=data_list[0],
+                                               title=data_list[0].title))
+            else:
+                msg = "invariant cannot be computed for"
+                msg += " data of type %s" % (data_list[0].__class__.__name__)
+                raise ValueError, msg
+            
+            
     def compute_helper(self, data):
         """
@@ -189 +209 @@
             # Set the data set to be user for invariant calculation
             self.invariant_panel.set_data(data=data)
-        
+           
     def save_file(self, filepath, state=None):
         """
@@ -282 +302 @@
         new_plot.group_id = self.__data.group_id
         new_plot.id = self.__data.id + name
+        new_plot.title = self.__data.title
         # Save theory_data in a state
         if data != None:
@@ -288 +309 @@
                 self.invariant_panel.state.theory_lowQ = copy.deepcopy(new_plot)
             elif name_head[0] == 'High':
-                self.invariant_panel.state.theory_highQ = copy.deepcopy(new_plot)
+                self.invariant_panel.state.theory_highQ =copy.deepcopy(new_plot)
 
         wx.PostEvent(self.parent, NewPlotEvent(plot=new_plot,
-                                               title=self.__data.name))
+                                               title=self.__data.title))
         
     def plot_data(self, scale, background):
@@ -301 +322 @@
         new_plot.group_id = self.__data.group_id
         new_plot.id = self.__data.id 
+        new_plot.title = self.__data.title
        
         # Save data in a state: but seems to never happen 
@@ -306 +328 @@
             self.invariant_panel.state.data = copy.deepcopy(new_plot)
         wx.PostEvent(self.parent, NewPlotEvent(plot=new_plot,
-                                               title=new_plot.name))
-        
+                                               title=new_plot.title))
+        

invariantview/perspectives/invariant/invariant_panel.py

@@ -12 +12 @@
 from sans.guiframe.utils import format_number
 from sans.guiframe.utils import check_float
-from sans.guicomm.events import NewPlotEvent, StatusEvent
-from invariant_details import InvariantDetailsPanel
-from invariant_details import InvariantContainer
-from invariant_widgets import OutputTextCtrl
-from invariant_widgets import InvTextCtrl
-from invariant_state import InvariantState as IState
+from sans.guiframe.events import StatusEvent
+from .invariant_details import InvariantDetailsPanel
+from .invariant_details import InvariantContainer
+from .invariant_widgets import OutputTextCtrl
+from .invariant_widgets import InvTextCtrl
+from .invariant_state import InvariantState as IState
 from sans.guiframe.panel_base import PanelBase
 # The minimum q-value to be used when extrapolating
@@ -141 +141 @@
             self.state.data = copy.deepcopy(data)
             self._reset_state_list()
+            
         return True  
     
@@ -531 +532 @@
         
         low_q = self.enable_low_cbox.GetValue()
-        high_q = self.enable_high_cbox.GetValue()  
+        high_q = self.enable_high_cbox.GetValue() 
+        temp_data = copy.deepcopy(self._data)
+        
         #set invariant calculator 
-        inv = invariant.InvariantCalculator(data=self._data,
+        inv = invariant.InvariantCalculator(data=temp_data,
                                             background=background,
                                             scale=scale)
@@ -618 +621 @@
             wx.PostEvent(self.parent,
                 StatusEvent(status='\nFinished invariant computation...'))
-            
+           
 
     def undo(self,event=None):
@@ -674 +677 @@
         : param event: report button event
         """
-        from report_dialog import ReportDialog
+        from .report_dialog import ReportDialog
 
         self.state.set_report_string()
@@ -717 +720 @@
             except:
                 pass
-          
+        
         self.compute_invariant(event=None)
+       
         # set the input params at the state at pre_state_num
         for key in current_state: