From 0daf1bfbf1e7fd3ca6bbaee87ccfe6ed66b47bf7 Mon Sep 17 00:00:00 2001 From: Rebecca Breu Date: Mon, 29 Mar 2021 19:21:14 +0200 Subject: [PATCH] Fix progress bar when only one item is loaded/saved --- beeref/gui.py | 6 +++--- beeref/view.py | 14 +++++--------- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/beeref/gui.py b/beeref/gui.py index 4fd1afa..7abf2e7 100644 --- a/beeref/gui.py +++ b/beeref/gui.py @@ -45,9 +45,9 @@ class WelcomeOverlay(QtWidgets.QWidget): class BeeProgressDialog(QtWidgets.QProgressDialog): def __init__(self, label, maximum=100, parent=None): - super().__init__(label, 'Cancel', 0, maximum - 1, parent=parent) + super().__init__(label, 'Cancel', 0, maximum, parent=parent) self.setMinimumDuration(2) self.setWindowModality(Qt.WindowModality.WindowModal) - def setMaximum(self, maximum): - super().setMaximum(maximum - 1) + def setValue(self, value): + super().setValue(value + 1) diff --git a/beeref/view.py b/beeref/view.py index 429d77a..0f42478 100644 --- a/beeref/view.py +++ b/beeref/view.py @@ -307,19 +307,15 @@ class BeeGraphicsView(QtWidgets.QGraphicsView): errors = [] items = [] - if len(filenames) > 1: - progress = BeeProgressDialog( - 'Loading images...', len(filenames), parent=self) - else: - progress = None + progress = BeeProgressDialog( + 'Loading images...', len(filenames), parent=self) for i, filename in enumerate(filenames): logger.info(f'Loading image from file {filename}') img = QtGui.QImage(filename) - if progress: - progress.setValue(i) - if progress.wasCanceled(): - break + progress.setValue(i) + if progress.wasCanceled(): + break if img.isNull(): errors.append(filename) continue