Changeset 264df67 in sasview for sansview/perspectives/fitting/fitting.py

Timestamp:

Feb 9, 2009 6:41:37 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:

9dd69ec

Parents:

869c368

Message:

remove unused function and rename id for different type of plotting

File:

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

sansview/perspectives/fitting/fitting.py

@@ -134 +134 @@
         #index number to create random model name
         self.index_model = 0
+        self.index_theory= 0
         self.parent.Bind(EVT_SLICER_PANEL, self._on_slicer_event)
        
@@ -536 +537 @@
         name = evt.name
         
+        print "name fitting", name
         sim_page=self.fit_panel.GetPage(1)
         current_pg = self.fit_panel.get_current_page() 
@@ -543 +545 @@
             try:
                 metadata=self.page_finder[current_pg].get_data()
+                #M_name=model.name+"= "+name+"("+metadata.group_id+")"
+                M_name=model.name+"= "+name+"("+metadata.id+")"
+            except:
                 M_name=model.name+"= "+name+"("+metadata.group_id+")"
-            except:
-                M_name=model.name+"= "+name
-            #model.name="M"+str(self.index_model)
+            model.name="M"+str(self.index_model)
             self.index_model += 1  
             # save model name
@@ -590 +593 @@
                 theory.name = model.name
                 theory.group_id = data.group_id
-                theory.id = "Model"
+                if hasattr(data, "id"):
+                    import string
+                    if string.find("Model",data.id )!=None:
+                        #allow plotting on the same panel 
+                        theory.id =str(data.id )+" "+str(self.index_theory)
+                        self.index_theory +=1
+                    else:
+                        theory.id = "Model"
+                   
                 x_name, x_units = data.get_xaxis() 
                 y_name, y_units = data.get_yaxis()