Changeset 2d707e3 in sasview for src

Timestamp:

Jun 28, 2015 11:30:09 PM (9 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

Files:

• guiframe/gui_manager.py (modified) (1 diff)
• models/media/model_functions.rst (modified) (3 diffs)
• perspectives/fitting/pagestate.py (modified) (1 diff)
• perspectives/fitting/report_dialog.py (modified) (1 diff)

src/sas/guiframe/gui_manager.py

@@ -1303 +1303 @@
             if menu_list:
                 for (menu, name) in menu_list:
-                    print "[%s]" % name
                     self._menubar.Replace(pos, menu, name)
                     self._applications_menu_name = name

src/sas/models/media/model_functions.rst

@@ -20 +20 @@
 
 
-.. note::  The contents of this document are awaiting proof reading. Feb2015
+.. note::  The contents of this document are presented in good faith and are 
+           believed to be mostly correct and accurate, however they have not 
+           yet been rigorously checked for errors. June2015
 
 
@@ -83 +85 @@
 =======================
 
-Contents
---------
-1. Background_
-
-2. Model_ Functions
-
- 2.1 Shape-based_ Functions
- 
- 2.2 Shape-independent_ Functions
- 
- 2.3 Structure-factor_ Functions
- 
- 2.4 Customised_ Functions
-
-3. References_
-
-
-
-.. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ
-
-
-
 .. _Background:
 
@@ -290 +270 @@
 - sph_bessel_jn_
 
+Also see the documentation on :ref:`Adding_your_own_models` under Fitting Data. 
+
 
 

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",