modusa 0.3.56__tar.gz → 0.3.58__tar.gz

{modusa-0.3.56 → modusa-0.3.58}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: modusa
-Version: 0.3.56
+Version: 0.3.58
 Summary: A modular signal analysis python library.
 Author-Email: Ankit Anand <ankit0.anand0@gmail.com>
 License: MIT

{modusa-0.3.56 → modusa-0.3.58}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "modusa"
-version = "0.3.56"
+version = "0.3.58"
 description = "A modular signal analysis python library."
 authors = [
     { name = "Ankit Anand", email = "ankit0.anand0@gmail.com" },

{modusa-0.3.56 → modusa-0.3.58}/src/modusa/tools/plotter.py

@@ -12,8 +12,8 @@ import matplotlib.font_manager as fm
 import matplotlib.pyplot as plt
 import matplotlib.gridspec as gridspec
 from matplotlib.patches import Rectangle
-
 import numpy as np
+import fnmatch
 
 #===== Loading Devanagari font ========
 def _load_devanagari_font():
@@ -259,7 +259,6 @@ class Fig:
 		curr_row = self._get_curr_row() if ax is None else self._axs[ax]
 		
 		extent = self._calculate_extent(x, y, o)
-		print(extent)
 		
 		im = curr_row[0].imshow(M, aspect="auto", origin=o, cmap=c, extent=extent)
 		
@@ -326,7 +325,7 @@ class Fig:
 				else:
 					curr_row[0].axvline(x=event, color=c, linestyle=ls, linewidth=lw)
 					
-	def add_annotation(self, ann, label=None, ax=None):
+	def add_annotation(self, ann, label=None, patterns=None, ax=None):
 		"""
 		Add annotation to the figure.
 		
@@ -339,6 +338,10 @@ class Fig:
 			- Label for the annotation type.
 			- This will appear to the right of the aux plot.
 			- Default: None
+		patterns: list[str]
+			- Patterns to group annotations
+			- E.g., "*R" or "<tag>*" or ["A*", "*B"]
+			- All elements in a group will have same color.
 		ax: int
 			- Which specific axis to plot (1, 2, 3, ...)
 			- None
@@ -350,7 +353,24 @@ class Fig:
 		
 		xlim = self._xlim
 		
-		for i, (start, end, tag) in enumerate(ann):
+		if isinstance(patterns, str): patterns = [patterns]
+		
+		if patterns is not None:
+			for i, (start, end, tag) in enumerate(ann):
+				for j, pattern in enumerate(patterns):
+					if fnmatch.fnmatch(tag, pattern):
+						ann[i] = (start, end, tag, j)
+						break
+					else:
+						ann[i] = (start, end, tag, None)
+		else:
+			for i, (start, end, tag) in enumerate(ann):
+				ann[i] = (start, end, tag, None)
+					
+		colors = plt.rcParams['axes.prop_cycle'].by_key()['color']
+		print(ann)
+		
+		for i, (start, end, tag, group) in enumerate(ann):
 			# We make sure that we only plot annotation that are within the x range of the current view
 			if xlim is not None:
 				if start >= xlim[1] or end <= xlim[0]:
@@ -360,8 +380,10 @@ class Fig:
 				start = max(start, xlim[0])
 				end = min(end, xlim[1])
 				
-				box_colors = ["gray", "lightgray"] # Alternates color between two
-				box_color = box_colors[i % 2]
+				if group is not None:
+					box_color = colors[group]
+				else:
+					box_color = "lightgray"
 				
 				width = end - start
 				rect = Rectangle((start, 0), width, 1, facecolor=box_color, edgecolor="black", alpha=0.7)
@@ -375,8 +397,10 @@ class Fig:
 				
 				text_obj.set_clip_path(rect)
 			else:
-				box_colors = ["gray", "lightgray"] # Alternates color between two
-				box_color = box_colors[i % 2]
+				if group is not None:
+					box_color = colors[group]
+				else:
+					box_color = "lightgray"
 				
 				width = end - start
 				rect = Rectangle((start, 0), width, 1, facecolor=box_color, edgecolor="black", alpha=0.7)