Commit 74c0b4b1 authored by Sean Leavey's avatar Sean Leavey
Browse files

(BREAKING) Change grid zorder config key to a grid section, and add settings...

(BREAKING) Change grid zorder config key to a grid section, and add settings for transparency; display minor grid.
parent 9cb9d47f
...@@ -32,7 +32,12 @@ plot: ...@@ -32,7 +32,12 @@ plot:
sum_greyscale_cycle_start: 1 # black sum_greyscale_cycle_start: 1 # black
sum_greyscale_cycle_stop: 0.2 # light grey sum_greyscale_cycle_stop: 0.2 # light grey
sum_greyscale_cycle_count: 4 # number of steps sum_greyscale_cycle_count: 4 # number of steps
grid_zorder: 1
# Plot grid options.
grid:
zorder: 1
alpha_major: 1
alpha_minor: 0.3
# BodePlotter options. # BodePlotter options.
bode: bode:
......
...@@ -719,8 +719,13 @@ class BodePlotter(MplGroupPlotter): ...@@ -719,8 +719,13 @@ class BodePlotter(MplGroupPlotter):
ax1.set_ylabel(self.ylabel_mag) ax1.set_ylabel(self.ylabel_mag)
if self.ylabel_phase is not None: if self.ylabel_phase is not None:
ax2.set_ylabel(self.ylabel_phase) ax2.set_ylabel(self.ylabel_phase)
ax1.grid(zorder=CONF["plot"]["grid_zorder"])
ax2.grid(zorder=CONF["plot"]["grid_zorder"]) gridconf = CONF["plot"]["grid"]
ax1.grid(which="major", alpha=gridconf["alpha_major"], zorder=gridconf["zorder"])
ax1.grid(which="minor", alpha=gridconf["alpha_minor"], zorder=gridconf["zorder"])
ax2.grid(which="major", alpha=gridconf["alpha_major"], zorder=gridconf["zorder"])
ax2.grid(which="minor", alpha=gridconf["alpha_minor"], zorder=gridconf["zorder"])
# Magnitude and phase tick locators. # Magnitude and phase tick locators.
if self.scale_db: if self.scale_db:
ax1.yaxis.set_major_locator(MultipleLocator(base=self.db_tick_major_step)) ax1.yaxis.set_major_locator(MultipleLocator(base=self.db_tick_major_step))
...@@ -784,19 +789,23 @@ class SpectralDensityPlotter(MplGroupPlotter): ...@@ -784,19 +789,23 @@ class SpectralDensityPlotter(MplGroupPlotter):
def _create_figure(self): def _create_figure(self):
figure = super()._create_figure() figure = super()._create_figure()
axis = figure.add_subplot(111) ax = figure.add_subplot(111)
# Draw labels etc. # Draw labels etc.
if self.title is not None: if self.title is not None:
# Use ax1 since it's at the top. We could use figure.suptitle but this doesn't # Use ax1 since it's at the top. We could use figure.suptitle but this doesn't
# behave with tight_layout. # behave with tight_layout.
axis.set_title(self.title) ax.set_title(self.title)
if self.legend: if self.legend:
axis.legend(loc=self.legend_loc) ax.legend(loc=self.legend_loc)
if self.xlabel is not None: if self.xlabel is not None:
axis.set_xlabel(self.xlabel) ax.set_xlabel(self.xlabel)
if self.ylabel is not None: if self.ylabel is not None:
axis.set_ylabel(self.ylabel) ax.set_ylabel(self.ylabel)
axis.grid(zorder=CONF["plot"]["grid_zorder"])
gridconf = CONF["plot"]["grid"]
ax.grid(which="major", alpha=gridconf["alpha_major"], zorder=gridconf["zorder"])
ax.grid(which="minor", alpha=gridconf["alpha_minor"], zorder=gridconf["zorder"])
# Magnitude and phase tick locators. # Magnitude and phase tick locators.
return figure return figure
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment