Changeset 109e50bb in sasview for src/sas/perspectives/fitting

Timestamp:

Feb 14, 2015 3:57:46 AM (10 years ago)

Author:

gonzalezm

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:

55bde35, 9e11cf5

Parents:

9701348 (diff), d06ae30 (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 'ticket263'

Location:

src/sas/perspectives/fitting

Files:

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

src/sas/perspectives/fitting/pagestate.py

@@ -472 +472 @@
         Get the values (strings) from __str__ for report
         """
-        # Dictionary of teh report strings
+        # Dictionary of the report strings
         repo_time = ""
         model_name = ""
@@ -508 +508 @@
             if name == "value":
                 param_string += value + ','
+            if name == "selected":
+                if value == u' False':
+                    fixed_parameter = True
+                else:
+                    fixed_parameter = False
             if name == "error value":
-                param_string += value + ','
+                if fixed_parameter:
+                    param_string += '(fixed),'
+                else:
+                    param_string += value + ','
             if name == "parameter unit":
                 param_string += value + ':'

src/sas/perspectives/fitting/report_dialog.py

@@ -1 +1 @@
 """
 Dialog report panel to show and summarize the results of 
-the invariant calculation.
+the fitting calculation.
 """
 ################################################################################