modusa 0.3.4.dev1__py3-none-any.whl → 0.3.4.dev2__py3-none-any.whl

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, show_stem=False):
+def plot1d(*args, ann=None, events=None, xlim=None, ylim=None, xlabel=None, ylabel=None, title=None, legend=None, fmt=None, show_grid=False, show_stem=False):
 		"""
 		Plots a 1D signal using matplotlib.
 
@@ -72,6 +72,9 @@ def plot1d(*args, ann=None, events=None, xlim=None, ylim=None, xlabel=None, ylab
 		legend : list[str] | None
 			- List of legend labels corresponding to each signal if plotting multiple lines.
 			- Default: None
+		fmt: list[str] | None
+			- linefmt for different line plots.
+			- Default: None
 		show_grid: bool
 			- If you want to show the grid.
 			- Default: False
@@ -90,15 +93,19 @@ def plot1d(*args, ann=None, events=None, xlim=None, ylim=None, xlabel=None, ylab
 				raise ValueError(f"1D signal needs to have max 2 arrays (y, x) or simply (y, )")
 			
 		if isinstance(legend, str): legend = (legend, )
-		
 		if legend is not None:
 			if len(legend) < len(args):
-				raise ValueError(f"Legend should be provided for each signal.")
+				raise ValueError(f"`legend` should be provided for each signal.")
+		
+		if isinstance(fmt, str): fmt = [fmt]
+		if fmt is not None:
+			if len(fmt) < len(args):
+				raise ValueError(f"`fmt` should be provided for each signal.")
+
+		colors = plt.get_cmap('tab10').colors
 
 		fig = plt.figure(figsize=(16, 2))
 		gs = gridspec.GridSpec(2, 1, height_ratios=[0.2, 1])
-			
-		colors = plt.get_cmap('tab10').colors
 		
 		signal_ax = fig.add_subplot(gs[1, 0])
 		annotation_ax = fig.add_subplot(gs[0, 0], sharex=signal_ax)
@@ -109,7 +116,6 @@ def plot1d(*args, ann=None, events=None, xlim=None, ylim=None, xlabel=None, ylab
 		
 		if ylim is not None:
 			signal_ax.set_ylim(ylim)
-		
 			
 		# Add signal plot
 		for i, signal in enumerate(args):
@@ -123,7 +129,10 @@ def plot1d(*args, ann=None, events=None, xlim=None, ylim=None, xlabel=None, ylab
 						stemlines.set_color(colors[i])
 						baseline.set_color("k")
 					else:
-						signal_ax.plot(x, y, color=colors[i], label=legend[i])
+						if fmt is not None:
+							signal_ax.plot(x, y, fmt[i], markersize=4, label=legend[i])
+						else:
+							signal_ax.plot(x, y, color=colors[i], label=legend[i])
 				else:
 					if show_stem is True:
 						markerline, stemlines, baseline = signal_ax.stem(x, y)
@@ -131,7 +140,10 @@ def plot1d(*args, ann=None, events=None, xlim=None, ylim=None, xlabel=None, ylab
 						stemlines.set_color(colors[i])
 						baseline.set_color("k")
 					else:
-						signal_ax.plot(x, y, color=colors[i])
+						if fmt is not None:
+							signal_ax.plot(x, y, fmt[i], markersize=4)
+						else:
+							signal_ax.plot(x, y, color=colors[i])
 						
 			elif len(signal) == 2:
 				y, x = signal[0], signal[1]
@@ -142,7 +154,10 @@ def plot1d(*args, ann=None, events=None, xlim=None, ylim=None, xlabel=None, ylab
 						stemlines.set_color(colors[i])
 						baseline.set_color("k")
 					else:
-						signal_ax.plot(x, y, color=colors[i], label=legend[i])
+						if fmt is not None:
+							signal_ax.plot(x, y, fmt[i], markersize=4, label=legend[i])
+						else:
+							signal_ax.plot(x, y, color=colors[i], label=legend[i])
 				else:
 					if show_stem is True:
 						markerline, stemlines, baseline = signal_ax.stem(x, y)
@@ -150,7 +165,11 @@ def plot1d(*args, ann=None, events=None, xlim=None, ylim=None, xlabel=None, ylab
 						stemlines.set_color(colors[i])
 						baseline.set_color("k")
 					else:
-						signal_ax.plot(x, y, color=colors[i])
+						if fmt is not None:
+							signal_ax.plot(x, y, fmt[i], markersize=4)
+						else:
+							signal_ax.plot(x, y, color=colors[i])
+							
 		
 		# Add annotations
 		if ann is not None:

{modusa-0.3.4.dev1.dist-info → modusa-0.3.4.dev2.dist-info}/METADATA

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

{modusa-0.3.4.dev1.dist-info → modusa-0.3.4.dev2.dist-info}/RECORD

@@ -1,7 +1,7 @@
-modusa-0.3.4.dev1.dist-info/METADATA,sha256=iBr5dj4iTZe0wWwlSKVMFqM5Cx9FrUEEAdkt7_QgwTo,1373
-modusa-0.3.4.dev1.dist-info/WHEEL,sha256=9P2ygRxDrTJz3gsagc0Z96ukrxjr-LFBGOgv3AuKlCA,90
-modusa-0.3.4.dev1.dist-info/entry_points.txt,sha256=fmKpleVXj6CdaBVL14WoEy6xx7JQCs85jvzwTi3lePM,73
-modusa-0.3.4.dev1.dist-info/licenses/LICENSE.md,sha256=JTaXAjx5awk76VArKCx5dUW8vmLEWsL_ZlR7-umaHbA,1078
+modusa-0.3.4.dev2.dist-info/METADATA,sha256=_m94ejVuu9MWxNCx_EftQuKBnLBYaQoIRU505siP2LU,1373
+modusa-0.3.4.dev2.dist-info/WHEEL,sha256=9P2ygRxDrTJz3gsagc0Z96ukrxjr-LFBGOgv3AuKlCA,90
+modusa-0.3.4.dev2.dist-info/entry_points.txt,sha256=fmKpleVXj6CdaBVL14WoEy6xx7JQCs85jvzwTi3lePM,73
+modusa-0.3.4.dev2.dist-info/licenses/LICENSE.md,sha256=JTaXAjx5awk76VArKCx5dUW8vmLEWsL_ZlR7-umaHbA,1078
 modusa/.DS_Store,sha256=_gm6qJREwfMi8dE7n5S89_RG46u5t3xHyD-smNhtNoM,6148
 modusa/__init__.py,sha256=uq6kORFFAODiCMGmOLWO0shE8-dVFWf5gmV8wxekmnk,280
 modusa/config.py,sha256=bTqK4t00FZqERVITrxW_q284aDDJAa9aMSfFknfR-oU,280
@@ -47,7 +47,7 @@ modusa/tools/audio_loader.py,sha256=DrCzq0pdiQrUDIG-deLJGcu8EaylO5yRtwT4lr8WSf8,
 modusa/tools/audio_player.py,sha256=GP04TWW4jBwQBjANkfR_cJtEy7cIhvbu8RTwnf9hD6E,2817
 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=KQ94DhZj5ZJr7OhlUslRmtJ938S5ZCDsY0iXrY5QIyc,17656
+modusa/tools/plotter.py,sha256=mBJTPjOkwchGlJ-9KhNDLdADNIfkdKGpIfKfjwzzDus,18298
 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
@@ -56,4 +56,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.4.dev1.dist-info/RECORD,,
+modusa-0.3.4.dev2.dist-info/RECORD,,