Skip to content

Commit

Permalink
Bump version to 1.0.3
Browse files Browse the repository at this point in the history
  • Loading branch information
salu133445 committed Jan 9, 2021
1 parent bafb3cf commit 8dbc19b
Show file tree
Hide file tree
Showing 12 changed files with 133 additions and 137 deletions.
126 changes: 67 additions & 59 deletions docs/_modules/pypianoroll/inputs.html

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions docs/_modules/pypianoroll/multitrack.html
Original file line number Diff line number Diff line change
Expand Up @@ -502,6 +502,8 @@ <h1>Source code for pypianoroll.multitrack</h1><div class="highlight"><pre>
<span class="sd"> &quot;&quot;&quot;</span>
<span class="k">for</span> <span class="n">track</span> <span class="ow">in</span> <span class="bp">self</span><span class="o">.</span><span class="n">tracks</span><span class="p">:</span>
<span class="n">time</span><span class="p">,</span> <span class="n">pitch</span> <span class="o">=</span> <span class="n">track</span><span class="o">.</span><span class="n">pianoroll</span><span class="o">.</span><span class="n">nonzero</span><span class="p">()</span>
<span class="k">if</span> <span class="nb">len</span><span class="p">(</span><span class="n">time</span><span class="p">)</span> <span class="o">&lt;</span> <span class="mi">1</span><span class="p">:</span>
<span class="k">continue</span>
<span class="k">if</span> <span class="n">track</span><span class="o">.</span><span class="n">pianoroll</span><span class="o">.</span><span class="n">dtype</span> <span class="o">==</span> <span class="n">np</span><span class="o">.</span><span class="n">bool_</span><span class="p">:</span>
<span class="n">value</span> <span class="o">=</span> <span class="mi">1</span>
<span class="k">else</span><span class="p">:</span>
Expand Down
23 changes: 11 additions & 12 deletions docs/_modules/pypianoroll/outputs.html
Original file line number Diff line number Diff line change
Expand Up @@ -259,14 +259,6 @@ <h1>Source code for pypianoroll.outputs</h1><div class="highlight"><pre>
<span class="p">)</span> <span class="o">-&gt;</span> <span class="n">PrettyMIDI</span><span class="p">:</span>
<span class="sd">&quot;&quot;&quot;Return a Multitrack object as a PrettyMIDI object.</span>

<span class="sd"> Notes</span>
<span class="sd"> -----</span>
<span class="sd"> - Tempo changes are not supported.</span>
<span class="sd"> - The velocities of the converted piano rolls will be clipped to</span>
<span class="sd"> [0, 127].</span>
<span class="sd"> - Adjacent nonzero values of the same pitch will be considered</span>
<span class="sd"> a single note with their mean as its velocity.</span>

<span class="sd"> Parameters</span>
<span class="sd"> ----------</span>
<span class="sd"> default_tempo : int</span>
Expand All @@ -281,13 +273,20 @@ <h1>Source code for pypianoroll.outputs</h1><div class="highlight"><pre>
<span class="sd"> :class:`pretty_midi.PrettyMIDI`</span>
<span class="sd"> Converted PrettyMIDI object.</span>

<span class="sd"> Notes</span>
<span class="sd"> -----</span>
<span class="sd"> - Tempo changes are not supported.</span>
<span class="sd"> - Time signature changes are not supported.</span>
<span class="sd"> - The velocities of the converted piano rolls will be clipped to</span>
<span class="sd"> [0, 127].</span>
<span class="sd"> - Adjacent nonzero values of the same pitch will be considered</span>
<span class="sd"> a single note with their mean as its velocity.</span>

<span class="sd"> &quot;&quot;&quot;</span>
<span class="c1"># TODO: Add downbeat support -&gt; time signature change events</span>
<span class="c1"># TODO: Add tempo support -&gt; tempo change events</span>
<span class="k">if</span> <span class="n">default_tempo</span> <span class="ow">is</span> <span class="ow">not</span> <span class="kc">None</span><span class="p">:</span>
<span class="n">tempo</span> <span class="o">=</span> <span class="n">default_tempo</span>
<span class="k">elif</span> <span class="n">multitrack</span><span class="o">.</span><span class="n">tempo</span><span class="p">:</span>
<span class="n">tempo</span> <span class="o">=</span> <span class="n">multitrack</span><span class="o">.</span><span class="n">tempo</span><span class="p">[</span><span class="mi">0</span><span class="p">]</span>
<span class="k">elif</span> <span class="n">multitrack</span><span class="o">.</span><span class="n">tempo</span> <span class="ow">is</span> <span class="ow">not</span> <span class="kc">None</span><span class="p">:</span>
<span class="n">tempo</span> <span class="o">=</span> <span class="nb">float</span><span class="p">(</span><span class="n">multitrack</span><span class="o">.</span><span class="n">tempo</span><span class="p">[</span><span class="mi">0</span><span class="p">])</span>
<span class="k">else</span><span class="p">:</span>
<span class="n">tempo</span> <span class="o">=</span> <span class="n">DEFAULT_TEMPO</span>

Expand Down
12 changes: 5 additions & 7 deletions docs/_modules/pypianoroll/visualization.html
Original file line number Diff line number Diff line change
Expand Up @@ -519,6 +519,9 @@ <h1>Source code for pypianoroll.visualization</h1><div class="highlight"><pre>
<span class="sa">f</span><span class="s2">&quot;</span><span class="si">{</span><span class="n">track_label</span><span class="si">}</span><span class="s2">.&quot;</span>
<span class="p">)</span>

<span class="k">if</span> <span class="n">axs</span> <span class="ow">is</span> <span class="ow">not</span> <span class="kc">None</span> <span class="ow">and</span> <span class="ow">not</span> <span class="nb">isinstance</span><span class="p">(</span><span class="n">axs</span><span class="p">,</span> <span class="nb">list</span><span class="p">):</span>
<span class="n">axs</span> <span class="o">=</span> <span class="nb">list</span><span class="p">(</span><span class="n">axs</span><span class="p">)</span>

<span class="c1"># Set default color maps</span>
<span class="k">if</span> <span class="n">cmaps</span> <span class="ow">is</span> <span class="kc">None</span><span class="p">:</span>
<span class="k">if</span> <span class="n">mode</span> <span class="o">==</span> <span class="s2">&quot;separate&quot;</span><span class="p">:</span>
Expand All @@ -540,8 +543,6 @@ <h1>Source code for pypianoroll.visualization</h1><div class="highlight"><pre>
<span class="k">else</span><span class="p">:</span>
<span class="n">fig</span><span class="p">,</span> <span class="n">ax</span> <span class="o">=</span> <span class="n">plt</span><span class="o">.</span><span class="n">subplots</span><span class="p">()</span>
<span class="n">axs</span> <span class="o">=</span> <span class="p">[</span><span class="n">ax</span><span class="p">]</span>
<span class="k">elif</span> <span class="ow">not</span> <span class="nb">isinstance</span><span class="p">(</span><span class="n">axs</span><span class="p">,</span> <span class="nb">list</span><span class="p">):</span>
<span class="n">axs</span> <span class="o">=</span> <span class="nb">list</span><span class="p">(</span><span class="n">axs</span><span class="p">)</span>

<span class="k">for</span> <span class="n">idx</span><span class="p">,</span> <span class="n">track</span> <span class="ow">in</span> <span class="nb">enumerate</span><span class="p">(</span><span class="n">multitrack</span><span class="o">.</span><span class="n">tracks</span><span class="p">):</span>
<span class="n">now_xticklabel</span> <span class="o">=</span> <span class="n">xticklabel</span> <span class="k">if</span> <span class="n">idx</span> <span class="o">&lt;</span> <span class="n">n_tracks</span> <span class="k">else</span> <span class="kc">False</span>
Expand Down Expand Up @@ -577,8 +578,7 @@ <h1>Source code for pypianoroll.visualization</h1><div class="highlight"><pre>
<span class="k">if</span> <span class="n">axs</span> <span class="ow">is</span> <span class="kc">None</span><span class="p">:</span>
<span class="n">fig</span><span class="p">,</span> <span class="n">ax</span> <span class="o">=</span> <span class="n">plt</span><span class="o">.</span><span class="n">subplots</span><span class="p">()</span>
<span class="n">axs</span> <span class="o">=</span> <span class="p">[</span><span class="n">ax</span><span class="p">]</span>
<span class="k">elif</span> <span class="ow">not</span> <span class="nb">isinstance</span><span class="p">(</span><span class="n">axs</span><span class="p">,</span> <span class="nb">list</span><span class="p">):</span>
<span class="n">axs</span> <span class="o">=</span> <span class="nb">list</span><span class="p">(</span><span class="n">axs</span><span class="p">)</span>

<span class="n">stacked</span> <span class="o">=</span> <span class="n">multitrack</span><span class="o">.</span><span class="n">stack</span><span class="p">()</span>

<span class="n">colormap</span> <span class="o">=</span> <span class="n">matplotlib</span><span class="o">.</span><span class="n">cm</span><span class="o">.</span><span class="n">get_cmap</span><span class="p">(</span><span class="n">cmaps</span><span class="p">[</span><span class="mi">0</span><span class="p">])</span>
Expand Down Expand Up @@ -632,8 +632,6 @@ <h1>Source code for pypianoroll.visualization</h1><div class="highlight"><pre>
<span class="k">if</span> <span class="n">axs</span> <span class="ow">is</span> <span class="kc">None</span><span class="p">:</span>
<span class="n">fig</span><span class="p">,</span> <span class="n">axs_</span> <span class="o">=</span> <span class="n">plt</span><span class="o">.</span><span class="n">subplots</span><span class="p">(</span><span class="mi">2</span><span class="p">,</span> <span class="n">sharex</span><span class="o">=</span><span class="kc">True</span><span class="p">,</span> <span class="n">sharey</span><span class="o">=</span><span class="kc">True</span><span class="p">)</span>
<span class="n">axs</span> <span class="o">=</span> <span class="n">axs_</span><span class="o">.</span><span class="n">tolist</span><span class="p">()</span>
<span class="k">elif</span> <span class="ow">not</span> <span class="nb">isinstance</span><span class="p">(</span><span class="n">axs</span><span class="p">,</span> <span class="nb">list</span><span class="p">):</span>
<span class="n">axs</span> <span class="o">=</span> <span class="nb">list</span><span class="p">(</span><span class="n">axs</span><span class="p">)</span>

<span class="n">plot_pianoroll</span><span class="p">(</span>
<span class="n">axs</span><span class="p">[</span><span class="mi">0</span><span class="p">],</span>
Expand Down Expand Up @@ -686,7 +684,7 @@ <h1>Source code for pypianoroll.visualization</h1><div class="highlight"><pre>
<span class="sa">f</span><span class="s2">&quot;</span><span class="si">{</span><span class="n">mode</span><span class="si">}</span><span class="s2">.&quot;</span>
<span class="p">)</span>

<span class="k">return</span> <span class="n">axs</span></div>
<span class="k">return</span> <span class="n">axs</span> <span class="c1"># type: ignore</span></div>
</pre></div>

</div>
Expand Down
Loading

0 comments on commit 8dbc19b

Please sign in to comment.