modusa 0.3.29__tar.gz → 0.3.30__tar.gz

{modusa-0.3.29 → modusa-0.3.30}/PKG-INFO

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

{modusa-0.3.29 → modusa-0.3.30}/pyproject.toml

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

{modusa-0.3.29 → modusa-0.3.30}/src/modusa/tools/plotter.py

@@ -27,7 +27,7 @@ def _calculate_extent(x, y):
 	]
 
 #======== 1D ===========
-def plot1d(*args, ann=None, events=None, xlim=None, ylim=None, xlabel=None, ylabel=None, title=None, legend=None, show_grid=False):
+def plot1d(*args, ann=None, events=None, xlim=None, ylim=None, xlabel=None, ylabel=None, title=None, legend=None, show_grid=False, show_stem=False):
 		"""
 		Plots a 1D signal using matplotlib.
 
@@ -75,6 +75,9 @@ def plot1d(*args, ann=None, events=None, xlim=None, ylim=None, xlabel=None, ylab
 		show_grid: bool
 			- If you want to show the grid.
 			- Default: False
+		show_stem: bool:
+			- If you want stem plot.
+			- Default: False
 	
 		Returns
 		-------
@@ -114,15 +117,34 @@ def plot1d(*args, ann=None, events=None, xlim=None, ylim=None, xlabel=None, ylab
 				y = signal[0]
 				x = np.arange(y.size)
 				if legend is not None:
-					signal_ax.plot(x, y, label=legend[i])
+					if show_stem is True:
+						markerline, stemlines, baseline = signal_ax.stem(x, y, label=legend[i])
+						markerline.set_color(colors[i])
+						stemlines.set_color(colors[i])
+						baseline.set_color("k")
+					else:
+						signal_ax.plot(x, y, color=colors[i], label=legend[i])
 				else:
-					signal_ax.plot(x, y)
+					if show_stem is True:
+						markerline, stemlines, baseline = signal_ax.stem(x, y)
+						markerline.set_color(colors[i])
+						stemlines.set_color(colors[i])
+						baseline.set_color("k")
+					else:
+						signal_ax.plot(x, y, color=colors[i])
+						
 			elif len(signal) == 2:
 				y, x = signal[0], signal[1]
 				if legend is not None:
-					signal_ax.plot(x, y, label=legend[i])
+					if show_stem is True:
+						signal_ax.stem(x, y, linefmt=f"{colors[i]}-", markerfmt=f"{colors[i]}o", basefmt="k-", label=legend[i])
+					else:
+						signal_ax.plot(x, y, color=colors[i], label=legend[i])
 				else:
-					signal_ax.plot(x, y)
+					if show_stem is True:
+						signal_ax.stem(x, y, linefmt=f"{colors[i]}-", markerfmt=f"{colors[i]}o", basefmt="k-")
+					else:
+						signal_ax.plot(x, y, color=colors[i])
 		
 		# Add annotations
 		if ann is not None:
@@ -166,7 +188,7 @@ def plot1d(*args, ann=None, events=None, xlim=None, ylim=None, xlabel=None, ylab
 		# Add legend
 		if legend is not None:
 			handles, labels = signal_ax.get_legend_handles_labels()
-			fig.legend(handles, labels, loc='upper right', bbox_to_anchor=(0.9, 1.2), ncol=len(legend), frameon=False)
+			fig.legend(handles, labels, loc='upper right', bbox_to_anchor=(0.9, 1.2), ncol=len(legend), frameon=True)
 			
 		# Set title, labels
 		if title is not None:
@@ -463,11 +485,11 @@ def plot_dist(*args, ann=None, xlim=None, ylim=None, ylabel=None, xlabel=None, t
 		from scipy.stats import gaussian_kde
 	
 		if isinstance(legend, str):
-				legend = (legend, )
+			legend = (legend, )
 			
 		if legend is not None:
-				if len(legend) < len(args):
-						raise ValueError(f"Legend should be provided for each signal.")
+			if len(legend) < len(args):
+				raise ValueError(f"Legend should be provided for each signal.")
 					
 		# Create figure
 		fig = plt.figure(figsize=(16, 4))
@@ -480,28 +502,28 @@ def plot_dist(*args, ann=None, xlim=None, ylim=None, ylabel=None, xlabel=None, t
 	
 		# Set limits
 		if xlim is not None:
-				dist_ax.set_xlim(xlim)
+			dist_ax.set_xlim(xlim)
 			
 		if ylim is not None:
-				dist_ax.set_ylim(ylim)
+			dist_ax.set_ylim(ylim)
 			
 		# Add plot
 		for i, data in enumerate(args):
-				# Fit gaussian to the data
-				kde = gaussian_kde(data)
-			
-				# Create points to evaluate KDE
-				x = np.linspace(min(data), max(data), npoints)
-				y = kde(x)
-			
-				if legend is not None:
-						dist_ax.plot(x, y, color=colors[i], label=legend[i])
-						if show_hist is True:
-								dist_ax.hist(data, bins=bins, density=True, alpha=0.3, facecolor=colors[i], edgecolor='black', label=legend[i])
-				else:
-						dist_ax.plot(x, y, color=colors[i])
-						if show_hist is True:
-								dist_ax.hist(data, bins=bins, density=True, alpha=0.3, facecolor=colors[i], edgecolor='black')
+			# Fit gaussian to the data
+			kde = gaussian_kde(data)
+		
+			# Create points to evaluate KDE
+			x = np.linspace(np.min(data), np.max(data), npoints)
+			y = kde(x)
+		
+			if legend is not None:
+				dist_ax.plot(x, y, color=colors[i], label=legend[i])
+				if show_hist is True:
+					dist_ax.hist(data, bins=bins, density=True, alpha=0.3, facecolor=colors[i], edgecolor='black', label=legend[i])
+			else:
+				dist_ax.plot(x, y, color=colors[i])
+				if show_hist is True:
+					dist_ax.hist(data, bins=bins, density=True, alpha=0.3, facecolor=colors[i], edgecolor='black')
 							
 		# Add annotations
 		if ann is not None:
@@ -528,22 +550,22 @@ def plot_dist(*args, ann=None, xlim=None, ylim=None, ylabel=None, xlabel=None, t
 					
 		# Add legend
 		if legend is not None:
-				handles, labels = dist_ax.get_legend_handles_labels()
-				fig.legend(handles, labels, loc='upper right', bbox_to_anchor=(0.9, 1.1), ncol=len(legend), frameon=True)
+			handles, labels = dist_ax.get_legend_handles_labels()
+			fig.legend(handles, labels, loc='upper right', bbox_to_anchor=(0.9, 1.1), ncol=len(legend), frameon=True)
 			
 		# Set title, labels
 		if title is not None:
-				annotation_ax.set_title(title, pad=10, size=11)
+			annotation_ax.set_title(title, pad=10, size=11)
 		if xlabel is not None:
-				dist_ax.set_xlabel(xlabel)
+			dist_ax.set_xlabel(xlabel)
 		if ylabel is not None:
-				dist_ax.set_ylabel(ylabel)
+			dist_ax.set_ylabel(ylabel)
 			
 		# Remove the boundaries and ticks from annotation axis
 		if ann is not None:
-				annotation_ax.tick_params(left=False, bottom=False, labelleft=False, labelbottom=False)
+			annotation_ax.tick_params(left=False, bottom=False, labelleft=False, labelbottom=False)
 		else:
-				annotation_ax.axis("off")
+			annotation_ax.axis("off")
 			
 		fig.subplots_adjust(hspace=0.01, wspace=0.05)
 		plt.close()