icplot 0.1.2__tar.gz → 0.1.3__tar.gz

{icplot-0.1.2/src/icplot.egg-info → icplot-0.1.3}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: icplot
-Version: 0.1.2
+Version: 0.1.3
 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.2 → icplot-0.1.3}/pyproject.toml

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

{icplot-0.1.2 → icplot-0.1.3}/src/icplot/graph/axis.py

@@ -29,6 +29,7 @@ class PlotAxis(BaseModel, frozen=True):
 
     label: str = ""
     ticks: Range | None = None
+    scale: str = "linear"
 
     @property
     def resolved_ticks(self) -> list:

{icplot-0.1.2 → icplot-0.1.3}/src/icplot/graph/generator.py

@@ -45,23 +45,24 @@ def make_plots(
 
             # Use a user-provided 'point_func' to get the series 'x, y' points
             # from the results, given a 'x_attr, y_attr' pair
-            points = [point_func(r, config.x_attr, y_attr) for r in label_results].sort(
-                key=lambda x: x[0]
+            all_points = [point_func(r, config.x_attr, y_attr) for r in label_results]
+            points = sorted(
+                [x for x in all_points if x is not None], key=lambda x: x[0]
             )
-            x, y = zip(*points)
+            x, y = [list(xy) for xy in zip(*points)]
 
             if label in config.colormap:
                 series.append(
                     LinePlotSeries(
                         x=x,
                         y=y,
-                        label=label,
+                        label=str(label),
                         highlight=True,
                         color=config.colormap[label],
                     )
                 )
             else:
-                series.append(LinePlotSeries(x=x, y=y, label=label))
+                series.append(LinePlotSeries(x=x, y=y, label=str(label)))
         plots.append(plot_template.copy(update={"name": y_attr, "series": series}))
     return plots
 

{icplot-0.1.2 → icplot-0.1.3}/src/icplot/graph/matplotlib.py

@@ -26,10 +26,15 @@ class MatplotlibColorMap(ColorMap):
 def _set_decorations(axs, plot: Plot):
     ax = axs[0]
     if plot.legend.lower() != "none":
-        ax.legend(loc=plot.legend)
+        lines = []
+        for axis in axs:
+            for line in axis.lines:
+                lines.append(line)
+        ax.legend(handles=lines, loc=plot.legend)
     if plot.x_axis.label:
         ax.set_xlabel(plot.x_axis.label)
     for idx, y_axis in enumerate(plot.y_axes):
+        axs[idx].set_yscale(y_axis.scale)
         if y_axis.label:
             axs[idx].set_ylabel(y_axis.label)
         if y_axis.ticks:
@@ -47,7 +52,7 @@ def _plot_line(axs, series: LinePlotSeries, color: Color | None):
         ax = axs[1]
 
     if color:
-        render_color: list | None = series.color.as_list()
+        render_color: list | None = color.as_list()
     else:
         render_color = None
 

{icplot-0.1.2 → icplot-0.1.3/src/icplot.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: icplot
-Version: 0.1.2
+Version: 0.1.3
 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