Changeset b9cc210 in sasview

Timestamp:

Oct 3, 2018 11:25:26 AM (6 years ago)

Author:

GitHub <noreply@…>

Parents:

db24ec1 (diff), 5ae083b (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.

git-author:

Paul Kienzle <pkienzle@…> (10/03/18 11:25:26)

git-committer:

GitHub <noreply@…> (10/03/18 11:25:26)

Message:

Merge 5ae083b3931e9b838b7f48e78e25860d2843a865 into db24ec1ee92eff4e045772a5900cb74d75898456

File:

• src/sas/sasgui/perspectives/fitting/basepage.py (modified) (4 diffs)

src/sas/sasgui/perspectives/fitting/basepage.py

@@ -2884 +2884 @@
             self.magnetic_on = True
             button.SetLabel("Magnetic OFF")
-            m_value = 1.0e-06
+            m_value = 1
             for key in self.model.magnetic_params:
                 if key.count('M0') > 0:
                     self.model.setParam(key, m_value)
-                    m_value += 0.5e-06
+                    m_value += 0.5
         else:
             self.magnetic_on = False
@@ -2950 +2950 @@
         Get the string copies of the param names and values in the tap
         """
-        content = 'sasview_parameter_values:'
+        content = 'sasview_parameter_values;'
         # Do it if params exist
         if self.parameters:
@@ -3212 +3212 @@
                 logger.error(traceback.format_exc())
             content += name + ',' + str(check) + ',' + value + disfunc + ',' + \
-                       bound_lo + ',' + bound_hi + ':'
+                       bound_lo + ',' + bound_hi + ';'
 
         return content
@@ -3251 +3251 @@
         context = {}
         # put the text into dictionary
-        lines = text.split(':')
+        lines = text.split(';')
         if lines[0] != 'sasview_parameter_values':
             self._copy_info(False)