Changeset 9e0aa69a in sasview for src/sas/sasgui/perspectives/fitting

Timestamp:

Dec 21, 2016 8:48:26 AM (8 years ago)

Author:

krzywon

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, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

a6fccd7

Parents:

0de74af

Message:

Added versioning to pagestate and fit saves for future use.

Location:

src/sas/sasgui/perspectives/fitting

Files:

• basepage.py (modified) (1 diff)
• pagestate.py (modified) (4 diffs)

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

@@ -1522 +1522 @@
                         index_data = ((self.qmin_x <= self.data.x) &
                                       (self.data.x <= self.qmax_x))
-                        val = self.data.x[index_data is True]
-                        val = len(val) if isinstance(val, list) else 1
-                        self.Npts_fit.SetValue(str(val))
+                        val = str(len(self.data.x[index_data]))
+                        self.Npts_fit.SetValue(val)
                     else:
                         # No data in the panel

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

@@ -272 +272 @@
         # store value of chisqr
         self.tcChi = None
+        self.version = (1,0,0)
 
     def clone(self):
@@ -470 +471 @@
         self._old_first_model()
         p = self.param_remap_to_sasmodels_convert(self.parameters)
-        structurefactor, params = \
-            convert.convert_model(self.structurecombobox, p)
-        formfactor, params = \
-            convert.convert_model(self.formfactorcombobox, params)
+        structurefactor, params = convert.convert_model(self.structurecombobox,
+                                                        p, False, self.version)
+        formfactor, params = convert.convert_model(self.formfactorcombobox,
+                                                   params, False, self.version)
         if len(self.str_parameters) > 0:
             str_pars = self.param_remap_to_sasmodels_convert(
@@ -819 +820 @@
 
         attr = newdoc.createAttribute("version")
-        attr.nodeValue = '1.0'
+        import sasview
+        attr.nodeValue = sasview.__version__
+        # attr.nodeValue = '1.0'
         top_element.setAttributeNode(attr)
 
@@ -1012 +1015 @@
             raise RuntimeError, msg
 
-        if node.get('version') and node.get('version') == '1.0':
-
+        if node.get('version'):
+
+            self.version = tuple(int(e) for e in
+                                 str.split(node.get('version'), "."))
             # Get file name
             entry = get_content('ns:filename', node)