icplot 0.1.0__tar.gz → 0.1.1__tar.gz

{icplot-0.1.0/src/icplot.egg-info → icplot-0.1.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: icplot
-Version: 0.1.0
+Version: 0.1.1
 Summary: Utilities for generating plots and graphics for technical reports.
 Author-email: "James Grogan, Irish Centre for High End Computing" <james.grogan@ichec.ie>
 Project-URL: Repository, https://git.ichec.ie/performance/toolshed/icplot

{icplot-0.1.0 → icplot-0.1.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "icplot"
-version = "0.1.0"
+version = "0.1.1"
 authors = [
   { name="James Grogan, Irish Centre for High End Computing", email="james.grogan@ichec.ie" },
 ]

{icplot-0.1.0 → icplot-0.1.1}/src/icplot/graph/__init__.py

@@ -1,5 +1,6 @@
 from .plot import *  # NOQA
 from .series import *  # NOQA
+from .axis import *  # NOQA
 from .generator import plot_file
 
 __all__ = ["plot_file"]

{icplot-0.1.0 → icplot-0.1.1}/src/icplot/graph/matplotlib.py

@@ -23,27 +23,35 @@ class MatplotlibColorMap(ColorMap):
         super().__init__(label, mpl.colormaps[label])
 
 
-def _set_decorations(ax, plot: Plot):
-    ax.legend(loc="upper left")
+def _set_decorations(axs, plot: Plot):
+    ax = axs[0]
+    if plot.legend != "none":
+        ax.legend(loc=plot.legend)
     if plot.x_axis.label:
         ax.set_xlabel(plot.x_axis.label)
-    if plot.y_axis.label:
-        ax.set_ylabel(plot.y_axis.label)
+    for idx, y_axis in enumerate(plot.y_axes):
+        if y_axis.label:
+            axs[idx].set_ylabel(y_axis.label)
+        if y_axis.ticks:
+            axs[idx].set_yticks(y_axis.resolved_ticks)
     if plot.x_axis.ticks:
         ax.set_xticks(plot.x_axis.resolved_ticks)
-    if plot.y_axis.ticks:
-        ax.set_yticks(plot.y_axis.resolved_ticks)
     if plot.title:
         ax.set_title(plot.title)
 
 
-def _plot_line(ax, series: LinePlotSeries):
+def _plot_line(axs, series: LinePlotSeries):
+    if not series.position_right:
+        ax = axs[0]
+    else:
+        ax = axs[1]
     ax.plot(
         series.x,
         series.y,
         label=series.label,
         color=series.color.as_list(),
         marker=series.marker,
+        drawstyle=series.drawstyle,
     )
 
 
@@ -56,9 +64,10 @@ def _plot_image(ax, series: ImageSeries):
     ax.axis("off")
 
 
-def _plot_series(ax, series: PlotSeries):
+def _plot_series(axs, series: PlotSeries):
+    ax = axs[0]
     if series.series_type == "line":
-        _plot_line(ax, cast(LinePlotSeries, series))
+        _plot_line(axs, cast(LinePlotSeries, series))
     elif series.series_type == "scatter":
         _plot_scatter(ax, cast(ScatterPlotSeries, series))
     elif series.series_type == "image":
@@ -81,11 +90,14 @@ def render(
     apply_colors(cmap, plot)
 
     fig, ax = plt.subplots()
+    axs = [ax]
+    if len(plot.y_axes) > 1:
+        axs.append(ax.twinx())
 
     for series in plot.series:
-        _plot_series(ax, series)
+        _plot_series(axs, series)
 
-    _set_decorations(ax, plot)
+    _set_decorations(axs, plot)
 
     _render(fig, path)
 

{icplot-0.1.0 → icplot-0.1.1}/src/icplot/graph/plot.py

@@ -21,9 +21,10 @@ class Plot(BaseModel):
     legend_label: str = ""
     name: str = ""
     x_axis: PlotAxis = PlotAxis()
-    y_axis: PlotAxis = PlotAxis()
+    y_axes: list[PlotAxis] = [PlotAxis()]
     plot_type: str = ""
     series: list[PlotSeries] = []
+    legend: str = "upper left"
 
 
 class GridPlot(Plot):

{icplot-0.1.0 → icplot-0.1.1}/src/icplot/graph/series.py

@@ -8,12 +8,16 @@ from icplot.color import Color
 class PlotSeries(BaseModel):
     """
     A data series in a plot, such as a single line in a line-plot
+
+    :param position_right: allows the series to be plotted on the right y-axis.
+    :type position_right: bool, optional
     """
 
     label: str
     color: Color = Color()
     series_type: str = ""
     highlight: bool = False
+    position_right: bool = False
 
 
 class ImageSeries(PlotSeries):
@@ -29,12 +33,17 @@ class ImageSeries(PlotSeries):
 class LinePlotSeries(PlotSeries):
     """
     A plot series for line plots
+
+    :param drawstyle: Naming comes from matplotlib API, allows for various square plots,
+               default is a normal point to point line plot.
+    :type drawstyle: str, optional
     """
 
     x: list
     y: list
     marker: str = "o"
     series_type: str = "line"
+    drawstyle: str = "default"
 
 
 class ScatterPlotSeries(PlotSeries):

{icplot-0.1.0 → icplot-0.1.1/src/icplot.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: icplot
-Version: 0.1.0
+Version: 0.1.1
 Summary: Utilities for generating plots and graphics for technical reports.
 Author-email: "James Grogan, Irish Centre for High End Computing" <james.grogan@ichec.ie>
 Project-URL: Repository, https://git.ichec.ie/performance/toolshed/icplot

icplot-0.1.0/src/icplot/__init__.py

@@ -1,3 +0,0 @@
-from .convert import convert
-
-__all__ = ["convert"]