Changeset cfc0913 in sasview for sansview/perspectives/fitting/fitting.py

Timestamp:

Apr 6, 2009 4:56:35 PM (15 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:

40f9745

Parents:

ddfcd90

Message:

working on saving page status

File:

• sansview/perspectives/fitting/fitting.py (modified) (6 diffs)

sansview/perspectives/fitting/fitting.py

@@ -447 +447 @@
               
               
-    def _add_page_onmenu(self, name, page_info,fitproblem=None):
+    def _add_page_onmenu(self, name,fitproblem=None):
         """
             Add name of a closed page of fitpanel in a menu 
@@ -454 +454 @@
         for item in list:
             if name == item.GetItemLabel():
-                self.closed_page_dict[name][1:] = page_info, fitproblem
+                self.closed_page_dict[name][1] = fitproblem
                 
         if not name in self.closed_page_dict.keys():    
@@ -460 +460 @@
             event_id = wx.NewId()
             self.menu1.Append(event_id, name, "Show %s fit panel" % name)
-            self.closed_page_dict[name]= [event_id,page_info, fitproblem]
+            self.closed_page_dict[name]= [event_id, fitproblem]
             wx.EVT_MENU(self.parent,event_id,  self._open_closed_page)
         
@@ -468 +468 @@
             reopen a closed page
         """
-        for value in self.closed_page_dict.values():
+        for name, value in self.closed_page_dict.iteritems():
             if event.GetId() in value:
-                id, page_info,fitproblem = value
-        
-                if page_info.page_name !="Model Page":
-                    page = self.fit_panel.add_fit_page(data= page_info.data,
-                                                        page_info=page_info)
+                id,fitproblem = value
+                
+                if name !="Model Page":
+                    data= fitproblem.get_fit_data()
+                    page = self.fit_panel.add_fit_page(data= data,reset=True)
                     if fitproblem != None:
                         self.page_finder[page]=fitproblem
@@ -591 +591 @@
                         wx.PostEvent(self.parent, StatusEvent(status="Page was already Created"))
                 except:
-                    wx.PostEvent(self.parent, StatusEvent(status="Creating Fit page: %s"\
-                    %sys.exc_value))
-                    return
+                    raise
+                    #wx.PostEvent(self.parent, StatusEvent(status="Creating Fit page: %s"\
+                    #%sys.exc_value))
+                    #return
     
     def _single_fit_completed(self,result,pars,cpage, elapsed=None):
@@ -605 +606 @@
           
         """
-        #wx.PostEvent(self.parent, StatusEvent(status="Single fit \
-        #complete! " , type="stop"))
+        wx.PostEvent(self.parent, StatusEvent(status="Single fit \
+        complete! " , type="stop"))
         try:
             for page, value in self.page_finder.iteritems():