Changeset 131791e in sasview for src/sas/sasgui

Timestamp:

Apr 7, 2017 9:47:34 AM (8 years ago)

Author:

Tim Snow <tim.snow@…>

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:

503eb52

Parents:

4b402a1 (diff), 861f1880 (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 ticket-869

Location:

src/sas/sasgui

Files:

• guiframe/gui_manager.py (modified) (1 diff)
• guiframe/local_perspectives/data_loader/data_loader.py (modified) (1 diff)
• guiframe/media/data_formats_help.rst (modified) (1 diff)
• perspectives/calculator/image_viewer.py (modified) (1 diff)
• perspectives/pr/explore_dialog.py (modified) (1 diff)
• perspectives/pr/inversion_panel.py (modified) (1 diff)
• perspectives/pr/pr.py (modified) (4 diffs)
• plottools/LineModel.py (modified) (3 diffs)
• plottools/PlotPanel.py (modified) (2 diffs)
• perspectives/fitting/basepage.py (modified) (4 diffs)

src/sas/sasgui/guiframe/gui_manager.py

@@ -2122 +2122 @@
         """
         if custom_config is not None:
-            sas_opencl = os.environ.get("SAS_OPENCL",None)
+            sas_opencl = os.environ.get("SAS_OPENCL")
             new_config_lines = []
             config_file = open(custom_config.__file__)

src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py

@@ -92 +92 @@
         if dlg.ShowModal() == wx.ID_OK:
             file_list = dlg.GetPaths()
-            if len(file_list) >= 0 and not file_list[0] is None:
+            if len(file_list) >= 0 and file_list[0] is not None:
                 self._default_save_location = os.path.dirname(file_list[0])
                 path = self._default_save_location

src/sas/sasgui/guiframe/media/data_formats_help.rst

@@ -86 +86 @@
 
 - Spin echo length (z, in Angstroms)
-- depolarization (:math:`log(P/P_0)/(lambda^2 * thickness)`, in Angstrom^-1 cm^-1)
+- depolarization (:math:`log(P/P_0)/(lambda^2 * thickness)`, in Angstrom :sup:`-1` cm :sup:`-1`\ )
 - depolarization error in the same unit) (measurement error)
 - Spin echo length error (:math:`\Delta`\ z, in Angstroms) (experimental resolution)

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

@@ -42 +42 @@
         """
         parent = self.parent
-        if parent == None:
+        if parent is None:
             location = os.getcwd()
         else:
             location = parent._default_save_location
         path_list = self.choose_data_file(location=location)
-        if path_list == None:
+        if path_list is None:
             return
-        if len(path_list) >= 0 and not(path_list[0]is None):
-            if parent != None:
+        if len(path_list) >= 0 and path_list[0] is not None:
+            if parent is not None:
                 parent._default_save_location = os.path.dirname(path_list[0])
         err_msg = ''

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

@@ -269 +269 @@
         # Note: by design, the output type should always be part of the
         #       results object.
-        if self.results.outputs.has_key(output_type):
+        if output_type in self.results.outputs:
             self.plotpanel.plot.x = self.results.d_max
             self.plotpanel.plot.y = self.results.outputs[output_type][2]

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

@@ -940 +940 @@
         Choose a new input file for I(q)
         """
-        if not self._manager is None:
+        if self._manager is not None:
             self.plot_data.SetValue(str(data.name))
             try:

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

@@ -329 +329 @@
 
         # If we have a group ID, use it
-        if pr.info.has_key("plot_group_id"):
+        if 'plot_group_id' in pr.info:
             new_plot.group_id = pr.info["plot_group_id"]
         new_plot.id = IQ_FIT_LABEL
@@ -348 +348 @@
                 except:
                     err[i] = 1.0
-                    print "Error getting error", value, x[i]
+                    print("Error getting error", value, x[i])
 
             new_plot = Data1D(x, y)
@@ -356 +356 @@
             new_plot.yaxis("\\rm{Intensity} ", "cm^{-1}")
             # If we have a group ID, use it
-            if pr.info.has_key("plot_group_id"):
+            if 'plot_group_id' in pr.info:
                 new_plot.group_id = pr.info["plot_group_id"]
             new_plot.id = IQ_SMEARED_LABEL
@@ -1047 +1047 @@
         try:
             pr = self._create_file_pr(data)
-            if not pr is None:
+            if pr is not None:
                 self.pr = pr
                 self.perform_estimate()

src/sas/sasgui/plottools/LineModel.py

@@ -8 +8 @@
 function should disappear in a future iteration (see notes in fitDialog)
 
-                -PDB   July 10, 2016
+PDB   July 10, 2016
+
 """
 
@@ -70 +71 @@
         runXY is when the if statement is true. I however cannot see what that
         function is for.  It needs to be documented here or removed.
-        -PDB 7/10/16 
+        PDB 7/10/16 
 
         :param x: simple value
@@ -92 +93 @@
         but the only difference between this and run is when the if 
         statement is true. I however cannot see what that function
-        is for.  It needs to be documented here or removed. -PDB 7/10/16 
+        is for.  It needs to be documented here or removed. PDB 7/10/16 
 
         :param x: simple value

src/sas/sasgui/plottools/PlotPanel.py

@@ -1403 +1403 @@
         if self.scale == 'log_{10}':
             self.scale = 'linear'
-            if not self.zmin_2D is None:
+            if self.zmin_2D is not None:
                 zmin_2D_temp = math.pow(10, self.zmin_2D)
-            if not self.zmax_2D is None:
+            if self.zmax_2D is not None:
                 zmax_2D_temp = math.pow(10, self.zmax_2D)
         else:
             self.scale = 'log_{10}'
-            if not self.zmin_2D is None:
+            if self.zmin_2D is not None:
                 # min log value: no log(negative)
                 if self.zmin_2D <= 0:
@@ -1415 +1415 @@
                 else:
                     zmin_2D_temp = math.log10(self.zmin_2D)
-            if not self.zmax_2D is None:
+            if self.zmax_2D is not None:
                 zmax_2D_temp = math.log10(self.zmax_2D)
 

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

@@ -13 +13 @@
 import traceback
 
+from time import time
+from Queue import Queue
+from threading import Thread
 from collections import defaultdict
 from wx.lib.scrolledpanel import ScrolledPanel
@@ -239 +242 @@
         self.set_layout()
 
+        # Setting up a thread for the fitting
+        self.threadedDrawQueue = Queue()
+
+        self.threadedDrawWorker = Thread(target = self._threaded_draw_worker,
+                                         args = (self.threadedDrawQueue,))
+        self.threadedDrawWorker.setDaemon(True)
+        self.threadedDrawWorker.start()
+
+        # And a home for the thread submission times
+        self.lastTimeFitSubmitted = 0.00
+
     def set_index_model(self, index):
         """
@@ -1691 +1705 @@
         :param chisqr: update chisqr value [bool]
         """
-        wx.CallAfter(self._draw_model_after, update_chisqr, source)
+        # Get the time
+        currentTime = time()
+
+        # When loading we slam a number of fits through here
+        # let's filter these out to start with
+        if currentTime > (self.lastTimeFitSubmitted + 0.1):
+            # Submitting the rest
+            self.threadedDrawQueue.put([update_chisqr, source])
+            print 'submitted!'
+        else:
+            pass
+
+        self.lastTimeFitSubmitted = currentTime
+
+    def _threaded_draw_worker(self, threadedDrawQueue):
+        while True:
+            # Check to see is a manager is running and a calc is running
+            if ((self._manager.calc_1D is not None) and (self._manager.calc_1D.\
+                isrunning() == True)) or ((self._manager.calc_2D is not None)\
+                and (self._manager.calc_2D.isrunning() == True)):
+                # If a manager is running a calculation 
+                # then trim the queue
+                if self.threadedDrawQueue.qsize() > 1:
+                    print '2'
+                    for loopIter in range(threadedDrawQueue.qsize() - 1):
+                        dump = self.threadedDrawQueue.get()
+                        self.threadedDrawQueue.task_done()
+                        print 'bounced'
+                    print 'one element left'
+            else:
+                # Otherwise, just run
+                inputVariables = threadedDrawQueue.get()
+                self._draw_model_after(inputVariables[0], inputVariables[1])
+                wx.PostEvent(self._manager.parent, StatusEvent(status = 
+                            "Computation is in progress...", type = "progress"))
+                threadedDrawQueue.task_done()
+                print 'run'                
 
     def _draw_model_after(self, update_chisqr=True, source='model'):
@@ -1714 +1764 @@
             toggle_mode_on = self.model_view.IsEnabled()
             is_2d = self._is_2D()
+
             self._manager.draw_model(self.model,
                                      data=self.data,