Changeset ae2f623 in sasview for src/sas/sasgui/perspectives

Timestamp:

Sep 27, 2017 10:49:40 AM (7 years ago)

Author:

GitHub <noreply@…>

Parents:

ad476d1 (diff), 83db1cc (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.

git-author:

Paul Kienzle <pkienzle@…> (09/27/17 10:49:40)

git-committer:

GitHub <noreply@…> (09/27/17 10:49:40)

Message:

Merge 83db1ccf60843974314e3a4f1a0345b82797a77e into ad476d193c0864f278ac1d0d3573c4836631790c

Location:

src/sas/sasgui/perspectives

Files:

• calculator/__init__.py (modified) (4 diffs)
• corfunc/corfunc_state.py (modified) (1 diff)
• fitting/__init__.py (modified) (4 diffs)
• fitting/basepage.py (modified) (4 diffs)
• fitting/fitpage.py (modified) (1 diff)
• fitting/models.py (modified) (2 diffs)
• fitting/pagestate.py (modified) (1 diff)
• fitting/simfitpage.py (modified) (3 diffs)
• invariant/__init__.py (modified) (4 diffs)
• invariant/invariant_state.py (modified) (1 diff)
• pr/inversion_state.py (modified) (1 diff)

src/sas/sasgui/perspectives/calculator/__init__.py

@@ -18 +18 @@
     path = os.path.dirname(__file__)
     #Look for maximum n_dir up of the current dir to find media
-   
+
     #for i in range(n_dir):
     i = 0
@@ -30 +30 @@
              return media_path
         i += 1
-   
+
     raise RuntimeError('Could not find calculator media files')
 
@@ -36 +36 @@
     """
     Return the data files associated with media calculator.
-    
+
     The format is a list of (directory, [files...]) pairs which can be
     used directly in setup(...,data_files=...) for setup.py.
@@ -42 +42 @@
     """
     data_files = []
-    path = get_data_path(media="media")
-    for f in findall(path):
-        data_files.append(('media/calculator_media', [f]))
+    data_files.append(('media/calculator_media', findall(get_data_path("media"))))
     return data_files

src/sas/sasgui/perspectives/corfunc/corfunc_state.py

@@ -289 +289 @@
                 namespaces={'ns': CANSAS_NS})
             for entry in entry_list:
-                sas_entry, _ = self._parse_entry(entry)
                 corstate = self._parse_state(entry)
 
                 if corstate is not None:
+                    sas_entry, _ = self._parse_entry(entry)
                     sas_entry.meta_data['corstate'] = corstate
                     sas_entry.filename = corstate.file

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

@@ -13 +13 @@
     # Check for data path next to exe/zip file.
     # If we are inside a py2exe zip file, we need to go up
-    # to get to the directory containing 
+    # to get to the directory containing
     # the media for this module
     path = os.path.dirname(__file__)
@@ -26 +26 @@
                 return module_media_path
             return media_path
-   
+
     raise RuntimeError('Could not find models media files')
 
@@ -32 +32 @@
     """
     Return the data files associated with media.
-    
+
     The format is a list of (directory, [files...]) pairs which can be
     used directly in setup(...,data_files=...) for setup.py.
@@ -38 +38 @@
     """
     data_files = []
-    path = os.path.dirname(__file__)
-    p_path = os.path.join(path, 'plugin_models')
-    for f in findall(p_path):
-        data_files.append(('plugin_models', [f]))
-    # path = get_data_path(media="media")
-    for f in findall(path):
-        data_files.append(('media/fitting_media', [f]))
-    
+    # Note: windows installer requires the plugin_models directory
+    plugin_models = os.path.join(os.path.dirname(__file__), "plugin_models")
+    data_files.append(('plugin_models', findall(plugin_models)))
+    data_files.append(('media/fitting_media', findall(get_data_path("media"))))
+
     return data_files

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

@@ -15 +15 @@
 import traceback
 
+from Queue import Queue
+from threading import Thread
 from collections import defaultdict
 from wx.lib.scrolledpanel import ScrolledPanel
@@ -241 +243 @@
         self.set_layout()
 
+        # Setting up a thread for the fitting
+        self.threaded_draw_queue = Queue()
+
+        self.draw_worker_thread = Thread(target = self._threaded_draw_worker,
+                                         args = (self.threaded_draw_queue,))
+        self.draw_worker_thread.setDaemon(True)
+        self.draw_worker_thread.start()
+
+        # And a home for the thread submission times
+        self.last_time_fit_submitted = 0.00
+
     def set_index_model(self, index):
         """
@@ -1693 +1706 @@
         :param chisqr: update chisqr value [bool]
         """
-        wx.CallAfter(self._draw_model_after, update_chisqr, source)
+        self.threaded_draw_queue.put([copy.copy(update_chisqr), copy.copy(source)])
+
+    def _threaded_draw_worker(self, threaded_draw_queue):
+        while True:
+            # sit and wait for the next task
+            next_task = threaded_draw_queue.get()
+
+            # sleep for 1/10th second in case some other tasks accumulate
+            time.sleep(0.1)
+
+            # skip all intermediate tasks
+            while self.threaded_draw_queue.qsize() > 0:
+                self.threaded_draw_queue.task_done()
+                next_task = self.threaded_draw_queue.get()
+
+            # and finally, do the task
+            self._draw_model_after(*next_task)
+            threaded_draw_queue.task_done()
 
     def _draw_model_after(self, update_chisqr=True, source='model'):
@@ -1716 +1746 @@
             toggle_mode_on = self.model_view.IsEnabled()
             is_2d = self._is_2D()
+
             self._manager.draw_model(self.model,
                                      data=self.data,

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

@@ -2042 +2042 @@
             # Save state_fit
             self.save_current_state_fit()
+            self.onSmear(None)
+            self._onDraw(None)
         except:
             self._show_combox_helper()

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

@@ -15 +15 @@
 import shutil
 from copy import copy
+
+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
 from sas.sasgui.perspectives.fitting.fitpage import CUSTOM_MODEL
 
@@ -27 +30 @@
 
 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")
 PLUGIN_NAME_BASE = '[plug-in] '
 

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

@@ -1297 +1297 @@
                                             namespaces={'ns': CANSAS_NS})
                     for entry in entry_list:
-                        try:
-                            sas_entry, _ = self._parse_save_state_entry(entry)
-                        except:
-                            raise
                         fitstate = self._parse_state(entry)
-
                         # state could be None when .svs file is loaded
                         # in this case, skip appending to output
                         if fitstate is not None:
+                            try:
+                                sas_entry, _ = self._parse_save_state_entry(
+                                    entry)
+                            except:
+                                raise
                             sas_entry.meta_data['fitstate'] = fitstate
                             sas_entry.filename = fitstate.file

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

@@ -1073 +1073 @@
         """
 
-        model_map = {}
+        init_map = {}
+        final_map = {}
         if fit.fit_panel.sim_page is None:
             fit.fit_panel.add_sim_page()
@@ -1087 +1088 @@
                 save_id = self._format_id(save_id)
                 if save_id == model_id:
-                    model_map[saved_model.pop('fit_page_source')] = \
-                        model[3].name
+                    inter_id = str(i) + str(i) + str(i) + str(i) + str(i)
+                    init_map[saved_model.pop('fit_page_source')] = inter_id
+                    final_map[inter_id] = model[3].name
                     check = bool(saved_model.pop('checked'))
                     sim_page.model_list[i][0].SetValue(check)
@@ -1106 +1108 @@
                 param = item.pop('param_cbox')
                 equality = item.pop('egal_txt')
-                for key, value in model_map.iteritems():
-                    model_cbox.replace(key, value)
-                    constraint_value.replace(key, value)
+                for key, value in init_map.items():
+                    model_cbox = model_cbox.replace(key, value)
+                    constraint_value = constraint_value.replace(key, value)
+                for key, value in final_map.items():
+                    model_cbox = model_cbox.replace(key, value)
+                    constraint_value = constraint_value.replace(key, value)
 
                 sim_page.constraints_list[index][0].SetValue(model_cbox)

src/sas/sasgui/perspectives/invariant/__init__.py

@@ -15 +15 @@
     # Check for data path next to exe/zip file.
     # If we are inside a py2exe zip file, we need to go up
-    # to get to the directory containing 
+    # to get to the directory containing
     # the media for this module
     path = os.path.dirname(__file__)
@@ -28 +28 @@
                 return module_media_path
             return media_path
-   
+
     raise RuntimeError('Could not find invariant media files')
 
@@ -34 +34 @@
     """
     Return the data files associated with media invariant.
-    
+
     The format is a list of (directory, [files...]) pairs which can be
     used directly in setup(...,data_files=...) for setup.py.
@@ -40 +40 @@
     """
     data_files = []
-    path = get_data_path(media="media")
-    for f in findall(path):
-        data_files.append(('media/invariant_media', [f]))
+    data_files.append(('media/invariant_media', findall(get_data_path("media"))))
     return data_files

src/sas/sasgui/perspectives/invariant/invariant_state.py

@@ -728 +728 @@
 
                 for entry in entry_list:
-
-                    sas_entry, _ = self._parse_entry(entry)
                     invstate = self._parse_state(entry)
-
                     # invstate could be None when .svs file is loaded
                     # in this case, skip appending to output
                     if invstate is not None:
+                        sas_entry, _ = self._parse_entry(entry)
                         sas_entry.meta_data['invstate'] = invstate
                         sas_entry.filename = invstate.file

src/sas/sasgui/perspectives/pr/inversion_state.py

@@ -472 +472 @@
 
                 for entry in entry_list:
-                    sas_entry, _ = self._parse_entry(entry)
                     prstate = self._parse_prstate(entry)
                     #prstate could be None when .svs file is loaded
                     #in this case, skip appending to output
                     if prstate is not None:
+                        sas_entry, _ = self._parse_entry(entry)
                         sas_entry.meta_data['prstate'] = prstate
                         sas_entry.filename = prstate.file