include progresswidgets within gui

Author: ptooley

pypop/notebook_interface/tqdm_widget.py

@@ -0,0 +1,47 @@
+
+from ipywidgets import HBox, HTML, Output, FloatProgress
+from tqdm.notebook import tqdm_notebook
+
+class tqdm_notebook_noauto(tqdm_notebook):
+
+    @staticmethod
+    def status_printer(_, total=None, desc=None, ncols=None):
+        """
+        Manage the printing of an IPython/Jupyter Notebook progress bar widget.
+        """
+        # Fallback to text bar if there's no total
+        # DEPRECATED: replaced with an 'info' style bar
+        # if not total:
+        #    return super(tqdm_notebook, tqdm_notebook).status_printer(file)
+
+        # fp = file
+
+        if total:
+            pbar = FloatProgress(min=0, max=total)
+        else:  # No total? Show info style bar with no progress tqdm status
+            pbar = FloatProgress(min=0, max=1)
+            pbar.value = 1
+            pbar.bar_style = 'info'
+            if ncols is None:
+                pbar.layout.width = "20px"
+
+        ltext = HTML()
+        rtext = HTML()
+        if desc:
+            ltext.value = desc
+        container = HBox(children=[ltext, pbar, rtext])
+        # Prepare layout
+        if ncols is not None:  # use default style of ipywidgets
+            # ncols could be 100, "100px", "100%"
+            ncols = str(ncols)  # ipywidgets only accepts string
+            try:
+                if int(ncols) > 0:  # isnumeric and positive
+                    ncols += 'px'
+            except ValueError:
+                pass
+            pbar.layout.flex = '2'
+            container.layout.width = ncols
+            container.layout.display = 'inline-flex'
+            container.layout.flex_flow = 'row wrap'
+
+        return container 

pypop/notebook_interface/wizard.py

@@ -10,6 +10,7 @@
 from .plotting import MetricTable, ScalingPlot
 from .bokeh_widget import BokehWidgetWrapper
 from .reporting import ReportGenerator
+from .tqdm_widget import tqdm_notebook_noauto
 
 from pypop.utils.exceptions import ExtraePRVNoOnOffEventsError
 
@@ -128,7 +129,7 @@ def __init__(self, metric_calc="auto", base_dir=".", starting_files=None, **kwar
         self._status_box = VBox()
 
         super().__init__(
-            children=[VBox([self._status_box, self._fileselector])],
+            children=[VBox([self._fileselector, self._status_box])],
             layout=Layout(width="auto", max_width="1280px"),
             **kwargs
         )
@@ -139,19 +140,27 @@ def _calculate_callback_hook(self, callback_reference=None):
 
         advanced_config = self._fileselector._advanced_config_controls
 
+        fileprogress = tqdm_notebook_noauto(self._fileselector.filenames, leave=False)
+        self._status_box.children = [fileprogress.container]
+
         try:
             statistics = TraceSet(
-                self._fileselector.filenames,
+                fileprogress,
                 force_recalculation=advanced_config["Delete Cache"].value,
-                chop_to_roi=advanced_config["Chop to ROI"].value
+                chop_to_roi=advanced_config["Chop to ROI"].value,
+                no_progress=True,
             )
         except ExtraePRVNoOnOffEventsError as err:
+            fileprogress = tqdm_notebook_noauto(self._fileselector.filenames, leave=False)
             warnstr = "Warning: Disabling Chopping to ROI ({})".format(err)
-            self._status_box.children = [Text(warnstr, layout=Layout(width='auto'))]
+            self._status_box.children = [fileprogress.container,
+                                         Text(warnstr, layout=Layout(width='auto'))]
+
             statistics = TraceSet(
-                self._fileselector.filenames,
+                fileprogress,
                 force_recalculation=advanced_config["Delete Cache"].value,
                 chop_to_roi=False,
+                no_progress=True,
             )
 
         if self._metric_calculator in ("auto", None):