Changeset a15e754 in sasview

Timestamp:

Jun 26, 2015 12:34:03 PM (9 years ago)

Author:

Doucet, Mathieu <doucetm@…>

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:

66f21cd

Parents:

7788030

Message:

Fix report generation

Location:

src/sas/perspectives/fitting

Files:

• pagestate.py (modified) (1 diff)
• report_dialog.py (modified) (1 diff)

src/sas/perspectives/fitting/pagestate.py

@@ -545 +545 @@
                     paramval_string += CENTRE % param + "\n"
 
-        text_string = "\n\n\n" + title + "\n\n" + file + \
-                      "\n" + q_name + \
-                      "\n" + chi2 + \
-                      "\n\n" + paramval
+        text_string = "\n\n\n%s\n\n%s\n%s\n%s\n\n%s" % (title, file, q_name, chi2, paramval)
 
         title_name = self._check_html_format(title_name)

src/sas/perspectives/fitting/report_dialog.py

@@ -44 +44 @@
                 self.report_html = self.report_list[0] % \
                                     "memory:img_fit0.png"
-            elif len(self.report_list) == 2:
+            elif len(self.report_list[2]) == 2:
                 self.report_html = self.report_list[0] % \
                                     ("memory:img_fit0.png",