Changeset 2d707e3 in sasview for src/sas/perspectives


Ignore:
Timestamp:
Jun 28, 2015 9:30:09 PM (10 years ago)
Author:
butler
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:
aceae8c
Parents:
22d92da (diff), a15e754 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'master' of https://github.com/SasView/sasview.git

Location:
src/sas/perspectives/fitting
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • src/sas/perspectives/fitting/pagestate.py

    racf8e4a5 ra15e754  
    545545                    paramval_string += CENTRE % param + "\n" 
    546546 
    547         text_string = "\n\n\n" + title + "\n\n" + file + \ 
    548                       "\n" + q_name + \ 
    549                       "\n" + chi2 + \ 
    550                       "\n\n" + paramval 
     547        text_string = "\n\n\n%s\n\n%s\n%s\n%s\n\n%s" % (title, file, q_name, chi2, paramval) 
    551548 
    552549        title_name = self._check_html_format(title_name) 
  • src/sas/perspectives/fitting/report_dialog.py

    r2f4b430 ra15e754  
    4444                self.report_html = self.report_list[0] % \ 
    4545                                    "memory:img_fit0.png" 
    46             elif len(self.report_list) == 2: 
     46            elif len(self.report_list[2]) == 2: 
    4747                self.report_html = self.report_list[0] % \ 
    4848                                    ("memory:img_fit0.png", 
Note: See TracChangeset for help on using the changeset viewer.