ADD: Implemented progress gui in the importation frame

Paulo Henrique Junqueira Amorim
1 parent fff5ce91
Showing 3 changed files with 20 additions and 16 deletions Show diff stats
invesalius/control.py
invesalius/gui/dialogs.py
invesalius/reader/dicom_reader.py
+import math
 import os
 import plistlib
@@ -23,6 +24,7 @@ class Controller():
         self.volume = volume.Volume()
         self.__bind_events()
         self.frame = frame
+        self.progress_dialog = None
     def __bind_events(self):
         ps.Publisher().subscribe(self.OnImportMedicalImages, 'Import directory')
@@ -47,8 +49,13 @@ class Controller():
         self.frame.Bind(reader.evt_end_load_file, self.LoadPanel)
     def Progress(self, evt):
-        print evt.progress
-    
+        if not(self.progress_dialog):
+            self.progress_dialog = dialog.ProgressDialog(maximum = evt.progress[1])
+        else:
+            if not(self.progress_dialog.Update(evt.progress[0])):
+                self.progress_dialog = None
+            
+            
     def LoadPanel(self,evt):
         patient_series = evt.value
         if patient_series:
@@ -59,10 +59,10 @@ def ShowNumberDialog(message, value=0):
 class ProgressDialog(object):
-    def __init__(self):
+    def __init__(self, maximum):
         self.title = "InVesalius 3"
         self.msg = "Loading DICOM files"
-        self.maximum = 100
+        self.maximum = maximum
         self.current = 0
         self.style = wx.PD_CAN_ABORT | wx.PD_APP_MODAL
         self.dlg = wx.ProgressDialog(self.title,
@@ -77,14 +77,10 @@ class ProgressDialog(object):
                                      )
     def Update(self, value):
-        self.current += value
-        (keep_going, skip) = dlg.Update(count)
-        if (not keep_going) or (skip):
-            dlg.Destroy()
+        if (value == self.maximum):
+            self.dlg.Destroy()
             return False
-        elif (self.current > self.max):
-            dlg.Destroy()
-            return True
         else:
-            return self.current
-
+            self.dlg.Update(value)
+            return True
+    
@@ -19,6 +19,7 @@
 from vtk.util.colors import yellow
 import glob
 import os
+import math
 import vtk
 import vtkgdcm
@@ -95,7 +96,7 @@ def yGetDicomGroups(directory, recursive=True, gui=True):
                 parser = dicom.Parser()
                 counter += 1
                 if gui:
-                    yield counter/nfiles*100
+                    yield (counter,nfiles)
                 if parser.SetFileName(filepath):
                     dcm = dicom.Dicom()
                     dcm.SetParser(parser)
@@ -108,7 +109,7 @@ def yGetDicomGroups(directory, recursive=True, gui=True):
             parser = dicom.Parser()
             counter += 1
             if gui:
-                yield counter/nfiles*100
+                yield (counter,nfiles)
             if parser.SetFileName(filepath):
                 dcm = dicom.Dicom()
                 dcm.SetParser(parser)
@@ -147,7 +148,7 @@ class ProgressDicomReader:
         y = yGetDicomGroups(path, recursive)
         while self.running:
             value_progress = y.next()
-            if isinstance(value_progress, float):
+            if isinstance(value_progress, tuple):
                 self.UpdateLoadFileProgress(value_progress)
             else:
                 self.EndLoadFile(value_progress)