From 7c5072dc5a878ec0c85d2846068eb2553eb2a4cd Mon Sep 17 00:00:00 2001 From: Johannes Kasimir Date: Wed, 27 Aug 2025 15:26:00 +0200 Subject: [PATCH 1/2] fix: remove progress when reduction is finished --- src/ess/reflectometry/gui.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/ess/reflectometry/gui.py b/src/ess/reflectometry/gui.py index bf282332..0aac67fa 100644 --- a/src/ess/reflectometry/gui.py +++ b/src/ess/reflectometry/gui.py @@ -664,9 +664,12 @@ def log_text(self, message): display(message) self.text_log.children = (out, *self.text_log.children) - def log_progress(self, progress): + def show_progress(self, progress): self.progress_log.children = (progress,) + def hide_progress(self): + self.progress_log.children = () + class AmorBatchReductionGUI(ReflectometryBatchReductionGUI): def __init__(self): @@ -958,7 +961,7 @@ def run_workflow(self): ) progress = widgets.IntProgress(min=0, max=len(sample_df)) - self.log_progress(progress) + self.show_progress(progress) if (key := self.get_row_key(reference_df)) in self.results: reference_result = self.results[key] @@ -994,3 +997,5 @@ def run_workflow(self): params, params["Scale"] * wf.compute(ReflectivityOverQ).hist() ) progress.value += 1 + + self.hide_progress() From 992ce90e3c085da8e1f4a3d3e194e6451a3837c9 Mon Sep 17 00:00:00 2001 From: Johannes Kasimir Date: Thu, 28 Aug 2025 10:00:15 +0200 Subject: [PATCH 2/2] fix: move progress bar next to reduction buttons --- src/ess/reflectometry/gui.py | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/src/ess/reflectometry/gui.py b/src/ess/reflectometry/gui.py index 29abf422..3dc456fc 100644 --- a/src/ess/reflectometry/gui.py +++ b/src/ess/reflectometry/gui.py @@ -481,6 +481,7 @@ def _init_runs_table_component(self): def _init_reduction_table_component(self): reduce_button = widgets.Button(description="Reduce") plot_button = widgets.Button(description="Plot") + self.progress_log = widgets.VBox([]) def reduce_data(_): self.log("reduce data") @@ -535,7 +536,7 @@ def delete_row(_): add_row_button.on_click(add_row) delete_row_button.on_click(delete_row) - data_buttons = widgets.HBox([reduce_button, plot_button]) + data_buttons = widgets.HBox([reduce_button, plot_button, self.progress_log]) self.reduction_table_component = widgets.VBox( [ @@ -563,19 +564,10 @@ def delete_row(_): ) def _init_display_component(self): - self.progress_log = widgets.VBox([]) self.plot_log = widgets.VBox([]) self.display_component = widgets.VBox( - [ - widgets.VBox( - [widgets.Label("Progress"), self.progress_log], - layout={'width': '100%', 'margin': '10px 0'}, - ), - widgets.VBox( - [widgets.Label("Plots"), self.plot_log], - layout={'width': '100%', 'margin': '10px 0'}, - ), - ] + [widgets.Label("Plots"), self.plot_log], + layout={'width': '100%', 'margin': '10px 0'}, ) def _init_settings_component(self):