Changeset 80c2c85 in sasview for src/sas/sasgui/perspectives

Timestamp:

Jun 28, 2016 5:10:33 PM (8 years ago)

Author:

Paul Kienzle <pkienzle@…>

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

Children:

3aa2f3c

Parents:

899e084 (diff), 5552396 (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 'master' into sasview-cleanup

Location:

src/sas/sasgui/perspectives/fitting

Files:

• basepage.py (modified) (3 diffs)
• models.py (modified) (1 diff)

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

@@ -202 +202 @@
         self.state_change = False
         ## save customized array
-        self.values = []
-        self.weights = []
+        self.values = {}   # type: Dict[str, List[float, ...]]
+        self.weights = {}   # type: Dict[str, List[float, ...]]
         ## retrieve saved state
         self.number_saved_state = 0
@@ -2588 +2588 @@
             self._draw_model()
             self.Refresh()
-        except:
+        except Exception:
+            logging.error(traceback.format_exc())
             # Error msg
             msg = "Error occurred:"
@@ -2680 +2681 @@
         # Try to delete values and weight of the names array dic if exists
         try:
-            del self.values[name]
-            del self.weights[name]
-            # delete all other dic
-            del self.state.values[name]
-            del self.state.weights[name]
-            del self.model._persistency_dict[name.split('.')[0]]
-            del self.state.model._persistency_dict[name.split('.')[0]]
+            if name in self.values:
+                del self.values[name]
+                del self.weights[name]
+                # delete all other dic
+                del self.state.values[name]
+                del self.state.weights[name]
+                del self.model._persistency_dict[name.split('.')[0]]
+                del self.state.model._persistency_dict[name.split('.')[0]]
         except Exception:
             logging.error(traceback.format_exc())

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

@@ -12 +12 @@
 import py_compile
 import shutil
+from sasmodels.sasview_model import load_custom_model, load_standard_models
 # Explicitly import from the pluginmodel module so that py2exe
 # places it in the distribution. The Model1DPlugin class is used
 # as the base class of plug-in models.
+from sas.sasgui import get_user_dir
 from sas.sascalc.fit.pluginmodel import Model1DPlugin
 from sas.sasgui.guiframe.CategoryInstaller import CategoryInstaller
-from sasmodels.sasview_model import load_custom_model, load_standard_models
 
 
 PLUGIN_DIR = 'plugin_models'
-PLUGIN_LOG = os.path.join(os.path.expanduser("~"), '.sasview', PLUGIN_DIR,
-                          "plugins.log")
+PLUGIN_LOG = os.path.join(get_user_dir(), PLUGIN_DIR, "plugins.log")
 
 def get_model_python_path():