WIP: Improve plot legend

Author: dreinsch

notebooks/mesonic-dev-timeline-plot.ipynb

@@ -20,16 +20,6 @@
     "%autoreload 2"
    ]
   },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "1b446b60",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "%matplotlib widget"
-   ]
-  },
   {
    "cell_type": "code",
    "execution_count": null,
@@ -54,6 +44,18 @@
     "import numpy as np"
    ]
   },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "32724ee3",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "%matplotlib inline\n",
+    "plt.rcParams['figure.figsize'] = [8, 2]\n",
+    "plt.rcParams['figure.dpi'] = 100"
+   ]
+  },
   {
    "cell_type": "code",
    "execution_count": null,
@@ -105,11 +107,12 @@
    "source": [
     "context.clear() \n",
     "with context.at(0.3):\n",
-    "    s2.start(freq=300, amp=0.1)\n",
+    "    s2.start(freq=300, amp=0.1, pan=1)\n",
     "for t in range(4,10):\n",
     "    with context.at(t/10):  \n",
     "        s2.freq = 100 * t\n",
     "        s2.amp += 0.1\n",
+    "        s2.pan = -1 * s2.pan.value\n",
     "with context.at((t+1)/10): \n",
     "    s2.stop()\n",
     "\n",
@@ -168,7 +171,8 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "context.timeline.plot_new(offset=\"amp\", width=\"amp\")\n",
+    "plt.figure()\n",
+    "context.timeline.plot_new(offset=\"amp\", width=\"freq\")\n",
     "#plt.semilogy()"
    ]
   },
@@ -182,6 +186,37 @@
     "context.timeline.plot_new(offset=\"freq\", width=\"pan\")"
    ]
   },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "168d3682",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "context.timeline.plot_new(offset=\"pan\", width=\"freq\")"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "c07e2905",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "def safe_amp_to_db(amp):\n",
+    "    return np.where(amp > 0, pam.amp_to_db(amp), -90)\n"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "8efdb710",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "safe_amp_to_db(-1)"
+   ]
+  },
   {
    "cell_type": "code",
    "execution_count": null,

src/mesonic/timeline.py

@@ -573,7 +573,7 @@ def plot_new(self, offset="freq", width="amp", scale=None):
         # "color": None,
         # "y_offset": 0,
 
-        fig = plt.figure(figsize=(8, 2))
+        fig = plt.figure()  # figsize=(8, 2)
         ax = fig.add_subplot(1, 1, 1)
         cmap = plt.get_cmap("Set1")
 
@@ -608,7 +608,6 @@ def warp_width(value, scale=None, width_min=2, width_max=4):
                 ret = pam.linlin(
                     value, widths.min(), widths.max(), width_min, width_max
                 )
-                print(value, ret)
                 return ret
 
             offsets = warp_offset(offsets)
@@ -637,20 +636,30 @@ def warp_width(value, scale=None, width_min=2, width_max=4):
             y_min = min(offsets.min(), y_min)
             y_max = max(offsets.max(), y_max)
 
-        x_lim = (x_max - x_min) * 0.01
-        ax.set_xlim(x_min - x_lim, x_max + x_lim)
+        # x_lim = (x_max - x_min) * 0.01
+        # ax.set_xlim(x_min - x_lim, x_max + x_lim)
         # y_lim = (y_max - y_min) * 0.1
         # axes.set_ylim(y_min - y_lim, y_max + y_lim)
 
+        MAX_LEGEND_NCOLS = 5
+
         # test
-        ax.legend(handles=patches, loc="best")
+        ax.legend(
+            handles=patches,
+            loc="lower left",
+            mode="expand",
+            bbox_to_anchor=(0.0, 1.02, 1.0, 0.102),
+            borderaxespad=0,
+            ncol=min(len(patches), MAX_LEGEND_NCOLS),
+        )
         ax.grid()
-        ax.set_title("Timeline")
         ax.set_xlabel("time [s]")
 
         if offset == "freq":
             ax.set_yscale("log")
             ax.set_ylabel("frequency [Hz]")
+
+            # TODO perhaps we also could want mel?
             secax = ax.secondary_yaxis(
                 location="right", functions=(pam.cps_to_midi, pam.midi_to_cps)
             )
@@ -664,22 +673,20 @@ def warp_width(value, scale=None, width_min=2, width_max=4):
             ax.set_ylabel("amplitude")
 
             def safe_amp_to_db(amp):
-                return pam.amp_to_db(amp) if amp > 0 else -90
+                return np.where(amp > 0, pam.amp_to_db(amp), -90)
 
             secax = ax.secondary_yaxis(
                 location="right", functions=(safe_amp_to_db, pam.db_to_amp)
             )
             secax.set_ylabel("level [dB]")
             secax.yaxis.set_major_locator(
-                ticker.MaxNLocator(nbins="auto", steps=[1, 2, 4, 5, 10], integer=True)
+                ticker.MaxNLocator(nbins="auto", steps=[1, 2, 4, 5, 10])
             )
             secax.yaxis.set_major_formatter(lambda x, pos: str(int(x)))
         else:
             ax.set_ylabel(offset)
 
-        ax.autoscale(enable=True, axis=True, tight=True)
-        # axes.margins(0.05)
-
+        ax.autoscale(enable=True)
         fig.tight_layout()
 
     # TODO Idea: convention to order the Synth Params by most probalbe usage