Changeset 74dc0a4 in sasview for fittingview/src/sans/perspectives

Timestamp:

Oct 18, 2011 11:19:14 AM (13 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:

5d344c6

Parents:

15f68ce

Message:

added model name in report

File:

• fittingview/src/sans/perspectives/fitting/pagestate.py (modified) (3 diffs)

fittingview/src/sans/perspectives/fitting/pagestate.py

@@ -369 +369 @@
         rep += "data's name : %s\n"%self.data_name
         rep += "data's id : %s\n"%self.data_id
+        if self.model != None:
+            rep += "model name : %s\n"% self.model.__class__.__name__
+        else:
+            rep += "model name : None\n"
         rep += "model type (form factor) selected: %s\n"%self.shape_rbutton 
         rep += "multi_factor : %s\n"% str(self.multi_factor)
@@ -500 +504 @@
                 except:
                     pass
+            if name == "model name ":
+                try:
+                    modelname = "Model name:" + content[1]
+                except:
+                    modelname = "Model name:" + " NAN"
+                model_name = CENTRE %  modelname
+                 
             if name == "Plotting Range":
                 try:
@@ -534 +545 @@
                                   
         html_string = title_name + "\n" + file_name + \
+                                   "\n" + model_name +\
                                    "\n" + q_range + \
                                    "\n" + chi2_string + \