Changeset c26a64b in sasview for sansview/perspectives

Timestamp:

Jan 21, 2011 4:46:51 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:

cfcb7207

Parents:

df7046f

Message:

working loading data in fitting perspectives

Location:

sansview/perspectives/fitting

Files:

• fitting.py (modified) (2 diffs)
• fitting_widgets.py (added)

sansview/perspectives/fitting/fitting.py

@@ -50 +50 @@
 DEFAULT_QMAX = 0.13
 DEFAULT_NPTS = 50
+MAX_NBR_DATA = 4
 
 (PageInfoEvent, EVT_PAGE_INFO)   = wx.lib.newevent.NewEvent()
@@ -274 +275 @@
         receive a list of data to fit
         """
-        for data in data_list:
+        selected_data_list = []
+        if len(data_list) > MAX_NBR_DATA :
+            from fitting_widgets import DataDialog
+            dlg = DataDialog(data_list=data_list, nb_data=MAX_NBR_DATA)
+            if dlg.ShowModal() == wx.ID_OK:
+                selected_data_list = dlg.get_data()
+        else:
+            selected_data_list = data_list
+        for data in selected_data_list:
             self.add_fit_page(data=data)
             wx.PostEvent(self.parent, NewPlotEvent(plot=data, 
                                                    title=str(data.title)))
-            
             
     def set_state(self, state=None, datainfo=None, format=None):