This commit is contained in:
Lucas Verney 2016-03-04 16:20:47 +01:00
parent cdb85bc23f
commit bdbac369c1
2 changed files with 1613 additions and 3 deletions

File diff suppressed because one or more lines are too long

View File

@ -36,6 +36,7 @@ class Figure():
""" """
def __init__(self, def __init__(self,
xlabel="", ylabel="", title="", xlabel="", ylabel="", title="",
xrange=None, yrange=None,
palette="hls", max_colors=10, palette="hls", max_colors=10,
legend=None, savepath=None, grid=None): legend=None, savepath=None, grid=None):
""" """
@ -44,6 +45,10 @@ class Figure():
:param xlabel: Label for the X axis (optional). :param xlabel: Label for the X axis (optional).
:param ylabel: Label for the Z axis (optional). :param ylabel: Label for the Z axis (optional).
:param title: Title of the figure (optional). :param title: Title of the figure (optional).
:param xrange: Range of the X axis (optional), as a tuple \
representing the interval.
:param yrange: Range of the Y axis (optional), as a tuple \
representing the interval.
:param palette: Color palette to use (optional). Defaults to a safe \ :param palette: Color palette to use (optional). Defaults to a safe \
palette with compatibility with colorblindness and black and \ palette with compatibility with colorblindness and black and \
white printing. white printing.
@ -65,9 +70,10 @@ class Figure():
No check for grid validity is being made. You can set it to \ No check for grid validity is being made. You can set it to \
``False`` to disable it completely. ``False`` to disable it completely.
.. note:: If you use group plotting, ``xlabel``, ``ylabel`` and \ .. note:: If you use group plotting, ``xlabel``, ``ylabel``, \
``legend`` will be set uniformly for every subplot. If you \ ``legend``, ``xrange``, ``yrange`` and ``zrange`` will be \
wish to set different properties for every subplots, you \ set uniformly for every subplot. If you wish to set \
different properties for every subplots, you \
should pass a dict for these properties, keys being the \ should pass a dict for these properties, keys being the \
group symbols and values being the value for each subplot. group symbols and values being the value for each subplot.
""" """
@ -75,6 +81,8 @@ class Figure():
self.xlabel = xlabel self.xlabel = xlabel
self.ylabel = ylabel self.ylabel = ylabel
self.title = title self.title = title
self.xrange = xrange
self.yrange = yrange
self.palette = palette self.palette = palette
self.max_colors = max_colors self.max_colors = max_colors
self.legend = legend self.legend = legend
@ -404,6 +412,28 @@ class Figure():
self._legend(axis, overload_legend=True) self._legend(axis, overload_legend=True)
else: else:
self._legend(axis) self._legend(axis)
# Set xrange
if isinstance(self.xrange, dict):
try:
if self.xrange[group_] is not None:
axis.set_xlim(*self.xrange[group_])
except KeyError:
# No entry for this axis in the dict, pass it
pass
else:
if self.xrange is not None:
axis.set_xlim(*self.xrange)
# Set yrange
if isinstance(self.yrange, dict):
try:
if self.yrange[group_] is not None:
axis.set_ylim(*self.yrange[group_])
except KeyError:
# No entry for this axis in the dict, pass it
pass
else:
if self.yrange is not None:
axis.set_ylim(*self.yrange)
def _render(self): def _render(self):
""" """