Changeset 784e2fa in sasview for sansview/perspectives/fitting

Timestamp:

Apr 23, 2010 12:29:25 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:

0b57a57

Parents:

479eced

Message:

make sur the fitpage is close when removing data1D from the graph

Location:

sansview/perspectives/fitting

Files:

• fitpanel.py (modified) (1 diff)
• fitting.py (modified) (2 diffs)

sansview/perspectives/fitting/fitpanel.py

@@ -186 +186 @@
             close a fit page when its data is completely remove from the graph
         """
+        if deleted_data is None:
+            return
         for index in range(self.GetPageCount()):
             selected_page = self.GetPage(index) 
             if hasattr(selected_page,"get_data"):
                 data = selected_page.get_data()
+                if data is None:
+                    #the fitpanel exists and only the initial fit page is open 
+                    #with no selected data
+                    return
                 if data.name == deleted_data.name:
                     self._close_helper(selected_page)

sansview/perspectives/fitting/fitting.py

@@ -618 +618 @@
         """
             request fitpanel to close a given page when its unique data is removed 
-            from the plot
+            from the plot. close fitpage only when the a loaded data is removed
         """    
-        self.fit_panel.close_page_with_data(event.data) 
+        if event is None or event.data is None:
+            return
+       
+        if hasattr(event.data,"is_data"):
+            if not event.data.is_data or event.data.__class__.__name__=="Data1D":
+                self.fit_panel.close_page_with_data(event.data) 
         
     def _add_page_onmenu(self, name,fitproblem=None):
@@ -697 +702 @@
             self.fitter.set_data(data=metadata,Uid=self.fit_id,
                                  smearer=smearer,qmin= qmin,qmax=qmax )
-            #print "self.fitter.set_data"
+           
             self.fitter.select_problem_for_fit(Uid= self.fit_id,
                                                value= value.get_scheduled())