Black formatter changes

This commit is contained in:
Andrew Senetar 2022-03-19 16:59:38 -05:00
parent b9c7832c4a
commit cff07a12d6
Signed by: arsenetar
GPG Key ID: C63300DCE48AB2F1
2 changed files with 9 additions and 27 deletions

View File

@ -1041,44 +1041,26 @@ class ScrollAreaImageViewer(QScrollArea):
"""After scaling, no mouse position, default to center.""" """After scaling, no mouse position, default to center."""
# scrollBar.setMaximum(scrollBar.maximum() - scrollBar.minimum() + scrollBar.pageStep()) # scrollBar.setMaximum(scrollBar.maximum() - scrollBar.minimum() + scrollBar.pageStep())
self._horizontalScrollBar.setValue( self._horizontalScrollBar.setValue(
int( int(factor * self._horizontalScrollBar.value() + ((factor - 1) * self._horizontalScrollBar.pageStep() / 2))
factor * self._horizontalScrollBar.value()
+ ((factor - 1) * self._horizontalScrollBar.pageStep() / 2)
)
) )
self._verticalScrollBar.setValue( self._verticalScrollBar.setValue(
int( int(factor * self._verticalScrollBar.value() + ((factor - 1) * self._verticalScrollBar.pageStep() / 2))
factor * self._verticalScrollBar.value()
+ ((factor - 1) * self._verticalScrollBar.pageStep() / 2)
)
) )
def adjustScrollBarsScaled(self, delta): def adjustScrollBarsScaled(self, delta):
"""After scaling with the mouse, update relative to mouse position.""" """After scaling with the mouse, update relative to mouse position."""
self._horizontalScrollBar.setValue( self._horizontalScrollBar.setValue(int(self._horizontalScrollBar.value() + delta.x()))
int(self._horizontalScrollBar.value() + delta.x()) self._verticalScrollBar.setValue(int(self._verticalScrollBar.value() + delta.y()))
)
self._verticalScrollBar.setValue(
int(self._verticalScrollBar.value() + delta.y())
)
def adjustScrollBarsAuto(self): def adjustScrollBarsAuto(self):
"""After panning, update accordingly.""" """After panning, update accordingly."""
self.horizontalScrollBar().setValue( self.horizontalScrollBar().setValue(int(self.horizontalScrollBar().value() - self._mousePanningDelta.x()))
int(self.horizontalScrollBar().value() - self._mousePanningDelta.x()) self.verticalScrollBar().setValue(int(self.verticalScrollBar().value() - self._mousePanningDelta.y()))
)
self.verticalScrollBar().setValue(
int(self.verticalScrollBar().value() - self._mousePanningDelta.y())
)
def adjustScrollBarCentered(self): def adjustScrollBarCentered(self):
"""Just center in the middle.""" """Just center in the middle."""
self._horizontalScrollBar.setValue( self._horizontalScrollBar.setValue(int(self._horizontalScrollBar.maximum() / 2))
int(self._horizontalScrollBar.maximum() / 2) self._verticalScrollBar.setValue(int(self._verticalScrollBar.maximum() / 2))
)
self._verticalScrollBar.setValue(
int(self._verticalScrollBar.maximum() / 2)
)
def resetCenter(self): def resetCenter(self):
"""Resets origin""" """Resets origin"""

View File

@ -14,7 +14,7 @@ if op.exists(__file__):
else: else:
# Should be a frozen environment # Should be a frozen environment
if ISOSX: if ISOSX:
BASE_PATH = op.abspath(op.join(op.dirname(__file__), '..', '..', 'Resources')) BASE_PATH = op.abspath(op.join(op.dirname(__file__), "..", "..", "Resources"))
else: else:
# For others our base path is ''. # For others our base path is ''.
BASE_PATH = "" BASE_PATH = ""