Changeset b9dbd6b in sasview for src/sas/guiframe/local_perspectives/data_loader/load_thread.py

Timestamp:

Mar 5, 2015 1:51:04 PM (9 years ago)

Author:

Mathieu Doucet <doucetm@…>

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, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

824e488

Parents:

3477478

Message:

pylint fixes and remove old code

File:

• src/sas/guiframe/local_perspectives/data_loader/load_thread.py (modified) (7 diffs)

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

@@ -1 @@
-
+"""
+    Loading thread
+"""
 import time
 import sys
@@ -6 +8 @@
 from sas.data_util.calcthread import CalcThread
 
-        
+
 EXTENSIONS = ['.svs', '.prv', '.inv', '.fitv']
 
@@ -17 +19 @@
                  transform_data=None,
                  completefn=None,
-                 updatefn   = None,
-                 yieldtime  = 0.01,
-                 worktime   = 0.01
-                 ):
+                 updatefn=None,
+                 yieldtime=0.01,
+                 worktime=0.01):
         CalcThread.__init__(self, completefn,
-                 updatefn,
-                 yieldtime,
-                 worktime)
+                            updatefn,
+                            yieldtime,
+                            worktime)
         self.load_state_flag = flag
         self.transform_data = transform_data
         self.list_path = path
-        #Instantiate a loader 
+        # Instantiate a loader
         self.loader = loader
         self.message = ""
-        self.starttime = 0  
+        self.starttime = 0
         self.updatefn = updatefn
-        
+
     def isquit(self):
         """
@@ -41 +42 @@
             CalcThread.isquit(self)
         except KeyboardInterrupt:
-            raise KeyboardInterrupt   
-        
-        
+            raise KeyboardInterrupt
+
     def compute(self):
         """
@@ -52 +52 @@
         error_message = ""
         for path in self.list_path:
-            basename  = os.path.basename(path)
-            root, extension = os.path.splitext(basename)
+            basename = os.path.basename(path)
+            _, extension = os.path.splitext(basename)
             if self.load_state_flag:
                 if extension.lower() in EXTENSIONS:
@@ -61 +61 @@
                     pass
             try:
-                temp =  self.loader.load(path)
-                elapsed = time.time() - self.starttime
+                temp = self.loader.load(path)
                 if temp.__class__.__name__ == "list":
                     for item in temp:
@@ -77 +76 @@
                 error_message += str(sys.exc_value) + "\n"
                 self.updatefn(output=output, message=error_message)
-                
+
         message = "Loading Complete!"
         self.complete(output=output, error_message=error_message,
-                       message=message, path=self.list_path)
-            
-   
-      
+                      message=message, path=self.list_path)