Ensure all settings in state file are loaded

Some settings like rietveld-specific or texture-specific were not
being loaded correctly from state files. We needed to wait until the
parameters list was updated before loading them.

This also ensures the latest parameter values get saved before users
do things like save to state files.

Signed-off-by: Patrick Avery <[email protected]>

Author: psavery

hexrdgui/calibration/wppf_options_dialog.py

@@ -821,6 +821,10 @@ def load_settings(self):
             'background_method_dict',
         ]
 
+        skip_list = [
+            'params_dict',
+        ]
+
         with block_signals(*self.all_widgets):
             for k in apply_first_keys:
                 if k in settings:
@@ -832,14 +836,9 @@ def load_settings(self):
                     # as it is no longer compatible.
                     continue
 
-                if k == 'params_dict':
-                    # For backward-compatibility
-                    for d in v.values():
-                        if 'lb' in d:
-                            d['min'] = d.pop('lb')
-
-                        if 'ub' in d:
-                            d['max'] = d.pop('ub')
+                if k in skip_list:
+                    # We apply this later...
+                    continue
 
                 if not hasattr(self, k) or k in apply_first_keys:
                     # Skip it...
@@ -851,6 +850,21 @@ def load_settings(self):
         self.update_params()
         self.update_enable_states()
 
+        # Now apply the params dict after updating default parameters.
+        # This is so that settings specific to things like texture, or
+        # Rietveld, can be loaded correctly.
+        if 'params_dict' in settings:
+            v = settings['params_dict']
+            # For backward-compatibility
+            for d in v.values():
+                if 'lb' in d:
+                    d['min'] = d.pop('lb')
+
+                if 'ub' in d:
+                    d['max'] = d.pop('ub')
+
+            self.params_dict = v
+
     def save_settings(self):
         settings = HexrdConfig().config['calibration'].setdefault('wppf', {})
         keys = [
@@ -1672,6 +1686,7 @@ def load_params(self, filename):
             self.params[key] = dict_to_param(import_params[key])
 
         self.update_tree_view()
+        self.save_settings()
 
     def validate_import_params(self, import_params, filename):
         here = self.params.keys()
@@ -2241,14 +2256,6 @@ def generate_params(method, materials, peak_shape, bkgmethod, amorphous_model,
 
 
 def param_to_dict(param):
-    # Make sure these are non-numpy types
-    def _dict_to_basic(d):
-        for k, v in list(d.items()):
-            if isinstance(v, np.generic):
-                d[k] = v.item()
-
-        return d
-
     return _dict_to_basic({
         'name': param.name,
         'value': param.value,
@@ -2264,9 +2271,19 @@ def dict_to_param(d):
         d = d.copy()
         del d['stderr']
 
+    d = _dict_to_basic(d.copy())
     return lmfit.Parameter(**d)
 
 
+# Ensure dict values are basic types, and not numpy types
+def _dict_to_basic(d):
+    for k, v in list(d.items()):
+        if isinstance(v, np.generic):
+            d[k] = v.item()
+
+    return d
+
+
 LOADED_YAML_DICTS = {}
 
 

hexrdgui/calibration/wppf_runner.py

@@ -80,6 +80,9 @@ def run_wppf(self):
         self.write_params_to_materials()
         self.update_param_values()
 
+        # Save the new settings so state files will have them
+        dialog.save_settings()
+
     def rerender_wppf(self):
         self.clear_wppf_plots()
         obj = self.wppf_object