Changeset 882a912 in sasview

Timestamp:

Apr 17, 2009 2:39:42 PM (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:

6ed82c7

Parents:

5ee2306

Message:

fitting model with 2 different plot

Location:

sansview/perspectives/fitting

Files:

• fitpage.py (modified) (1 diff)
• fitpanel.py (modified) (5 diffs)

sansview/perspectives/fitting/fitpage.py

@@ -530 +530 @@
             return 
         
+        
+    def set_data(self, data ):
+        """
+            reset the current data 
+        """
+        if data ==None:
+            return 
+        self.data =data
+        self.state.data= data 
+        self._fill_datainfo_sizer()
+        self.SetScrollbars(20,20,200,100)
+        self.Layout()   
+        
     def reset_page(self, state):
         """

sansview/perspectives/fitting/fitpanel.py

@@ -79 +79 @@
         #model page info
         self.model_page_number=None
-       
+        ## fit page number for model plot
+        self.fit_page1D_number=None
+        self.fit_page2D_number=None
         self.model_page=None
         self.sim_page=None
@@ -121 +123 @@
        
                 fitproblem= page_finder[selected_page].clone()
+                if self.GetPageIndex(selected_page)==self.fit_page1D_number:
+                    self.fit_page1D_number=None
+                if self.GetPageIndex(selected_page)==self.fit_page2D_number:
+                    self.fit_page2D_number=None
                 ## page on menu
                 self.manager._add_page_onmenu(page_name, fitproblem)
@@ -185 +191 @@
             @return panel : page just added for further used. is used by fitting module
         """     
-        try:
+        if data.is_data:
             name = data.name 
-        except:
-            name = 'Fit'
+        else:
+            if data.__class__.__name__=="Data2D":
+                name = 'Model 2D Fit'
+            else:
+                name = 'Model 1D Fit'
         if not name in self.list_fitpage_name:
             myinfo = PageInfo( data=data, name=name )
@@ -202 +211 @@
             
             self.AddPage(page=panel, caption=name, select=True)
+            if name == 'Model 1D Fit':
+                self.fit_page1D_number= self.GetPageIndex(panel)
+            if name =='Model 2D Fit':
+                self.fit_page2D_number= self.GetPageIndex(panel)
+                
             self.list_fitpage_name.append(name)
             if reset:
@@ -210 +224 @@
                 self.fit_page_name[name]=[]
                 self.fit_page_name[name].insert(0,panel.createMemento())
-         
+            #GetPage(self, page_idx) 
             return panel 
-        else:
-            return None 
+        elif name =='Model 1D Fit':
+            if self.fit_page1D_number!=None:
+                panel =self.GetPage(self.fit_page1D_number) 
+                self.fit_page_name[name]=[]
+                self.fit_page_name[name].insert(0,panel.createMemento())
+                return panel
+            return None
+        elif name =='Model 2D Fit':
+            if self.fit_page2D_number!=None:
+                panel =self.GetPage(self.fit_page2D_number) 
+                self.fit_page_name[name]=[]
+                self.fit_page_name[name].insert(0,panel.createMemento())
+                return panel
+            return None
+        return None