Changeset 0de74af in sasview

Timestamp:

Dec 20, 2016 10:05:17 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:

9e0aa69a

Parents:

ca224b1

Message:

Added a constant for "[plug-in] " to maintain consistency across multiple classes, modified the documentation on a method to be clearer, and changed the exception handling for calcthread back to its original state.

Location:

src/sas

Files:

• sascalc/data_util/calcthread.py (modified) (2 diffs)
• sasgui/perspectives/fitting/basepage.py (modified) (1 diff)
• sasgui/perspectives/fitting/models.py (modified) (2 diffs)
• sasgui/perspectives/fitting/pagestate.py (modified) (1 diff)

src/sas/sascalc/data_util/calcthread.py

@@ -255 +255 @@
         # thread when the queue is empty and start a new thread when
         # there is more work to be done.
-        errors = 0
         while 1:
             self._lock.acquire()
@@ -271 +270 @@
                 pass
             except:
-                errors += 1
-        if errors > 0:
-            self.exception()
+                self.exception()
         self._running = False
 

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

@@ -1167 +1167 @@
         self.categorybox.Select(category_pos)
         self._show_combox(None)
+        from models import PLUGIN_NAME_BASE
         if self.categorybox.GetValue() == 'Customized Models' \
-                and '[plug-in]' not in state.formfactorcombobox:
+                and PLUGIN_NAME_BASE not in state.formfactorcombobox:
             state.formfactorcombobox = \
-                '[plug-in] ' + state.formfactorcombobox
+                PLUGIN_NAME_BASE + state.formfactorcombobox
         formfactor_pos = 0
         for ind_form in range(self.formfactorbox.GetCount()):

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

@@ -23 +23 @@
 PLUGIN_LOG = os.path.join(os.path.expanduser("~"), '.sasview', PLUGIN_DIR,
                           "plugins.log")
+PLUGIN_NAME_BASE = '[plug-in] '
 
 def get_model_python_path():
@@ -181 +182 @@
             try:
                 model = load_custom_model(path)
-                model.name = "[plug-in] "+model.name
+                model.name = PLUGIN_NAME_BASE + model.name
                 plugins[model.name] = model
             except Exception:

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

@@ -359 +359 @@
     def _old_first_model(self):
         """
-        A check to see if the loaded save state was saved in SasView v4_0+
+        Handle save states from 4.0.1 and before where the first item in the
+        selection boxes of category, formfactor and structurefactor were not
+        saved.
         :return: None
         """