Changeset bcd6d51 in sasview for sansview/perspectives/fitting/fitpanel.py

Timestamp:

Oct 16, 2008 11:28:59 AM (16 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:

4ddf1067

Parents:

f8ce013

Message:

working on data2D panel

File:

• sansview/perspectives/fitting/fitpanel.py (modified) (2 diffs)

sansview/perspectives/fitting/fitpanel.py

@@ -66 +66 @@
       
         
-    def add_fit_page( self,page_title ):
+    def add_fit_page( self,data ):
         """ 
             Add a fitting page on the notebook contained by fitpanel
@@ -73 +73 @@
             @return panel : page just added for futher used. is used by fitting module
         """     
-        if self.fit_page_name != page_title:
-            from fitpage import FitPage
-            panel = FitPage(self.nb, -1)
+        try:
+            name = data.group_id # item in Data1D
+        except:
+            name = 'Fit'
+        if self.fit_page_name != name:
+            if data.__class__.__name__=='MetaData2D':
+                 from fitpage2D import FitPage2D
+                 panel = FitPage2D(self.nb, -1)
+            else:
+                from fitpage1D import FitPage1D
+                panel = FitPage1D(self.nb, -1)
             panel.set_manager(self.manager)
             panel.set_owner(self.event_owner)
-            self.nb.AddPage(page=panel,text=page_title,select=True)
+            self.nb.AddPage(page=panel,text=name,select=True)
             panel.populate_box( self.model_list_box)
-            self.fit_page_name = page_title
+            self.fit_page_name = name
             return panel