Changeset 51d47b5 in sasview for sansview/perspectives/fitting/fitting.py

Timestamp:

Feb 26, 2009 3:38:02 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:

3199b59

Parents:

8346667

Message:

small bugs fixed

File:

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

sansview/perspectives/fitting/fitting.py

@@ -55 +55 @@
         # model 2D view
         self.model2D_id=None
+        self.sim_page=None
         self.err_dy={}
         
@@ -70 +71 @@
         #Menu for fitting
         self.menu1 = wx.Menu()
-        #id1 = wx.NewId()
-        #self.menu1.Append(id1, '&fit panel')
-        #wx.EVT_MENU(owner, id1, self.on_perspective)
+        id1 = wx.NewId()
+        self.menu1.Append(id1, '&Simultaneous')
+        wx.EVT_MENU(owner, id1, self.on_add_sim_page)
         #Set park engine
         id3 = wx.NewId()
@@ -84 +85 @@
         id2 = wx.NewId()
         owner.Bind(models.EVT_MODEL,self._on_model_menu)
-        #owner.Bind(modelpage.EVT_MODEL,self._on_model_menu)
+      
         self.fit_panel.set_owner(owner)
         self.fit_panel.set_model_list(self.menu_mng.get_model_list())
         owner.Bind(fitpage1D.EVT_MODEL_BOX,self._on_model_panel)
-        #owner.Bind(fitpage2D.EVT_MODEL_BOX,self._on_model_panel)
+        
         #create  menubar items
         return [(id, self.menu1, "Fitting"),(id2, menu2, "Model")]
     
-    
+    def on_add_sim_page(self, event):
+        self.sim_page= self.fit_panel.add_sim_page()
+        self.sim_page.add_model(self.page_finder)
+        
+        
     def help(self, evt):
         """
@@ -300 +305 @@
              @note: expecting park used for fit.
         """  
-        sim_page=self.fit_panel.GetPage(1) 
+        #sim_page=self.fit_panel.GetPage(1) 
+        sim_page= self.sim_page
         for page, value in self.page_finder.iteritems():
             if page != sim_page:
@@ -419 +425 @@
                 wx.PostEvent(self.parent, StatusEvent(status="Simultaneous Fitting error: %s" % sys.exc_value))
                 return
-  
+    def stop_fit(self):
+        if self.calc_thread != None and self.calc_thread.isrunning():
+                    
+                    self.calc_thread.interrupt()
+                    self.calc_thread.stop()
+                    wx.PostEvent(self.parent, StatusEvent(status="Fitting  \
+        is cancelled" , type="stop"))
     def _on_single_fit(self,id=None,qmin=None, qmax=None,ymin=None, ymax=None,xmin=None,xmax=None):
         """ 
@@ -442 +454 @@
         #with the fit will be perform
         current_pg=self.fit_panel.get_current_page() 
-        simul_pg=self.fit_panel.GetPage(1 )
+        #simul_pg=self.fit_panel.GetPage(1 )
+        simul_pg=self.sim_page
         pars=[]   
         #for page, value in self.page_finder.iteritems():
@@ -465 +478 @@
                 #Do the single fit
                 self.fitter.set_model(Model(model), self.fit_id, pars) 
+                if self._fit_engine=="scipy":
+                    wx.PostEvent(self.parent, StatusEvent(status="Parameters range will\
+                     be ignored for %s fitting engine"%str(self._fit_engine)))
                 #print "args...:",metadata,self.fit_id,smearer,qmin,qmax,ymin,ymax
                 dy=[]
@@ -565 +581 @@
                             param_value = item[1]
                             param_name = item[0]
-                            #print "fitting ", param,param_name, param_value
-                           
-                            #new_model.set( model.getParam(param_name[0])= param_value)
-                            #new_model.set( exec"%s=%s"%(param_name[0], param_value))
-                            #new_model.set( exec "%s"%(param_nam) = param_value)
+    
                             new_model.parameterset[ param_name].set( param_value )
                         
@@ -659 +671 @@
         
         print "name fitting", name
-        sim_page=self.fit_panel.GetPage(1)
+        #sim_page=self.fit_panel.GetPage(1)
+        sim_page=self.sim_page
         current_pg = self.fit_panel.get_current_page() 
         if current_pg != sim_page:
@@ -679 +692 @@
             self.page_finder[current_pg].set_model(model,M_name)
             self.plot_helper(currpage= current_pg,qmin= None,qmax= None)
-            sim_page.add_model(self.page_finder)
+            if self.sim_page!=None:
+                self.sim_page.add_model(self.page_finder)
         
     def  set_smearer(self,smearer):