Changeset a0469a1 in sasview for src/sas/sasgui/perspectives/fitting

Timestamp:

Apr 7, 2017 10:36:17 AM (7 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:

be7264f1

Parents:

503eb52

Message:

Removed 'non-Pythonic' variable names

As per Quantified Code warnings, however, unsure why ‘from time import
time’ comes up as an error.

File:

• src/sas/sasgui/perspectives/fitting/basepage.py (modified) (3 diffs)

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

@@ -243 +243 @@
 
         # 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()
+        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.lastTimeFitSubmitted = 0.00
+        self.last_time_fit_submitted = 0.00
 
     def set_index_model(self, index):
@@ -1706 +1706 @@
         """
         # Get the time
-        currentTime = time()
+        current_time = 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):
+        if current_time > (self.last_time_fit_submitted + 0.1):
             # Submitting the rest
-            self.threadedDrawQueue.put([update_chisqr, source])
+            self.threaded_draw_queue.put([update_chisqr, source])
         else:
             pass
 
-        self.lastTimeFitSubmitted = currentTime
-
-    def _threaded_draw_worker(self, threadedDrawQueue):
+        self.last_time_fit_submitted = current_time
+
+    def _threaded_draw_worker(self, threaded_draw_queue):
         while True:
             # Check to see is a manager is running and a calc is running
@@ -1726 +1726 @@
                 # If a manager is running a calculation 
                 # then trim the queue
-                if self.threadedDrawQueue.qsize() > 1:
-                    for loopIter in range(threadedDrawQueue.qsize() - 1):
-                        dump = self.threadedDrawQueue.get()
-                        self.threadedDrawQueue.task_done()
+                if self.threaded_draw_queue.qsize() > 1:
+                    for loopIter in range(threaded_draw_queue.qsize() - 1):
+                        dump = self.threaded_draw_queue.get()
+                        self.threaded_draw_queue.task_done()
             else:
                 # Otherwise, just run
-                inputVariables = threadedDrawQueue.get()
-                self._draw_model_after(inputVariables[0], inputVariables[1])
+                input_variables = threaded_draw_queue.get()
+                self._draw_model_after(input_variables[0], input_variables[1])
                 wx.PostEvent(self._manager.parent, StatusEvent(status = 
                             "Computation is in progress...", type = "progress"))
-                threadedDrawQueue.task_done()
+                threaded_draw_queue.task_done()
 
     def _draw_model_after(self, update_chisqr=True, source='model'):