From b78b9e84aa3022a6d2d68d97bc8660ba06ba0ef3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20M=C3=BCller?= <38459088+jo-mueller@users.noreply.github.com> Date: Wed, 4 May 2022 11:33:43 +0200 Subject: [PATCH 1/4] Added separate class to handle figure properties --- src/napari_matplotlib/base.py | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/src/napari_matplotlib/base.py b/src/napari_matplotlib/base.py index 8bbdafcc..8d122555 100644 --- a/src/napari_matplotlib/base.py +++ b/src/napari_matplotlib/base.py @@ -5,6 +5,27 @@ __all__ = ["NapariMPLWidget"] +class MplCanvas(FigureCanvas): + """ + Defines the canvas of the matplotlib window + From https://github.com/haesleinhuepf/napari-workflow-inspector/blob/main/src/napari_workflow_inspector/_dock_widget.py + """ + def __init__(self): + self.fig = Figure() # create figure + self.axes = self.fig.add_subplot(111) # create subplot + + self.axes.spines['bottom'].set_color('white') + self.axes.spines['top'].set_color('white') + self.axes.spines['left'].set_color('white') + self.axes.spines['right'].set_color('white') + self.fig.patch.set_facecolor('#262930') + self.axes.set_facecolor('#262930') + self.axes.grid(which='major', linestyle='--', color='white', alpha=0.6) + self.axes.tick_params(axis='both', colors='white') + + FigureCanvas.__init__(self, self.fig) # initialize canvas + FigureCanvas.updateGeometry(self) + class NapariMPLWidget(QWidget): """ @@ -31,7 +52,7 @@ def __init__(self, napari_viewer: napari.viewer.Viewer): self.viewer = napari_viewer self.figure = Figure(figsize=(5, 3), tight_layout=True) - self.canvas = FigureCanvas(self.figure) + self.canvas = MplCanvas() self.toolbar = NavigationToolbar2QT(self.canvas, self) self.axes = self.canvas.figure.subplots() From 533462eb13e2bc52b9988ecd318ba33450720665 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20M=C3=BCller?= <38459088+jo-mueller@users.noreply.github.com> Date: Wed, 4 May 2022 11:51:36 +0200 Subject: [PATCH 2/4] Replace axes by different subplots instance --- src/napari_matplotlib/base.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/napari_matplotlib/base.py b/src/napari_matplotlib/base.py index 8d122555..582ed52a 100644 --- a/src/napari_matplotlib/base.py +++ b/src/napari_matplotlib/base.py @@ -54,7 +54,7 @@ def __init__(self, napari_viewer: napari.viewer.Viewer): self.figure = Figure(figsize=(5, 3), tight_layout=True) self.canvas = MplCanvas() self.toolbar = NavigationToolbar2QT(self.canvas, self) - self.axes = self.canvas.figure.subplots() + self.axes = self.canvas.axes self.setLayout(QVBoxLayout()) self.layout().addWidget(self.toolbar) From 7e11d4e9f36b5a9cfaa5fa94882c45e3354f7ffa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20M=C3=BCller?= <38459088+jo-mueller@users.noreply.github.com> Date: Thu, 5 May 2022 06:09:19 +0200 Subject: [PATCH 3/4] Removed separate MPL Canvas class --- src/napari_matplotlib/base.py | 26 +++----------------------- 1 file changed, 3 insertions(+), 23 deletions(-) diff --git a/src/napari_matplotlib/base.py b/src/napari_matplotlib/base.py index 582ed52a..7c667daf 100644 --- a/src/napari_matplotlib/base.py +++ b/src/napari_matplotlib/base.py @@ -5,27 +5,6 @@ __all__ = ["NapariMPLWidget"] -class MplCanvas(FigureCanvas): - """ - Defines the canvas of the matplotlib window - From https://github.com/haesleinhuepf/napari-workflow-inspector/blob/main/src/napari_workflow_inspector/_dock_widget.py - """ - def __init__(self): - self.fig = Figure() # create figure - self.axes = self.fig.add_subplot(111) # create subplot - - self.axes.spines['bottom'].set_color('white') - self.axes.spines['top'].set_color('white') - self.axes.spines['left'].set_color('white') - self.axes.spines['right'].set_color('white') - self.fig.patch.set_facecolor('#262930') - self.axes.set_facecolor('#262930') - self.axes.grid(which='major', linestyle='--', color='white', alpha=0.6) - self.axes.tick_params(axis='both', colors='white') - - FigureCanvas.__init__(self, self.fig) # initialize canvas - FigureCanvas.updateGeometry(self) - class NapariMPLWidget(QWidget): """ @@ -52,9 +31,10 @@ def __init__(self, napari_viewer: napari.viewer.Viewer): self.viewer = napari_viewer self.figure = Figure(figsize=(5, 3), tight_layout=True) - self.canvas = MplCanvas() + self.canvas = FigureCanvas() + self.canvas.figure.patch.set_facecolor('#262930') self.toolbar = NavigationToolbar2QT(self.canvas, self) - self.axes = self.canvas.axes + self.axes = self.canvas.figure.subplots() self.setLayout(QVBoxLayout()) self.layout().addWidget(self.toolbar) From 010a0fc9e755fce5811531693264242dcef87cd2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20M=C3=BCller?= <38459088+jo-mueller@users.noreply.github.com> Date: Thu, 5 May 2022 06:09:37 +0200 Subject: [PATCH 4/4] edited rcParams --- src/napari_matplotlib/base.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/napari_matplotlib/base.py b/src/napari_matplotlib/base.py index 7c667daf..7aad20ff 100644 --- a/src/napari_matplotlib/base.py +++ b/src/napari_matplotlib/base.py @@ -3,6 +3,15 @@ from matplotlib.figure import Figure from qtpy.QtWidgets import QVBoxLayout, QWidget +import matplotlib as mpl +mpl.rc('axes', edgecolor='white') +mpl.rc('axes', facecolor = '#262930') +mpl.rc('axes', labelcolor = 'white') +mpl.rc('savefig', facecolor = '#262930') +mpl.rc('text', color = 'white') + +mpl.rc('xtick', color = 'white') +mpl.rc('ytick', color = 'white') __all__ = ["NapariMPLWidget"]