From 1ef051379bc6a62cb2ebfba959a59a34ec60c983 Mon Sep 17 00:00:00 2001 From: Tetsuo Koyama Date: Fri, 17 Jul 2020 15:30:41 +0900 Subject: [PATCH 01/11] :new: black CI by GitHub Actions --- .github/workflows/pythonpackage.yml | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 .github/workflows/pythonpackage.yml diff --git a/.github/workflows/pythonpackage.yml b/.github/workflows/pythonpackage.yml new file mode 100644 index 00000000..4fd6cfc5 --- /dev/null +++ b/.github/workflows/pythonpackage.yml @@ -0,0 +1,27 @@ +# This workflow will install Python dependencies, run tests and lint with a variety of Python versions +# For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions +name: Python package +on: + push: + branches: [ master ] + pull_request: + branches: [ master ] +jobs: + build: + runs-on: ubuntu-20.04 + steps: + - uses: actions/checkout@v2 + - name: Python Code Quality and Lint + uses: ricardochaves/python-lint@v1.1.0 + with: + python-root-list: meshioplt + use-pylint: false + use-pycodestyle: false + use-flake8: false + use-black: true + use-mypy: false + use-isort: false + extra-pylint-options: --disable=F0401 + extra-pycodestyle-options: --max-line-length=88 --ignore="W503" + extra-mypy-options: --no-implicit-optional + extra-flake8-options: --max-line-length=88 From cfda2be4b4d52324d0eacbd6f8546204f4bf6d70 Mon Sep 17 00:00:00 2001 From: Tetsuo Koyama Date: Fri, 17 Jul 2020 15:34:14 +0900 Subject: [PATCH 02/11] :name_badge: black --- README.rst | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.rst b/README.rst index ad6fff25..4b027390 100644 --- a/README.rst +++ b/README.rst @@ -23,6 +23,10 @@ PyVistaQt :target: https://codecov.io/gh/pyvista/pyvistaqt :alt: Codecov +.. image:: https://img.shields.io/badge/code%20style-black-000000.svg?style=flat-square + :target: https://github.com/psf/black + :alt: black + ``pyvistaqt`` is a helper module for ``pyvista`` to enable you to plot using ``pyqt`` by placing a vtk-widget into a background render. This can be quite useful when you desire to update your plot in From 77c6fe6028d7e2aac6331d8d12c1eaaf4fe1c335 Mon Sep 17 00:00:00 2001 From: Tetsuo Koyama Date: Fri, 17 Jul 2020 15:38:17 +0900 Subject: [PATCH 03/11] :wrench: .github/workflows/pythonpackage.yml --- .github/workflows/pythonpackage.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pythonpackage.yml b/.github/workflows/pythonpackage.yml index 4fd6cfc5..24c01c01 100644 --- a/.github/workflows/pythonpackage.yml +++ b/.github/workflows/pythonpackage.yml @@ -14,7 +14,7 @@ jobs: - name: Python Code Quality and Lint uses: ricardochaves/python-lint@v1.1.0 with: - python-root-list: meshioplt + python-root-list: pyvistaqt use-pylint: false use-pycodestyle: false use-flake8: false From edbdbeca304bd9b9de4f587d77ba85cc9c413a45 Mon Sep 17 00:00:00 2001 From: Tetsuo Koyama Date: Fri, 17 Jul 2020 07:34:16 +0000 Subject: [PATCH 04/11] :shirt: reformat by black --- pyvistaqt/_version.py | 2 +- pyvistaqt/plotting.py | 317 ++++++++++++++++++++++++++---------------- 2 files changed, 198 insertions(+), 121 deletions(-) diff --git a/pyvistaqt/_version.py b/pyvistaqt/_version.py index cf7b67f3..c1966fb5 100644 --- a/pyvistaqt/_version.py +++ b/pyvistaqt/_version.py @@ -3,4 +3,4 @@ version_info = 0, 1, 1 # Nice string for the version -__version__ = '.'.join(map(str, version_info)) +__version__ = ".".join(map(str, version_info)) diff --git a/pyvistaqt/plotting.py b/pyvistaqt/plotting.py index c722179a..fc6d18e5 100644 --- a/pyvistaqt/plotting.py +++ b/pyvistaqt/plotting.py @@ -58,11 +58,21 @@ from vtk.qt.QVTKRenderWindowInteractor import QVTKRenderWindowInteractor from PyQt5 import QtGui from PyQt5 import QtCore -from PyQt5.QtWidgets import (QMenuBar, QVBoxLayout, QHBoxLayout, - QDoubleSpinBox, QFrame, QMainWindow, - QSlider, QAction, QDialog, QFormLayout, - QFileDialog) -log = logging.getLogger('pyvistaqt') +from PyQt5.QtWidgets import ( + QMenuBar, + QVBoxLayout, + QHBoxLayout, + QDoubleSpinBox, + QFrame, + QMainWindow, + QSlider, + QAction, + QDialog, + QFormLayout, + QFileDialog, +) + +log = logging.getLogger("pyvistaqt") log.setLevel(logging.CRITICAL) log.addHandler(logging.StreamHandler()) @@ -77,8 +87,9 @@ # log = logging.getLogger(__name__) # log.setLevel('DEBUG') -SAVE_CAM_BUTTON_TEXT = 'Save Camera' -CLEAR_CAMS_BUTTON_TEXT = 'Clear Cameras' +SAVE_CAM_BUTTON_TEXT = "Save Camera" +CLEAR_CAMS_BUTTON_TEXT = "Clear Cameras" + class FileDialog(QFileDialog): """Generic file query. @@ -89,8 +100,15 @@ class FileDialog(QFileDialog): dlg_accepted = pyqtSignal(str) - def __init__(self, parent=None, filefilter=None, save_mode=True, show=True, - callback=None, directory=False): + def __init__( + self, + parent=None, + filefilter=None, + save_mode=True, + show=True, + callback=None, + directory=False, + ): """Initialize the file dialog.""" super(FileDialog, self).__init__(parent) @@ -153,11 +171,15 @@ def _value_range(self): def value(self): """Return the value of the slider.""" - return float(super().value()) / self._max_int * self._value_range + self._min_value + return ( + float(super().value()) / self._max_int * self._value_range + self._min_value + ) def setValue(self, value): """Set the value of the slider.""" - super().setValue(int((value - self._min_value) / self._value_range * self._max_int)) + super().setValue( + int((value - self._min_value) / self._value_range * self._max_int) + ) def setMinimum(self, value): """Set the minimum value of the slider.""" @@ -181,8 +203,7 @@ def setMaximum(self, value): class RangeGroup(QHBoxLayout): """Range group box widget.""" - def __init__(self, parent, callback, minimum=0.0, maximum=20.0, - value=1.0): + def __init__(self, parent, callback, minimum=0.0, maximum=20.0, value=1.0): """Initialize the range widget.""" super(RangeGroup, self).__init__(parent) self.slider = DoubleSlider(QtCore.Qt.Horizontal) @@ -194,8 +215,9 @@ def __init__(self, parent, callback, minimum=0.0, maximum=20.0, self.minimum = minimum self.maximum = maximum - self.spinbox = QDoubleSpinBox(value=value, minimum=minimum, - maximum=maximum, decimals=4) + self.spinbox = QDoubleSpinBox( + value=value, minimum=minimum, maximum=maximum, decimals=4 + ) self.addWidget(self.slider) self.addWidget(self.spinbox) @@ -246,17 +268,20 @@ def __init__(self, parent, plotter, show=True): self.plotter = plotter self.plotter.app_window.signal_close.connect(self.close) - self.x_slider_group = RangeGroup(parent, self.update_scale, - value=plotter.scale[0]) - self.y_slider_group = RangeGroup(parent, self.update_scale, - value=plotter.scale[1]) - self.z_slider_group = RangeGroup(parent, self.update_scale, - value=plotter.scale[2]) + self.x_slider_group = RangeGroup( + parent, self.update_scale, value=plotter.scale[0] + ) + self.y_slider_group = RangeGroup( + parent, self.update_scale, value=plotter.scale[1] + ) + self.z_slider_group = RangeGroup( + parent, self.update_scale, value=plotter.scale[2] + ) form_layout = QFormLayout(self) - form_layout.addRow('X Scale', self.x_slider_group) - form_layout.addRow('Y Scale', self.y_slider_group) - form_layout.addRow('Z Scale', self.z_slider_group) + form_layout.addRow("X Scale", self.x_slider_group) + form_layout.addRow("Y Scale", self.y_slider_group) + form_layout.addRow("Z Scale", self.z_slider_group) self.setLayout(form_layout) @@ -265,9 +290,11 @@ def __init__(self, parent, plotter, show=True): def update_scale(self, value): """Update the scale of all actors in the plotter.""" - self.plotter.set_scale(self.x_slider_group.value, - self.y_slider_group.value, - self.z_slider_group.value) + self.plotter.set_scale( + self.x_slider_group.value, + self.y_slider_group.value, + self.z_slider_group.value, + ) def resample_image(arr, max_size=400): @@ -281,7 +308,7 @@ def resample_image(arr, max_size=400): arr = arr[0:-1:sx, 0:-1:sy, :] xl = (max_size - arr.shape[0]) // 2 yl = (max_size - arr.shape[1]) // 2 - img[xl:arr.shape[0]+xl, yl:arr.shape[1]+yl, :] = arr + img[xl : arr.shape[0] + xl, yl : arr.shape[1] + yl, :] = arr return img @@ -291,7 +318,7 @@ def pad_image(arr, max_size=400): img = np.zeros((dim, dim, 3), dtype=arr.dtype) xl = (dim - arr.shape[0]) // 2 yl = (dim - arr.shape[1]) // 2 - img[xl:arr.shape[0]+xl, yl:arr.shape[1]+yl, :] = arr + img[xl : arr.shape[0] + xl, yl : arr.shape[1] + yl, :] = arr return resample_image(img, max_size=max_size) @@ -342,17 +369,26 @@ class QtInteractor(QVTKRenderWindowInteractor, BasePlotter): render_signal = pyqtSignal() key_press_event_signal = pyqtSignal(vtk.vtkGenericRenderWindowInteractor, str) - def __init__(self, parent=None, title=None, off_screen=None, - multi_samples=None, line_smoothing=False, - point_smoothing=False, polygon_smoothing=False, - splitting_position=None, auto_update=5.0, **kwargs): + def __init__( + self, + parent=None, + title=None, + off_screen=None, + multi_samples=None, + line_smoothing=False, + point_smoothing=False, + polygon_smoothing=False, + splitting_position=None, + auto_update=5.0, + **kwargs + ): """Initialize Qt interactor.""" - log.debug('QtInteractor init start') + log.debug("QtInteractor init start") # Cannot use super() here because # QVTKRenderWindowInteractor silently swallows all kwargs # because they use **kwargs in their constructor... qvtk_kwargs = dict(parent=parent) - for key in ('stereo', 'iren', 'rw', 'wflags'): + for key in ("stereo", "iren", "rw", "wflags"): if key in kwargs: qvtk_kwargs[key] = kwargs.pop(key) with _no_BasePlotter_init(): @@ -362,7 +398,7 @@ def __init__(self, parent=None, title=None, off_screen=None, self.interactor = self if multi_samples is None: - multi_samples = rcParams['multi_samples'] + multi_samples = rcParams["multi_samples"] self.setAcceptDrops(True) @@ -382,7 +418,7 @@ def __init__(self, parent=None, title=None, off_screen=None, self.render_signal.connect(self._render) self.key_press_event_signal.connect(super(QtInteractor, self).key_press_event) - self.background_color = rcParams['background'] + self.background_color = rcParams["background"] if self.title: self.setWindowTitle(title) @@ -393,7 +429,7 @@ def __init__(self, parent=None, title=None, off_screen=None, self.ren_win.SetOffScreenRendering(1) else: self.iren = self.ren_win.GetInteractor() - self.iren.RemoveObservers('MouseMoveEvent') # slows window update? + self.iren.RemoveObservers("MouseMoveEvent") # slows window update? # Enter trackball camera mode istyle = vtk.vtkInteractorStyleTrackballCamera() @@ -401,7 +437,7 @@ def __init__(self, parent=None, title=None, off_screen=None, self.iren.Initialize() - self._observers = {} # Map of events to observers of self.iren + self._observers = {} # Map of events to observers of self.iren self._add_observer("KeyPressEvent", self.key_press_event) # Make the render timer but only activate if using auto update @@ -412,7 +448,7 @@ def __init__(self, parent=None, title=None, off_screen=None, # Modified() and upstream objects won't be updated. This # ensures the render window stays updated without consuming too # many resources. - twait = (auto_update**-1) * 1000.0 + twait = (auto_update ** -1) * 1000.0 self.render_timer.timeout.connect(self.render) self.render_timer.start(twait) @@ -423,7 +459,7 @@ def __init__(self, parent=None, title=None, off_screen=None, self._first_time = False # Crucial! self.view_isometric() - log.debug('QtInteractor init stop') + log.debug("QtInteractor init stop") def gesture_event(self, event): """Handle gesture events.""" @@ -442,7 +478,7 @@ def _render(self, *args, **kwargs): """Wrap ``BasePlotter.render``.""" return BasePlotter.render(self, *args, **kwargs) - @conditional_decorator(threaded, platform.system() == 'Darwin') + @conditional_decorator(threaded, platform.system() == "Darwin") def render(self): """Override the ``render`` method to handle threading issues.""" return self.render_signal.emit() @@ -460,7 +496,7 @@ def dragEnterEvent(self, event): # only call accept on files event.accept() except Exception as e: - warnings.warn('Exception when dropping files: %s' % str(e)) + warnings.warn("Exception when dropping files: %s" % str(e)) def dropEvent(self, event): """Event is called after dragEnterEvent.""" @@ -476,6 +512,7 @@ def dropEvent(self, event): def add_toolbars(self): """Add the toolbars.""" + def _add_action(tool_bar, key, method): action = QAction(key, self.app_window) action.triggered.connect(method) @@ -483,28 +520,36 @@ def _add_action(tool_bar, key, method): return # Camera toolbar - self.default_camera_tool_bar = self.app_window.addToolBar('Camera Position') + self.default_camera_tool_bar = self.app_window.addToolBar("Camera Position") _view_vector = lambda *args: self.view_vector(*args) cvec_setters = { # Viewing vector then view up vector - 'Top (-Z)': lambda: _view_vector((0, 0, 1), (0, 1, 0)), - 'Bottom (+Z)': lambda: _view_vector((0, 0, -1), (0, 1, 0)), - 'Front (-Y)': lambda: _view_vector((0, 1, 0), (0, 0, 1)), - 'Back (+Y)': lambda: _view_vector((0, -1, 0), (0, 0, 1)), - 'Left (-X)': lambda: _view_vector((1, 0, 0), (0, 0, 1)), - 'Right (+X)': lambda: _view_vector((-1, 0, 0), (0, 0, 1)), - 'Isometric': lambda: _view_vector((1, 1, 1), (0, 0, 1)) + "Top (-Z)": lambda: _view_vector((0, 0, 1), (0, 1, 0)), + "Bottom (+Z)": lambda: _view_vector((0, 0, -1), (0, 1, 0)), + "Front (-Y)": lambda: _view_vector((0, 1, 0), (0, 0, 1)), + "Back (+Y)": lambda: _view_vector((0, -1, 0), (0, 0, 1)), + "Left (-X)": lambda: _view_vector((1, 0, 0), (0, 0, 1)), + "Right (+X)": lambda: _view_vector((-1, 0, 0), (0, 0, 1)), + "Isometric": lambda: _view_vector((1, 1, 1), (0, 0, 1)), } for key, method in cvec_setters.items(): _add_action(self.default_camera_tool_bar, key, method) - _add_action(self.default_camera_tool_bar, 'Reset', lambda: self.reset_camera()) + _add_action(self.default_camera_tool_bar, "Reset", lambda: self.reset_camera()) # Saved camera locations toolbar self.saved_camera_positions = [] - self.saved_cameras_tool_bar = self.app_window.addToolBar('Saved Camera Positions') - - _add_action(self.saved_cameras_tool_bar, SAVE_CAM_BUTTON_TEXT, self.save_camera_position) - _add_action(self.saved_cameras_tool_bar, CLEAR_CAMS_BUTTON_TEXT, self.clear_camera_positions) + self.saved_cameras_tool_bar = self.app_window.addToolBar( + "Saved Camera Positions" + ) + + _add_action( + self.saved_cameras_tool_bar, SAVE_CAM_BUTTON_TEXT, self.save_camera_position + ) + _add_action( + self.saved_cameras_tool_bar, + CLEAR_CAMS_BUTTON_TEXT, + self.clear_camera_positions, + ) return @@ -513,38 +558,45 @@ def add_menu_bar(self): self.main_menu = _create_menu_bar(parent=self.app_window) self.app_window.signal_close.connect(self.main_menu.clear) - file_menu = self.main_menu.addMenu('File') - file_menu.addAction('Take Screenshot', self._qt_screenshot) - file_menu.addAction('Export as VTKjs', self._qt_export_vtkjs) + file_menu = self.main_menu.addMenu("File") + file_menu.addAction("Take Screenshot", self._qt_screenshot) + file_menu.addAction("Export as VTKjs", self._qt_export_vtkjs) file_menu.addSeparator() # member variable for testing only - self._menu_close_action = file_menu.addAction('Exit', self.app_window.close) - - view_menu = self.main_menu.addMenu('View') - self._edl_action = view_menu.addAction('Toggle Eye Dome Lighting', self._toggle_edl) - view_menu.addAction('Scale Axes', self.scale_axes_dialog) - view_menu.addAction('Clear All', self.clear) - - tool_menu = self.main_menu.addMenu('Tools') - tool_menu.addAction('Enable Cell Picking (through)', self.enable_cell_picking) - tool_menu.addAction('Enable Cell Picking (visible)', lambda: self.enable_cell_picking(through=False)) - - cam_menu = view_menu.addMenu('Camera') - self._parallel_projection_action = cam_menu.addAction('Toggle Parallel Projection', self._toggle_parallel_projection) + self._menu_close_action = file_menu.addAction("Exit", self.app_window.close) + + view_menu = self.main_menu.addMenu("View") + self._edl_action = view_menu.addAction( + "Toggle Eye Dome Lighting", self._toggle_edl + ) + view_menu.addAction("Scale Axes", self.scale_axes_dialog) + view_menu.addAction("Clear All", self.clear) + + tool_menu = self.main_menu.addMenu("Tools") + tool_menu.addAction("Enable Cell Picking (through)", self.enable_cell_picking) + tool_menu.addAction( + "Enable Cell Picking (visible)", + lambda: self.enable_cell_picking(through=False), + ) + + cam_menu = view_menu.addMenu("Camera") + self._parallel_projection_action = cam_menu.addAction( + "Toggle Parallel Projection", self._toggle_parallel_projection + ) view_menu.addSeparator() # Orientation marker - orien_menu = view_menu.addMenu('Orientation Marker') - orien_menu.addAction('Show All', self.show_axes_all) - orien_menu.addAction('Hide All', self.hide_axes_all) + orien_menu = view_menu.addMenu("Orientation Marker") + orien_menu.addAction("Show All", self.show_axes_all) + orien_menu.addAction("Hide All", self.hide_axes_all) # Bounds axes - axes_menu = view_menu.addMenu('Bounds Axes') - axes_menu.addAction('Add Bounds Axes (front)', self.show_bounds) - axes_menu.addAction('Add Bounds Grid (back)', self.show_grid) - axes_menu.addAction('Add Bounding Box', self.add_bounding_box) + axes_menu = view_menu.addMenu("Bounds Axes") + axes_menu.addAction("Add Bounds Axes (front)", self.show_bounds) + axes_menu.addAction("Add Bounds Grid (back)", self.show_grid) + axes_menu.addAction("Add Bounding Box", self.add_bounding_box) axes_menu.addSeparator() - axes_menu.addAction('Remove Bounding Box', self.remove_bounding_box) - axes_menu.addAction('Remove Bounds', self.remove_bounds_axes) + axes_menu.addAction("Remove Bounding Box", self.remove_bounding_box) + axes_menu.addAction("Remove Bounds", self.remove_bounds_axes) # A final separator to separate OS options view_menu.addSeparator() @@ -556,11 +608,13 @@ def save_camera_position(self): camera_position = self.camera_position[:] # py2.7 copy compatibility if hasattr(self, "saved_cameras_tool_bar"): + def load_camera_position(): self.camera_position = camera_position - self.saved_cameras_tool_bar.addAction('Cam %2d' % ncam, - load_camera_position) + self.saved_cameras_tool_bar.addAction( + "Cam %2d" % ncam, load_camera_position + ) if ncam < 10: self.add_key_event(str(ncam), load_camera_position) return @@ -649,35 +703,49 @@ class BackgroundPlotter(QtInteractor): ICON_TIME_STEP = 5.0 - def __init__(self, show=True, app=None, window_size=None, - off_screen=None, allow_quit_keypress=True, - toolbar=True, menu_bar=True, **kwargs): + def __init__( + self, + show=True, + app=None, + window_size=None, + off_screen=None, + allow_quit_keypress=True, + toolbar=True, + menu_bar=True, + **kwargs + ): """Initialize the qt plotter.""" - log.debug('BackgroundPlotter init start') + log.debug("BackgroundPlotter init start") if not isinstance(menu_bar, bool): - raise TypeError("Expected type for ``menu_bar`` is bool" - " but {} was given.".format(type(menu_bar))) + raise TypeError( + "Expected type for ``menu_bar`` is bool" + " but {} was given.".format(type(menu_bar)) + ) if not isinstance(toolbar, bool): - raise TypeError("Expected type for ``toolbar`` is bool" - " but {} was given.".format(type(toolbar))) + raise TypeError( + "Expected type for ``toolbar`` is bool" + " but {} was given.".format(type(toolbar)) + ) self.active = True self.counters = [] self.allow_quit_keypress = allow_quit_keypress if window_size is None: - window_size = rcParams['window_size'] + window_size = rcParams["window_size"] # Remove notebook argument in case user passed it - kwargs.pop('notebook', None) + kwargs.pop("notebook", None) # ipython magic if scooby.in_ipython(): # pragma: no cover from IPython import get_ipython + ipython = get_ipython() - ipython.magic('gui qt') + ipython.magic("gui qt") from IPython.external.qt_for_kernel import QtGui + QtGui.QApplication.instance() else: ipython = None @@ -685,22 +753,23 @@ def __init__(self, show=True, app=None, window_size=None, # run within python if app is None: from PyQt5.QtWidgets import QApplication + app = QApplication.instance() if not app: # pragma: no cover - app = QApplication(['']) + app = QApplication([""]) self.app = app self.app_window = MainWindow() - self.app_window.setWindowTitle(kwargs.get('title', rcParams['title'])) + self.app_window.setWindowTitle(kwargs.get("title", rcParams["title"])) self.frame = QFrame(parent=self.app_window) self.frame.setFrameStyle(QFrame.NoFrame) self.app_window.setCentralWidget(self.frame) vlayout = QVBoxLayout() self.frame.setLayout(vlayout) - super(BackgroundPlotter, self).__init__(parent=self.frame, - off_screen=off_screen, - **kwargs) + super(BackgroundPlotter, self).__init__( + parent=self.frame, off_screen=off_screen, **kwargs + ) vlayout.addWidget(self) self.app_window.grabGesture(QtCore.Qt.PinchGesture) self.app_window.signal_gesture.connect(self.gesture_event) @@ -733,7 +802,7 @@ def __init__(self, show=True, app=None, window_size=None, # Keypress events self.add_key_event("S", self._qt_screenshot) # shift + s - log.debug('BackgroundPlotter init stop') + log.debug("BackgroundPlotter init stop") def reset_key_events(self): """Reset all of the key press events to their defaults. @@ -763,7 +832,9 @@ def _close(self): def update_app_icon(self): """Update the app icon if the user is not trying to resize the window.""" - if os.name == 'nt' or not hasattr(self, '_last_window_size'): # pragma: no cover + if os.name == "nt" or not hasattr( + self, "_last_window_size" + ): # pragma: no cover # DO NOT EVEN ATTEMPT TO UPDATE ICON ON WINDOWS return cur_time = time.time() @@ -771,15 +842,17 @@ def update_app_icon(self): # Window size hasn't remained constant since last render. # This means the user is resizing it so ignore update. pass - elif ((cur_time - self._last_update_time > BackgroundPlotter.ICON_TIME_STEP) - and self._last_camera_pos != self.camera_position): + elif ( + cur_time - self._last_update_time > BackgroundPlotter.ICON_TIME_STEP + ) and self._last_camera_pos != self.camera_position: # its been a while since last update OR # the camera position has changed and its been at least one second # Update app icon as preview of the window img = pad_image(self.image) - qimage = QtGui.QImage(img.copy(), img.shape[1], - img.shape[0], QtGui.QImage.Format_RGB888) + qimage = QtGui.QImage( + img.copy(), img.shape[1], img.shape[0], QtGui.QImage.Format_RGB888 + ) icon = QtGui.QIcon(QtGui.QPixmap.fromImage(qimage)) self.app.setWindowIcon(icon) @@ -791,23 +864,26 @@ def update_app_icon(self): self._last_window_size = self.window_size def _qt_screenshot(self, show=True): - return FileDialog(self.app_window, - filefilter=['Image File (*.png)', - 'JPEG (*.jpeg)'], - show=show, - directory=os.getcwd(), - callback=self.screenshot) + return FileDialog( + self.app_window, + filefilter=["Image File (*.png)", "JPEG (*.jpeg)"], + show=show, + directory=os.getcwd(), + callback=self.screenshot, + ) def _qt_export_vtkjs(self, show=True): """Spawn an save file dialog to export a vtkjs file.""" - return FileDialog(self.app_window, - filefilter=['VTK JS File(*.vtkjs)'], - show=show, - directory=os.getcwd(), - callback=self.export_vtkjs) + return FileDialog( + self.app_window, + filefilter=["VTK JS File(*.vtkjs)"], + show=show, + directory=os.getcwd(), + callback=self.export_vtkjs, + ) def _toggle_edl(self): - if hasattr(self.renderer, 'edl_pass'): + if hasattr(self.renderer, "edl_pass"): return self.renderer.disable_eye_dome_lighting() return self.renderer.enable_eye_dome_lighting() @@ -889,10 +965,11 @@ def __init__(self, count): if isinstance(count, int) and count > 0: self.count = count elif count > 0: - raise TypeError('Expected type of `count` to be' - '`int` but got: {}'.format(type(count))) + raise TypeError( + "Expected type of `count` to be" "`int` but got: {}".format(type(count)) + ) else: - raise ValueError('count is not strictly positive.') + raise ValueError("count is not strictly positive.") @pyqtSlot() def decrease(self): From f0dd585656dd1c915564cf879634a787d05db2e2 Mon Sep 17 00:00:00 2001 From: Tetsuo Koyama Date: Fri, 17 Jul 2020 19:31:33 +0900 Subject: [PATCH 05/11] :arrow_up: .github/workflows/pythonpackage.yml --- .github/workflows/pythonpackage.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pythonpackage.yml b/.github/workflows/pythonpackage.yml index 24c01c01..c8ad703e 100644 --- a/.github/workflows/pythonpackage.yml +++ b/.github/workflows/pythonpackage.yml @@ -15,9 +15,9 @@ jobs: uses: ricardochaves/python-lint@v1.1.0 with: python-root-list: pyvistaqt - use-pylint: false - use-pycodestyle: false - use-flake8: false + use-pylint: true + use-pycodestyle: true + use-flake8: true use-black: true use-mypy: false use-isort: false From fad0a94ed7026c45025a9c73f64c0bab933452b0 Mon Sep 17 00:00:00 2001 From: Tetsuo Koyama Date: Fri, 17 Jul 2020 19:31:51 +0900 Subject: [PATCH 06/11] :arrow_up: .github/workflows/pythonpackage.yml --- .github/workflows/pythonpackage.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pythonpackage.yml b/.github/workflows/pythonpackage.yml index c8ad703e..c8119e6c 100644 --- a/.github/workflows/pythonpackage.yml +++ b/.github/workflows/pythonpackage.yml @@ -19,8 +19,8 @@ jobs: use-pycodestyle: true use-flake8: true use-black: true - use-mypy: false - use-isort: false + use-mypy: true + use-isort: true extra-pylint-options: --disable=F0401 extra-pycodestyle-options: --max-line-length=88 --ignore="W503" extra-mypy-options: --no-implicit-optional From b0e0cacbdca2f83dc28d0c988c4c66ba3d26f0ec Mon Sep 17 00:00:00 2001 From: Tetsuo Koyama Date: Fri, 17 Jul 2020 19:42:00 +0900 Subject: [PATCH 07/11] :arrow_up: .github/workflows/pythonpackage.yml --- .github/workflows/pythonpackage.yml | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/.github/workflows/pythonpackage.yml b/.github/workflows/pythonpackage.yml index c8119e6c..87a7aee9 100644 --- a/.github/workflows/pythonpackage.yml +++ b/.github/workflows/pythonpackage.yml @@ -15,13 +15,9 @@ jobs: uses: ricardochaves/python-lint@v1.1.0 with: python-root-list: pyvistaqt - use-pylint: true - use-pycodestyle: true - use-flake8: true + use-pylint: false + use-pycodestyle: false + use-flake8: false use-black: true - use-mypy: true - use-isort: true - extra-pylint-options: --disable=F0401 - extra-pycodestyle-options: --max-line-length=88 --ignore="W503" - extra-mypy-options: --no-implicit-optional - extra-flake8-options: --max-line-length=88 + use-mypy: false + use-isort: false From 56c2fb259f5c164ef4a1ed84135f4efc1ded6f8f Mon Sep 17 00:00:00 2001 From: Tetsuo Koyama Date: Sat, 18 Jul 2020 05:37:02 +0900 Subject: [PATCH 08/11] :arrow_up: .github/workflows/pythonpackage.yml --- .github/workflows/pythonpackage.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pythonpackage.yml b/.github/workflows/pythonpackage.yml index 87a7aee9..b1287128 100644 --- a/.github/workflows/pythonpackage.yml +++ b/.github/workflows/pythonpackage.yml @@ -1,4 +1,4 @@ -# This workflow will install Python dependencies, run tests and lint with a variety of Python versions +# This workflow will run lint # For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions name: Python package on: From de05c37b7938a489d9e3202b4bb152ac83e545f6 Mon Sep 17 00:00:00 2001 From: Tetsuo Koyama Date: Fri, 17 Jul 2020 21:02:04 +0000 Subject: [PATCH 09/11] :new: black in Makefile --- Makefile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 6ada3de4..e6bbe19c 100644 --- a/Makefile +++ b/Makefile @@ -1,12 +1,17 @@ # Simple makefile to simplify repetitive build env management tasks under posix +BLACK_DIRS ?= ./pyvistaqt/ CODESPELL_DIRS ?= ./ CODESPELL_SKIP ?= "*.pyc,*.txt,*.gif,*.png,*.jpg,*.ply,*.vtk,*.vti,*.js,*.html,*.doctree,*.ttf,*.woff,*.woff2,*.eot,*.mp4,*.inv,*.pickle,*.ipynb,flycheck*,./.git/*,./.hypothesis/*,*.yml,./docs/_build/*,./docs/images/*,./dist/*,./.ci/*" CODESPELL_IGNORE ?= "ignore_words.txt" all: doctest -doctest: codespell pydocstyle +doctest: black codespell pydocstyle + +black: + @echo "Running black" + @black $(BLACK_DIRS) codespell: @echo "Running codespell" From 7f80239699d3beff954efa0bce93dd42d426d70d Mon Sep 17 00:00:00 2001 From: Tetsuo Koyama Date: Fri, 17 Jul 2020 21:10:51 +0000 Subject: [PATCH 10/11] :wastebasket: remove from doctest --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index e6bbe19c..bed8f366 100644 --- a/Makefile +++ b/Makefile @@ -7,7 +7,7 @@ CODESPELL_IGNORE ?= "ignore_words.txt" all: doctest -doctest: black codespell pydocstyle +doctest: codespell pydocstyle black: @echo "Running black" From 002b0583196d681a54da2b2bec1c9b4752c30ba7 Mon Sep 17 00:00:00 2001 From: Tetsuo Koyama Date: Sat, 18 Jul 2020 18:18:24 +0000 Subject: [PATCH 11/11] :recycle: commit for retry CI