From cff07a12d650ea6269a8708734fd2e3ab2f55d2b Mon Sep 17 00:00:00 2001 From: Andrew Senetar Date: Sat, 19 Mar 2022 16:59:38 -0500 Subject: [PATCH] Black formatter changes --- qt/pe/image_viewer.py | 34 ++++++++-------------------------- qt/platform.py | 2 +- 2 files changed, 9 insertions(+), 27 deletions(-) diff --git a/qt/pe/image_viewer.py b/qt/pe/image_viewer.py index 0c0b700f..61c815eb 100644 --- a/qt/pe/image_viewer.py +++ b/qt/pe/image_viewer.py @@ -1041,44 +1041,26 @@ class ScrollAreaImageViewer(QScrollArea): """After scaling, no mouse position, default to center.""" # scrollBar.setMaximum(scrollBar.maximum() - scrollBar.minimum() + scrollBar.pageStep()) self._horizontalScrollBar.setValue( - int( - factor * self._horizontalScrollBar.value() - + ((factor - 1) * self._horizontalScrollBar.pageStep() / 2) - ) + int(factor * self._horizontalScrollBar.value() + ((factor - 1) * self._horizontalScrollBar.pageStep() / 2)) ) self._verticalScrollBar.setValue( - int( - factor * self._verticalScrollBar.value() - + ((factor - 1) * self._verticalScrollBar.pageStep() / 2) - ) + int(factor * self._verticalScrollBar.value() + ((factor - 1) * self._verticalScrollBar.pageStep() / 2)) ) def adjustScrollBarsScaled(self, delta): """After scaling with the mouse, update relative to mouse position.""" - self._horizontalScrollBar.setValue( - int(self._horizontalScrollBar.value() + delta.x()) - ) - self._verticalScrollBar.setValue( - int(self._verticalScrollBar.value() + delta.y()) - ) + self._horizontalScrollBar.setValue(int(self._horizontalScrollBar.value() + delta.x())) + self._verticalScrollBar.setValue(int(self._verticalScrollBar.value() + delta.y())) def adjustScrollBarsAuto(self): """After panning, update accordingly.""" - self.horizontalScrollBar().setValue( - int(self.horizontalScrollBar().value() - self._mousePanningDelta.x()) - ) - self.verticalScrollBar().setValue( - int(self.verticalScrollBar().value() - self._mousePanningDelta.y()) - ) + self.horizontalScrollBar().setValue(int(self.horizontalScrollBar().value() - self._mousePanningDelta.x())) + self.verticalScrollBar().setValue(int(self.verticalScrollBar().value() - self._mousePanningDelta.y())) def adjustScrollBarCentered(self): """Just center in the middle.""" - self._horizontalScrollBar.setValue( - int(self._horizontalScrollBar.maximum() / 2) - ) - self._verticalScrollBar.setValue( - int(self._verticalScrollBar.maximum() / 2) - ) + self._horizontalScrollBar.setValue(int(self._horizontalScrollBar.maximum() / 2)) + self._verticalScrollBar.setValue(int(self._verticalScrollBar.maximum() / 2)) def resetCenter(self): """Resets origin""" diff --git a/qt/platform.py b/qt/platform.py index 81e23ad8..88c5c22e 100644 --- a/qt/platform.py +++ b/qt/platform.py @@ -14,7 +14,7 @@ if op.exists(__file__): else: # Should be a frozen environment if ISOSX: - BASE_PATH = op.abspath(op.join(op.dirname(__file__), '..', '..', 'Resources')) + BASE_PATH = op.abspath(op.join(op.dirname(__file__), "..", "..", "Resources")) else: # For others our base path is ''. BASE_PATH = ""