Changeset 6bcdad1 in sasview for sansview/perspectives/fitting/fitting.py

Timestamp:

Dec 18, 2008 12:06:39 PM (16 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:

ab8f936

Parents:

c48060c

Message:

close page bug fixed

File:

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

sansview/perspectives/fitting/fitting.py

@@ -157 +157 @@
                 #find a name for the page created for notebook
                 try:
-                    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
                     
@@ -164 +164 @@
                         #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].add_data(item)
                 except:
@@ -442 +443 @@
         sim_page=self.fit_panel.get_page(0)
         current_pg = self.fit_panel.get_current_page() 
+        selected_page = self.fit_panel.get_selected_page()
         if current_pg != sim_page:
             current_pg.set_panel(model)
-            
+            model.name = self.page_finder[current_pg].get_name()
             try:
                 metadata=self.page_finder[current_pg].get_data()
-                M_name="M"+str(self.index_model)+"= "+name+"("+metadata.group_id+")"
+                M_name=model.name+"= "+name+"("+metadata.group_id+")"
             except:
-                M_name="M"+str(self.index_model)+"= "+name
-            model.name="M"+str(self.index_model)
+                M_name=model.name+"= "+name
+            #model.name="M"+str(self.index_model)
             self.index_model += 1  
-            
+            # save model name
+            
+            # save the name containing the data name with the appropriate model
             self.page_finder[current_pg].set_model(model,M_name)
             self.plot_helper(currpage= current_pg,qmin= None,qmax= None)
@@ -486 +490 @@
             if data!=None and data.__class__.__name__ != 'Data2D':
                 theory = Theory1D(x=[], y=[])
-                theory.name = "Model"
+                theory.name = model.name
                 theory.group_id = data.group_id
-              
+                theory.id = "Model"
                 x_name, x_units = data.get_xaxis() 
                 y_name, y_units = data.get_yaxis() 
@@ -528 +532 @@
             else:
                 theory=Data2D(data.data, data.err_data)
-                
+                theory.name= model.name
+                theory.id= "Model"
+                theory.group_id= "Model"+data.name
                 theory.x_bins= data.x_bins
                 theory.y_bins= data.y_bins
@@ -560 +566 @@
                 theory.ymax= ymax
         
-        wx.PostEvent(self.parent, NewPlotEvent(plot=theory, title="Analytical model"))
+        wx.PostEvent(self.parent, NewPlotEvent(plot=theory,
+                                                title="Analytical model %s"%str(data.name)))
         
         
@@ -605 +612 @@
                     new_plot = Theory1D(x, y)
                     #new_plot.name = model.name
-                    new_plot.name = "Model"
+                    new_plot.name = model.name
                     new_plot.xaxis("\\rm{Q}", 'A^{-1}')
                     new_plot.yaxis("\\rm{Intensity} ","cm^{-1}")
-                     
-                    new_plot.group_id ="Fitness"
+                    new_plot.id = "Model"
+                    new_plot.group_id ="Model"
                     wx.PostEvent(self.parent, NewPlotEvent(plot=new_plot, title="Analytical model 1D"))
                     
@@ -621 +628 @@
                     new_plot = Theory1D(x, y)
                     new_plot.name = model.name
-                    #new_plot.name = "Model"
                     new_plot.xaxis("\\rm{Q}", 'A^{-1}')
                     new_plot.yaxis("\\rm{Intensity} ","cm^{-1}")
-                     
-                    new_plot.group_id ="Fitness"
-                    wx.PostEvent(self.parent, NewPlotEvent(plot=new_plot, title="Analytical model 1D"))
+                    new_plot.id ="Model"
+                    new_plot.group_id ="Model"
+                    wx.PostEvent(self.parent, NewPlotEvent(plot=new_plot,
+                                     title="Analytical model 1D %s"%str(model.name) ))
                     
                 except:
@@ -686 +693 @@
                        
           
-
+                
             theory= Data2D(data)
-            theory.group_id =str(model.name)+" 2D"
+            theory.name= model.name
+            theory.group_id ="Model"
+            theory.id ="Model"
             theory.xmin= qmin
             theory.xmax= qmax
             theory.ymin= qmin
             theory.ymax= qmax
-            wx.PostEvent(self.parent, NewPlotEvent(plot=theory, title="Analytical model 2D"))
+            wx.PostEvent(self.parent, NewPlotEvent(plot=theory,
+                             title="Analytical model 2D %s" %str(model.name)))