Changeset 77e23a2 in sasview for sansview/perspectives/fitting/fitting.py

Timestamp:

Apr 2, 2009 12:28:34 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:

7fff5cd

Parents:

05f14dd

Message:

add fit with parameter range when selecting park only

File:

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

sansview/perspectives/fitting/fitting.py

@@ -22 +22 @@
 import time
 import thread
+
 
 (PageInfoEvent, EVT_PAGE_INFO)   = wx.lib.newevent.NewEvent()
@@ -450 +451 @@
             Add name of a closed page of fitpanel in a menu 
         """
-        # 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]
+        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:
+            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)
         
@@ -719 +729 @@
             @param engine: the key work of the engine
         """
+        ## saving fit engine name
         self._fit_engine = engine
+        ## post a message to status bar
         wx.PostEvent(self.parent, StatusEvent(status="Engine set to: %s" % self._fit_engine))
    
+        ## Bind every open fit page with a newevent to know the current fitting engine
+        import fitpage
+        event= fitpage.FitterTypeEvent()
+        event.type = self._fit_engine
+        for key in self.page_finder.keys():
+            wx.PostEvent(key, event)
+       
    
     def _on_model_panel(self, evt):
@@ -729 +748 @@
         """
         model = evt.model
+        
         if model ==None:
             return
        
-        sim_page=self.sim_page
         current_pg = self.fit_panel.get_current_page() 
         ## make sure nothing is done on self.sim_page
         ## example trying to call set_panel on self.sim_page
-        if current_pg != sim_page:
+        if current_pg != self.sim_page :
            
             if self.page_finder[current_pg].get_model()== None :
@@ -743 +762 @@
                 self.index_model += 1  
             else:
-                
                 model.name= self.page_finder[current_pg].get_model().name
                 
-           
             metadata = self.page_finder[current_pg].get_plotted_data()