funcnodes-span 0.2.3__tar.gz → 0.2.5__tar.gz

{funcnodes_span-0.2.3 → funcnodes_span-0.2.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: funcnodes-span
-Version: 0.2.3
+Version: 0.2.5
 Summary: 
 Home-page: https://linkdlab.de/
 Author: Kourosh Rezaei

{funcnodes_span-0.2.3 → funcnodes_span-0.2.5}/funcnodes_span/__init__.py

@@ -5,7 +5,7 @@ from .smoothing import SMOOTH_NODE_SHELF as SMOOTH
 from .peak_analysis import PEAKS_NODE_SHELF as PEAK
 from .baseline import BASELINE_NODE_SHELF as BASELINE
 
-__version__ = "0.2.3"
+__version__ = "0.2.5"
 
 NODE_SHELF = fn.Shelf(
     name="Spectral Analysis",

{funcnodes_span-0.2.3 → funcnodes_span-0.2.5}/funcnodes_span/peak_analysis.py

@@ -659,19 +659,17 @@ def plot_peaks(x: np.array, y: np.array, peaks_dict: List[PeakProperties]) -> go
 
     # Add rectangle shapes for each peak
     for index, peak in enumerate(peaks_dict):
-        initial_idx = peak.i_index
-        ending_idx = peak.f_index
         peak_height = peak.y_at_index
-        plot_y_min = min(y[initial_idx], y[ending_idx])
+        plot_y_min = min(peak.y_at_i_index, peak.y_at_f_index)
 
         # Create a scatter trace that simulates a rectangle
         fig.add_trace(
             go.Scatter(
                 x=[
-                    x[initial_idx],
-                    x[ending_idx],
-                    x[ending_idx],
-                    x[initial_idx],
+                    peak.x_at_i_index,
+                    peak.x_at_f_index,
+                    peak.x_at_f_index,
+                    peak.x_at_i_index,
                 ],
                 y=[plot_y_min, plot_y_min, peak_height, peak_height],
                 fill="toself",
@@ -680,6 +678,19 @@ def plot_peaks(x: np.array, y: np.array, peaks_dict: List[PeakProperties]) -> go
                 line=dict(width=0),
                 mode="lines",
                 name=f"Peak {peak.id}",
+                legendgroup=f"Peak {peak.id}",  # Group by Peak id
+                showlegend=True,
+            )
+        )
+        # Add an X marker at the exact peak position
+        fig.add_trace(
+            go.Scatter(
+                x=[peak.x_at_index],
+                y=[peak.y_at_index],
+                mode="markers",
+                marker=dict(symbol="x", size=10, color="black"),
+                legendgroup=f"Peak {peak.id}",  # Same group as rectangle
+                showlegend=False,
             )
         )
 

{funcnodes_span-0.2.3 → funcnodes_span-0.2.5}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "funcnodes-span"
-version = "0.2.3"
+version = "0.2.5"
 description = ""
 authors = ["Kourosh Rezaei <kouroshrezaei90@gmail.com>"]
 readme = "README.md"
@@ -26,6 +26,7 @@ pre-commit = "*"
 funcnodes-module = "*"
 pooch = "*"
 
+
 [build-system]
 requires = ["poetry-core"]
 build-backend = "poetry.core.masonry.api"