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

Timestamp:

Apr 2, 2009 4:38:56 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:

87a43fe

Parents:

b03deea

Message:

draw panel according to the fitting type
closing and reopen page i am still working on

File:

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

sansview/perspectives/fitting/fitting.py

@@ -451 +451 @@
             Add name of a closed page of fitpanel in a menu 
         """
-        if len(self.closed_page_dict)>0:
-            for k , value in self.closed_page_dict.iteritems():
-                if not name in value:
-                    # Post paramters
-                    event_id = wx.NewId()
-                    self.menu1.Append(event_id, name, "Show %s fit panel" % name)
-                    self.closed_page_dict[event_id ]= [page_info, fitproblem]
-                else:
-                    event_id= k
-                    self.closed_page_dict[k ]= [page_info, fitproblem]
-        else:
+        list = self.menu1.GetMenuItems()
+        for item in list:
+            if name == item.GetItemLabel():
+                self.closed_page_dict[name][1:] = page_info, fitproblem
+                
+        if not name in self.closed_page_dict.keys():    
+            # Post paramters
             event_id = wx.NewId()
             self.menu1.Append(event_id, name, "Show %s fit panel" % name)
-            self.closed_page_dict[event_id ]= [page_info, fitproblem]
-        wx.EVT_MENU(self.parent,event_id,  self._open_closed_page)
+            self.closed_page_dict[name]= [event_id,page_info, fitproblem]
+            wx.EVT_MENU(self.parent,event_id,  self._open_closed_page)
         
         
@@ -472 +468 @@
             reopen a closed page
         """
-        if event.GetId() in self.closed_page_dict.keys():
-            page_info,fitproblem = self.closed_page_dict[ event.GetId() ]
+        for value in self.closed_page_dict.values():
+            if event.GetId() in value:
+                id, page_info,fitproblem = value
+                
             if page_info.page_name !="Model Page":
-                page = self.fit_panel.add_fit_page(page_info.data)
+                page = self.fit_panel.add_fit_page(data= page_info.data,
+                                                    page_info=page_info)
                 if fitproblem != None:
                     self.page_finder[page]=fitproblem
             else:
                 model= page_info.model
-                self.fit_panel.add_model_page(model,model.name,topmenu=False)
+                self.fit_panel.add_model_page(model,model.name,topmenu=False,
+                                              page_info=page_info)
+            break
+        
         
     def _reset_schedule_problem(self, value=0):