Changeset a321c52 in sasview

Timestamp:

Dec 6, 2016 8:52:56 AM (7 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:

9eb8fae

Parents:

77910cf

Message:

Force all models to go through _convert_to_sasmodels routine to ensure all sasmodels version changes are applied.

Location:

src/sas/sasgui/perspectives/fitting

Files:

• basepage.py (modified) (3 diffs)
• pagestate.py (modified) (3 diffs)

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

@@ -1160 +1160 @@
             category_pos = int(state.categorycombobox)
         except:
-            if not state._is_sasmodels():
-                state._convert_to_sasmodels()
+            state._convert_to_sasmodels()
             state.categorycombobox = unicode(state.categorycombobox)
             if state.categorycombobox in self.categorybox.Items:
@@ -1592 +1591 @@
                         item_page[0].SetValue(item_page_info[0])
                     if item_page[2] is not None:
-                        # TODO: On loading save state, should try to coerce
-                        # TODO: length and scale params to positive values
                         item_page[2].SetValue(item_page_info[2])
                         if item_page[2].__class__.__name__ == "ComboBox":
@@ -1609 +1606 @@
                         if item_page_info[4][0]:
                             item_page[4].Show(True)
-                            item_page[4].SetValue(item_page_info[4][1])
+                            item_page[4].SetValue(str(item_page_info[4][1]))
                         else:
                             item_page[3].Hide()
                     if item_page[5] is not None:
                         # show of hide the text crtl for fitting error
-                        item_page[5].Show(item_page_info[5][0])
-                        item_page[5].SetValue(item_page_info[5][1])
-
+                        item_page[5].Show(True)
+                        item_page[5].SetValue(str(item_page_info[5][1]))
                     if item_page[6] is not None:
                         # show of hide the text crtl for fitting error
-                        item_page[6].Show(item_page_info[6][0])
-                        item_page[6].SetValue(item_page_info[6][1])
-
+                        item_page[6].Show(True)
+                        item_page[6].SetValue(str(item_page_info[6][1]))
                     break
 

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

@@ -357 +357 @@
         return obj
 
-    def _is_sasmodels(self):
+    def _old_first_model(self):
         """
         A check to see if the loaded save state was saved in SasView v4_0+
@@ -391 +391 @@
             elif self.categorycombobox == 'Structure Factor':
                 self.formfactorcombobox = 'hardsphere'
-        newname = convert._conversion_target(self.formfactorcombobox)
-        if newname == None:
-            return True
-        else:
-            return False
 
     def param_remap_to_sasmodels_convert(self, params):
@@ -466 +461 @@
         """
         # Create conversion dictionary to send to sasmodels
+        self._old_first_model()
         p = self.param_remap_to_sasmodels_convert(self.parameters)
         structurefactor, params = \