Skip to content

Add support for passing 'ax' parameter in plotting function #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
alanpawlak wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add support for passing 'ax' parameter in plotting function #2

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 30 additions & 10 deletions src/sphstat/plotting.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
"""

import numpy as np
import matplotlib
from matplotlib import pyplot as plt

from .descriptives import mediandir, rotationmatrix, pointsonanellipse
Expand Down Expand Up @@ -70,7 +71,7 @@ def plotmapping(input: list):
return output


def plotdata(sample: dict, proj: str='mollweide', mflag: bool = False) -> bool:
def plotdata(sample: dict, proj: str='mollweide', mflag: bool = False, ax: matplotlib.axes.Axes=None) -> bool:
"""
Plot a sample represented in polar (colat, long) format in Mollweide projection

Expand All @@ -80,6 +81,8 @@ def plotdata(sample: dict, proj: str='mollweide', mflag: bool = False) -> bool:
:type proj: str
:param mflag: Flag to plot the median and the 95% cone of confidence
:type mflag: bool
:param ax: Axes to plot on
:type ax: matplotlib.axes.Axes
:return: bool (True)
"""
try:
Expand All @@ -92,8 +95,12 @@ def plotdata(sample: dict, proj: str='mollweide', mflag: bool = False) -> bool:
except AssertionError:
raise AssertionError('Unknown projection type!')

fig = plt.figure(figsize=(10, 5))
ax = fig.add_subplot(111, projection=proj)
if ax is None:
show_flag = True
fig = plt.figure(figsize=(10, 5))
ax = fig.add_subplot(111, projection=proj)
else:
show_flag = False

phis = plotmapping(sample['phis'])
ax.scatter(np.array(phis), np.pi / 2 - np.array(sample['tetas']), s=1.5 * plt.rcParams['lines.markersize'] ** 1.5,
Expand Down Expand Up @@ -139,11 +146,15 @@ def plotdata(sample: dict, proj: str='mollweide', mflag: bool = False) -> bool:
ax.set_ylabel("Colatitude [deg]")
ax.yaxis.label.set_fontsize(12)
ax.grid(True)
plt.show()

if show_flag:
plt.show()

return True


def plotdatalist(samplelist: list, labels: list=None, proj: str='mollweide', mflag: bool = False) -> bool:
def plotdatalist(samplelist: list, labels: list=None, proj: str='mollweide', mflag: bool = False,
ax: matplotlib.axes.Axes=None) -> bool:
"""
Superimposed plot of a list of samples

Expand All @@ -155,18 +166,24 @@ def plotdatalist(samplelist: list, labels: list=None, proj: str='mollweide', mfl
:type proj: str
:param mflag: Flag to plot the median and the 95% cone of confidence
:type mflag: bool
:param ax: Axes to plot on
:type ax: matplotlib.axes.Axes
:return: Return True when completed
:rtype: bool
"""

fig = plt.figure(figsize=(10, 5))
ax = fig.add_subplot(111, projection=proj)

try:
assert len(labels) == len(samplelist)
except AssertionError:
raise AssertionError('Number of labels should match the number of samples in samplelist')

if ax is None:
show_flag = True
fig = plt.figure(figsize=(10, 5))
ax = fig.add_subplot(111, projection=proj)
else:
show_flag = False

ind = -1
for sample in samplelist:
ind += 1
Expand Down Expand Up @@ -219,6 +236,9 @@ def plotdatalist(samplelist: list, labels: list=None, proj: str='mollweide', mfl
ax.set_ylabel('Colatitude [deg]')
ax.yaxis.label.set_fontsize(16)
ax.grid(True)
plt.legend(fontsize='large', loc=1)
plt.show()

if show_flag:
plt.legend(fontsize='large', loc=1)
plt.show()

return True