Changeset 6859338 in sasview

Timestamp:

Mar 23, 2009 4:38:31 PM (16 years ago)

Author:

Jae Cho <jhjcho@…>

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:

c7ac15e

Parents:

d3966c2

Message:

revert

File:

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

sansview/perspectives/fitting/fitting.py

@@ -121 +121 @@
         """
         self.sim_page= self.fit_panel.add_sim_page()
-        self.sim_page.draw_page(self.page_finder)
+        self.sim_page.add_model(self.page_finder)
         
         
@@ -486 +486 @@
             if self.calc_fit!= None and self.calc_fit.isrunning():
                 self.calc_fit.stop()
-                        ## perform single fit
+            ## perform single fit
             if  fitproblem_count==1:
                 self.calc_fit=FitThread(parent =self.parent,
@@ -755 +755 @@
         if model ==None:
             return
-       
+        name = model.name
         sim_page=self.sim_page
         current_pg = self.fit_panel.get_current_page() 
@@ -762 +762 @@
         if current_pg != sim_page:
            
-            if self.page_finder[current_pg].get_model()== None :
+            if len(self.page_finder[current_pg].get_model())==0:
                 
                 model.name="M"+str(self.index_model)
                 self.index_model += 1  
             else:
+                model.name= self.page_finder[current_pg].get_model()[0].name
                 
-                model.name= self.page_finder[current_pg].get_model().name
-                
-           
-            metadata = self.page_finder[current_pg].get_plotted_data()
-            
+            try:
+                metadata=self.page_finder[current_pg].get_plotted_data()
+                M_name = model.name+"= "+name+"("+metadata.name+")"
+            except:
+                M_name = model.name+"= "+name
             # save the name containing the data name with the appropriate model
-            self.page_finder[current_pg].set_model(model)
-            print "wwent hete",model.name
+            self.page_finder[current_pg].set_model(model,M_name)
+            
             # save model name
             self.draw_model( model=model, data= metadata)
             
             if self.sim_page!=None:
-                self.sim_page.draw_page(self.page_finder)
+                self.sim_page.add_model(self.page_finder)
         
         
@@ -939 +940 @@
         err_image[err_image==0]= 1
         theory= Data2D(image= image , err_image= err_image)
-        theory.name= model.name
         
         if data ==None:
             self._fill_default_model2D(theory= theory, qmax=qmax,qstep=qstep, qmin= qmin)
-        
+            theory.name= model.name
         else:
+            theory.name= data.name
             theory.id= "Model"
             theory.group_id= "Model"+data.name