Changeset 2dbb681 in sasview for sansview/perspectives/fitting/fitting.py

Timestamp:

Oct 21, 2008 12:30:12 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:

5893cdb

Parents:

b3328d8

Message:

change window title

File:

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

sansview/perspectives/fitting/fitting.py

@@ -11 +11 @@
 from fitpanel import FitPanel
 
-import models
+import models,modelpage
 import fitpage1D,fitpage2D
 import park
@@ -60 +60 @@
         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())
@@ -84 +85 @@
         for item in graph.plottables:
             if item.__class__.__name__ is "Data2D":
-                return [["Fit Data2D", "Dialog with fitting parameters ", self._onSelect]] 
+                return [["Select data  for Fitting",\
+                          "Dialog with fitting parameters ", self._onSelect]] 
             else:
                 if item.name==graph.selected_plottable and\
                  item.__class__.__name__ is  "Data1D":
-                    return [["Fit Data1D", "Dialog with fitting parameters ", self._onSelect]] 
+                    return [["Select data  for Fitting", \
+                             "Dialog with fitting parameters ", self._onSelect]] 
         return []   
 
@@ -539 +542 @@
                 theory.image=model.runXY(data.image)
                 
-                print "fitting : plot_helper:",theory.image
+                #print "fitting : plot_helper:",theory.image
                 theory.zmin= data.zmin
                 theory.zmax= data.zmax
@@ -555 +558 @@
         """
         name="Model View"
-        model=evt.modelinfo.model()
-        description=evt.modelinfo.description
+        model=evt.model()
+        
+        description=model.description
         self.fit_panel.add_model_page(model,description,name)       
         self.draw_model(model)
@@ -573 +577 @@
             dy[i] = math.sqrt(math.fabs(y[i]))
         try:
-           
             new_plot = Theory1D(x, y)
             new_plot.name = "Model"
@@ -581 +584 @@
             wx.PostEvent(self.parent, NewPlotEvent(plot=new_plot, title="Analytical model"))
         except:
-            wx.PostEvent(self.parent, StatusEvent(status="fitting \
-                        skipping point x %g %s" %(qmax, sys.exc_value)))
-
+            raise
 if __name__ == "__main__":
     i = Plugin()