funcnodes-span 0.3.2__tar.gz → 0.3.4__tar.gz

{funcnodes_span-0.3.2 → funcnodes_span-0.3.4}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: funcnodes-span
-Version: 0.3.2
+Version: 0.3.4
 Summary: SPectral ANalysis (SPAN) for funcnodes
 License: MIT
 Author: Kourosh Rezaei

{funcnodes_span-0.3.2 → funcnodes_span-0.3.4}/funcnodes_span/__init__.py

@@ -7,7 +7,7 @@ from .baseline import BASELINE_NODE_SHELF as BASELINE
 from funcnodes_lmfit import NODE_SHELF as LMFIT_NODE_SHELF
 from .curves import CURVES_NODE_SHELF
 
-__version__ = "0.3.2"
+__version__ = "0.3.4"
 
 NODE_SHELF = fn.Shelf(
     name="Spectral Analysis",

{funcnodes_span-0.3.2 → funcnodes_span-0.3.4}/funcnodes_span/peak_analysis.py

@@ -329,7 +329,16 @@ def force_peak_finder(
     default_render_options={"data": {"src": "figure"}},
     outputs=[{"name": "figure"}],
 )
-def plot_peaks(x: np.array, y: np.array, peaks: List[PeakProperties]) -> go.Figure:
+def plot_peaks(
+    x: np.array,
+    y: np.array,
+    peaks: List[PeakProperties],
+    fill_rectangles: bool = True,
+    xaxis_title: str = "x",
+    yaxis_title: str = "y",
+    title: str = "",
+    show_legend: bool = True,
+) -> go.Figure:
     fig = go.Figure()
 
     # Set up line plot
@@ -353,16 +362,19 @@ def plot_peaks(x: np.array, y: np.array, peaks: List[PeakProperties]) -> go.Figu
                     peak.x_at_f_index,
                     peak.x_at_f_index,
                     peak.x_at_i_index,
+                    peak.x_at_i_index,
                 ],
-                y=[plot_y_min, plot_y_min, peak_height, peak_height],
-                fill="toself",
-                fillcolor=peaks_colors[index % len(peaks_colors)],
-                opacity=0.3,
-                line=dict(width=0),
+                y=[plot_y_min, plot_y_min, peak_height, peak_height, plot_y_min],
+                fill="toself" if fill_rectangles else None,
+                fillcolor=peaks_colors[index % len(peaks_colors)]
+                if fill_rectangles
+                else None,
+                opacity=0.3 if fill_rectangles else 1,
+                line=dict(width=0 if fill_rectangles else 2),
                 mode="lines",
                 name=f"Peak {peak.id}",
                 legendgroup=f"Peak {peak.id}",  # Group by Peak id
-                showlegend=True,
+                showlegend=show_legend,
             )
         )
         # Add an X marker at the exact peak position
@@ -390,14 +402,21 @@ def plot_peaks(x: np.array, y: np.array, peaks: List[PeakProperties]) -> go.Figu
                         dash="dash", color=peaks_colors[index % len(peaks_colors)]
                     ),
                     legendgroup=f"Peak {peak.id}",
+                    showlegend=show_legend,
                 ),
             )
 
     # Customize layout (axes labels and title can be added here if needed)
     fig.update_layout(
-        xaxis_title="x",
-        yaxis_title="y",
-        template="plotly_white",
+        xaxis_title=xaxis_title,
+        yaxis_title=yaxis_title,
+        title=title,
+        plot_bgcolor="white",
+        paper_bgcolor="white",
+        showlegend=show_legend,
+        font=dict(family="Arial", size=14),
+        xaxis=dict(title_font=dict(size=16), tickfont=dict(size=14)),
+        # yaxis=dict(title_font=dict(size=16), tickfont=dict(size=14), tickformat=".2e"),
     )
 
     return fig

{funcnodes_span-0.3.2 → funcnodes_span-0.3.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "funcnodes-span"
-version = "0.3.2"
+version = "0.3.4"
 description = "SPectral ANalysis (SPAN) for funcnodes"
 authors = ["Kourosh Rezaei <kouroshrezaei90@gmail.com>"]
 readme = "README.md"