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

Timestamp:

Feb 12, 2009 2:11:08 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:

7983c731

Parents:

3b909b7

Message:

dispersity not work well. closing button fixed

File:

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

sansview/perspectives/fitting/fitting.py

@@ -206 +206 @@
                 try:
                    
-                    page, model_name = self.fit_panel.add_fit_page(item)
+                    page = self.fit_panel.add_fit_page(item)
+                    #page, model_name = self.fit_panel.add_fit_page(item)
                     # add data associated to the page created
                    
@@ -212 +213 @@
                         #create a fitproblem storing all link to data,model,page creation
                         self.page_finder[page]= FitProblem()
-                        self.page_finder[page].save_model_name(model_name)  
+                        #self.page_finder[page].save_model_name(model_name)  
                         self.page_finder[page].add_data(item)
                         wx.PostEvent(self.parent, StatusEvent(status="Page Created"))
@@ -310 +311 @@
             
             cpage.onsetValues(result.fitness, result.pvec,result.stderr)
+            #title="Fitted model 2D "
             self.plot_helper(currpage=cpage,qmin=qmin,qmax=qmax,
                              ymin=ymin, ymax=ymax,
-                             xmin=xmin, xmax=xmax,title="Fitted model 2D ")
+                             xmin=xmin, xmax=xmax,title=None)
         except:
             #raise
@@ -547 +549 @@
         if current_pg != sim_page:
             current_pg.set_panel(model)
-            model.name = self.page_finder[current_pg].get_name()
+            #model.name = self.page_finder[current_pg].get_name()
+            #print "model name", model.name
+            model.name="M"+str(self.index_model)
             try:
                 metadata=self.page_finder[current_pg].get_data()
-                #M_name=model.name+"= "+name+"("+metadata.group_id+")"
-                M_name=model.name+"= "+name+"("+metadata.id+")"
+                M_name=model.name+"= "+name+"("+metadata.group_id+")"
             except:
-                M_name=model.name+"= "+name+"("+metadata.group_id+")"
-            model.name="M"+str(self.index_model)
+                M_name=model.name+"= "+name
             self.index_model += 1  
+            
+            
             # save model name
             
@@ -598 +602 @@
                 theory.name = model.name
                 theory.group_id = data.group_id
+                """
                 if hasattr(data, "id"):
                     import string
@@ -605 +610 @@
                         self.index_theory +=1
                     else:
-                        theory.id = "Model"
+                    """
+                theory.id = "Model"
                    
                 x_name, x_units = data.get_xaxis()