modusa 0.3.63__py3-none-any.whl → 0.3.65__py3-none-any.whl

modusa/tools/plotter.py

@@ -43,14 +43,14 @@ class Fig:
 	of annotations, events.
 	"""
 	
-	def __init__(self, arrangement="asm", xlim=None):
+	def __init__(self, arrangement="asm", xlim=None, width=16):
 		
 		self._xlim = xlim
 		self._curr_row_idx = 1 # Starting from 1 because row 0 is reserved for reference subplot
 		self._curr_color_idx = 0 # So that we have different color across all the subplots to avoid legend confusion
 		
 		# Subplot setup
-		self._fig, self._axs = self._generate_subplots(arrangement) # This will fill in the all the above variables
+		self._fig, self._axs = self._generate_subplots(arrangement, width) # This will fill in the all the above variables
 		
 		
 	def _get_curr_row(self):
@@ -96,12 +96,13 @@ class Fig:
 			return [x[0] - dx / 2, x[-1] + dx / 2, y[-1] + dy / 2, y[0] - dy / 2]
 	
 	
-	def _generate_subplots(self, arrangement):
+	def _generate_subplots(self, arrangement, width):
 		"""
 		Generate subplots based on the configuration.
 		"""
 		
 		xlim = self._xlim
+		fig_width = width
 		
 		n_aux_sp = arrangement.count("a")
 		n_signal_sp = arrangement.count("s")
@@ -126,7 +127,7 @@ class Fig:
 		fig_height = height["r"] + (n_aux_sp * height["a"]) + (n_signal_sp * height["s"]) + (n_matrix_sp * height["m"])
 		
 		# Create figure and axs
-		fig, axs = plt.subplots(n_sp, 2, figsize=(16, fig_height), height_ratios=height_ratios, width_ratios=[1, cbar_width])
+		fig, axs = plt.subplots(n_sp, 2, figsize=(fig_width, fig_height), height_ratios=height_ratios, width_ratios=[1, cbar_width])
 		
 		for i, char in enumerate(arrangement): # For each of the subplots, we modify the layout accordingly
 			if char == "r":
@@ -156,7 +157,7 @@ class Fig:
 		
 		return fig, axs
 	
-	def add_signal(self, y, x=None, c=None, ls=None, lw=None, m=None, ms=3, label=None, ylabel=None, ylim=None, ax=None):
+	def add_signal(self, y, x=None, c=None, ls=None, lw=None, m=None, ms=3, label=None, ylabel=None, ylim=None, yticks=None, yticklabels=None, xticks=None, xticklabels=None, ax=None):
 		"""
 		Add signal to the figure.
 			
@@ -192,6 +193,14 @@ class Fig:
 		ylim: tuple
 			- y-lim for the plot.
 			- Default: None
+		yticks: Arraylike
+			- Positions at which to place y-axis ticks.
+		yticklabels : list of str, optional
+			- Labels corresponding to `yticks`. Must be the same length as `yticks`.
+		xticks: Arraylike
+			- Positions at which to place x-axis ticks.
+		xticklabels : list of str, optional
+			- Labels corresponding to `xticks`. Must be the same length as `xticks`.
 		ax: int
 			- Which specific axis to plot (1, 2, 3, ...)
 			- None
@@ -203,17 +212,32 @@ class Fig:
 		
 		curr_row = self._get_curr_row() if ax is None else self._axs[ax]
 		
-		if x is None: x = np.arange(y.size)
+		if x is None: 
+			x = np.arange(y.size)
 		
-		if c is None: c = self._get_new_color()
+		if c is None: 
+			c = self._get_new_color()
 		
 		curr_row[0].plot(x, y, color=c, linestyle=ls, linewidth=lw, marker=m, markersize=ms, label=label)
 		
-		if ylabel is not None: curr_row[0].set_ylabel(ylabel)
+		if ylabel is not None: 
+			curr_row[0].set_ylabel(ylabel)
+		
+		if ylim is not None: 
+			curr_row[0].set_ylim(ylim)
 		
-		if ylim is not None: curr_row[0].set_ylim(ylim)
+		if yticks is not None:
+			curr_row[0].set_yticks(yticks)
+			if yticklabels is not None:
+				curr_row[0].set_yticklabels(yticklabels)
+				
+		if xticks is not None:
+			curr_row[0].set_xticks(xticks)
+			if xticklabels is not None:
+				curr_row[0].set_xticklabels(xticklabels)
+				
 		
-	def add_matrix(self, M, y=None, x=None, c="gray_r", o="upper", label=None, ylabel=None, ylim=None, cbar=True, ax=None):
+	def add_matrix(self, M, y=None, x=None, c="gray_r", o="upper", label=None, ylabel=None, ylim=None, yticks=None, yticklabels=None, xticks=None, xticklabels=None, cbar=True, ax=None):
 		"""
 		Add matrix to the figure.
 			
@@ -242,6 +266,14 @@ class Fig:
 		ylim: tuple
 			- y-lim for the plot.
 			- Default: None
+		yticks: Arraylike
+			- Positions at which to place y-axis ticks.
+		yticklabels : list of str, optional
+			- Labels corresponding to `yticks`. Must be the same length as `yticks`.
+		xticks: Arraylike
+			- Positions at which to place x-axis ticks.
+		xticklabels : list of str, optional
+			- Labels corresponding to `xticks`. Must be the same length as `xticks`.
 		cbar: bool
 			- Show colorbar
 			- Default: True
@@ -274,6 +306,16 @@ class Fig:
 			cbar = plt.colorbar(im, cax=curr_row[1])
 			if label is not None:
 				cbar.set_label(label, labelpad=5)
+		
+		if yticks is not None:
+			curr_row[0].set_yticks(yticks)
+			if yticklabels is not None:
+				curr_row[0].set_yticklabels(yticklabels)
+				
+		if xticks is not None:
+			curr_row[0].set_xticks(xticks)
+			if xticklabels is not None:
+				curr_row[0].set_xticklabels(xticklabels)
 				
 				
 	def add_events(self, events, c=None, ls=None, lw=None, label=None, ax=None):
@@ -325,7 +367,7 @@ class Fig:
 				else:
 					curr_row[0].axvline(x=event, color=c, linestyle=ls, linewidth=lw)
 					
-	def add_annotation(self, ann, label=None, patterns=None, ax=None, ylim=(0, 1)):
+	def add_annotation(self, ann, label=None, patterns=None, ax=None, ylim=(0, 1), text_loc="middle"):
 		"""
 		Add annotation to the figure.
 		
@@ -348,6 +390,9 @@ class Fig:
 		ylim: tuple[number, number]
 			- Y-limit for the annotation.
 			- Default: (0, 1)
+		text_loc: str
+			- Location of text relative to the box. (b for bottom, m for middle, t for top)
+			- Default: "middle"
 		Returns
 		-------
 		None
@@ -373,6 +418,14 @@ class Fig:
 					
 		colors = plt.rcParams['axes.prop_cycle'].by_key()['color']
 		
+		# Text Location
+		if text_loc == "b": 
+			text_yloc = ylim[0] + 0.1 * (ylim[1] - ylim[0])
+		elif text_loc == "t":
+			text_yloc = ylim[1] - 0.1 * (ylim[1] - ylim[0])
+		else:
+			text_yloc = (ylim[1] + ylim[0]) / 2
+		
 		for i, (start, end, tag, group) in enumerate(ann_copy):
 			# We make sure that we only plot annotation that are within the x range of the current view
 			if xlim is not None:
@@ -382,6 +435,7 @@ class Fig:
 				# Clip boundaries to xlim
 				start = max(start, xlim[0])
 				end = min(end, xlim[1])
+			
 				
 				if group is not None:
 					box_color = colors[group]
@@ -393,7 +447,7 @@ class Fig:
 				curr_row[0].add_patch(rect)
 				
 				text_obj = curr_row[0].text(
-					(start + end) / 2, (ylim[1] + ylim[0]) / 2, tag,
+					(start + end) / 2, text_yloc, tag,
 					ha='center', va='center',
 					fontsize=10, color="black", fontweight='bold', zorder=10, clip_on=True
 				)
@@ -410,7 +464,7 @@ class Fig:
 				curr_row[0].add_patch(rect)
 				
 				text_obj = curr_row[0].text(
-					(start + end) / 2, (ylim[1] + ylim[0]) / 2, tag,
+					(start + end) / 2, text_yloc, tag,
 					ha='center', va='center',
 					fontsize=10, color="black", fontweight='bold', zorder=10, clip_on=True
 				)

{modusa-0.3.63.dist-info → modusa-0.3.65.dist-info}/METADATA

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

{modusa-0.3.63.dist-info → modusa-0.3.65.dist-info}/RECORD

@@ -1,7 +1,7 @@
-modusa-0.3.63.dist-info/METADATA,sha256=tfaSBaX_xBshoc5yyA3hN2zSOWxJ4URB3Dce_Mjd5pE,1436
-modusa-0.3.63.dist-info/WHEEL,sha256=9P2ygRxDrTJz3gsagc0Z96ukrxjr-LFBGOgv3AuKlCA,90
-modusa-0.3.63.dist-info/entry_points.txt,sha256=fmKpleVXj6CdaBVL14WoEy6xx7JQCs85jvzwTi3lePM,73
-modusa-0.3.63.dist-info/licenses/LICENSE.md,sha256=JTaXAjx5awk76VArKCx5dUW8vmLEWsL_ZlR7-umaHbA,1078
+modusa-0.3.65.dist-info/METADATA,sha256=Qk9jra_1KDD-nWaTPhQQp0jZh7_DVx1H-p-DenRis5I,1436
+modusa-0.3.65.dist-info/WHEEL,sha256=9P2ygRxDrTJz3gsagc0Z96ukrxjr-LFBGOgv3AuKlCA,90
+modusa-0.3.65.dist-info/entry_points.txt,sha256=fmKpleVXj6CdaBVL14WoEy6xx7JQCs85jvzwTi3lePM,73
+modusa-0.3.65.dist-info/licenses/LICENSE.md,sha256=JTaXAjx5awk76VArKCx5dUW8vmLEWsL_ZlR7-umaHbA,1078
 modusa/.DS_Store,sha256=_gm6qJREwfMi8dE7n5S89_RG46u5t3xHyD-smNhtNoM,6148
 modusa/__init__.py,sha256=RMIKAZZ27w1oh2UFMJvZQtQ-SluIQsac_3mSK_LaM30,277
 modusa/config.py,sha256=bTqK4t00FZqERVITrxW_q284aDDJAa9aMSfFknfR-oU,280
@@ -50,7 +50,7 @@ modusa/tools/audio_player.py,sha256=GP04TWW4jBwQBjANkfR_cJtEy7cIhvbu8RTwnf9hD6E,
 modusa/tools/audio_recorder.py,sha256=d2fVt0Sd2tlBdb2WlUs60K4N23zuxM3KUpQqX0ifPi8,2769
 modusa/tools/base.py,sha256=C0ESJ0mIfjjRlAkRbSetNtMoOfS6IrHBjexRp3l_Mh4,1293
 modusa/tools/math_ops.py,sha256=ZZ7U4DgqT7cOeE7_Lzi_Qq-48WYfwR9_osbZwTmE9eg,8690
-modusa/tools/plotter.py,sha256=S2kIUvyZ1NvhLjEClNV09PyfzZd6fOjaZ8-7NLqSlCw,18076
+modusa/tools/plotter.py,sha256=cNXnT8UMOyAC0sSVDCPWERqKx6MBWvs5ERf6zvY9BX4,19886
 modusa/tools/youtube_downloader.py,sha256=hB_X8-7nOHXOlxg6vv3wyhBLoAsWyomrULP6_uCQL7s,1698
 modusa/utils/.DS_Store,sha256=nLXMwF7QJNuglLI_Gk74F7vl5Dyus2Wd74Mgowijmdo,6148
 modusa/utils/__init__.py,sha256=1oLL20yLB1GL9IbFiZD8OReDqiCpFr-yetIR6x1cNkI,23
@@ -59,4 +59,4 @@ modusa/utils/excp.py,sha256=L9vhaGjKpv9viJYdmC9n5ndmk2GVbUBuFyZyhAQZmWY,906
 modusa/utils/logger.py,sha256=K0rsnObeNKCxlNeSnVnJeRhgfmob6riB2uyU7h3dDmA,571
 modusa/utils/np_func_cat.py,sha256=TyIFgRc6bARRMDnZxlVURO5Z0I-GWhxRONYyIv-Vwxs,1007
 modusa/utils/plot.py,sha256=s_vNdxvKfwxEngvJPgrF1PcmxZNnNaaXPViHWjyjJ-c,5335
-modusa-0.3.63.dist-info/RECORD,,
+modusa-0.3.65.dist-info/RECORD,,