Skip to content

Commit df5f987

Browse files
Update to include new DetailLevel parameter.
1 parent adb44c4 commit df5f987

File tree

6 files changed

+1937
-141
lines changed

6 files changed

+1937
-141
lines changed

docs/musicdiff.html

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ <h1 class="modulename">
7575
<span class="kn">import</span> <span class="nn">music21</span> <span class="k">as</span> <span class="nn">m21</span>
7676

7777
<span class="kn">from</span> <span class="nn">musicdiff.m21utils</span> <span class="kn">import</span> <span class="n">M21Utils</span>
78+
<span class="kn">from</span> <span class="nn">musicdiff.m21utils</span> <span class="kn">import</span> <span class="n">DetailLevel</span>
7879
<span class="kn">from</span> <span class="nn">musicdiff.annotation</span> <span class="kn">import</span> <span class="n">AnnScore</span>
7980
<span class="kn">from</span> <span class="nn">musicdiff.comparison</span> <span class="kn">import</span> <span class="n">Comparison</span>
8081
<span class="kn">from</span> <span class="nn">musicdiff.visualization</span> <span class="kn">import</span> <span class="n">Visualization</span>
@@ -103,6 +104,7 @@ <h1 class="modulename">
103104
<span class="n">out_path2</span><span class="p">:</span> <span class="n">Union</span><span class="p">[</span><span class="nb">str</span><span class="p">,</span> <span class="n">Path</span><span class="p">]</span> <span class="o">=</span> <span class="kc">None</span><span class="p">,</span>
104105
<span class="n">force_parse</span><span class="p">:</span> <span class="nb">bool</span> <span class="o">=</span> <span class="kc">True</span><span class="p">,</span>
105106
<span class="n">visualize_diffs</span><span class="p">:</span> <span class="nb">bool</span> <span class="o">=</span> <span class="kc">True</span><span class="p">,</span>
107+
<span class="n">detail</span><span class="p">:</span> <span class="n">DetailLevel</span> <span class="o">=</span> <span class="n">DetailLevel</span><span class="o">.</span><span class="n">Default</span>
106108
<span class="p">)</span> <span class="o">-&gt;</span> <span class="nb">int</span><span class="p">:</span>
107109
<span class="sd">&#39;&#39;&#39;</span>
108110
<span class="sd"> Compare two musical scores and optionally save/display the differences as two marked-up</span>
@@ -127,6 +129,9 @@ <h1 class="modulename">
127129
<span class="sd"> visualize_diffs (bool): Whether or not to render diffs as marked up PDFs. If False,</span>
128130
<span class="sd"> the only result of the call will be the return value (the number of differences).</span>
129131
<span class="sd"> (default is True)</span>
132+
<span class="sd"> detail (DetailLevel): What level of detail to use during the diff. Can be</span>
133+
<span class="sd"> GeneralNotesOnly, AllObjects, AllObjectsWithStyle or Default (Default is</span>
134+
<span class="sd"> currently equivalent to AllObjects).</span>
130135

131136
<span class="sd"> Returns:</span>
132137
<span class="sd"> int: The number of differences found (0 means the scores were identical, None means the diff failed)</span>
@@ -192,8 +197,8 @@ <h1 class="modulename">
192197
<span class="k">return</span> <span class="kc">None</span>
193198

194199
<span class="c1"># scan each score, producing an annotated wrapper</span>
195-
<span class="n">annotated_score1</span><span class="p">:</span> <span class="n">AnnScore</span> <span class="o">=</span> <span class="n">AnnScore</span><span class="p">(</span><span class="n">score1</span><span class="p">)</span>
196-
<span class="n">annotated_score2</span><span class="p">:</span> <span class="n">AnnScore</span> <span class="o">=</span> <span class="n">AnnScore</span><span class="p">(</span><span class="n">score2</span><span class="p">)</span>
200+
<span class="n">annotated_score1</span><span class="p">:</span> <span class="n">AnnScore</span> <span class="o">=</span> <span class="n">AnnScore</span><span class="p">(</span><span class="n">score1</span><span class="p">,</span> <span class="n">detail</span><span class="p">)</span>
201+
<span class="n">annotated_score2</span><span class="p">:</span> <span class="n">AnnScore</span> <span class="o">=</span> <span class="n">AnnScore</span><span class="p">(</span><span class="n">score2</span><span class="p">,</span> <span class="n">detail</span><span class="p">)</span>
197202

198203
<span class="n">diff_list</span><span class="p">:</span> <span class="n">List</span> <span class="o">=</span> <span class="kc">None</span>
199204
<span class="n">_cost</span><span class="p">:</span> <span class="nb">int</span> <span class="o">=</span> <span class="kc">None</span>
@@ -230,7 +235,8 @@ <h1 class="modulename">
230235
out_path1: Union[str, pathlib.Path] = None,
231236
out_path2: Union[str, pathlib.Path] = None,
232237
force_parse: bool = True,
233-
visualize_diffs: bool = True
238+
visualize_diffs: bool = True,
239+
detail: <a href="#m21utils.DetailLevel">musicdiff.m21utils.DetailLevel</a> = &lt;DetailLevel.AllObjects: 2&gt;
234240
) -&gt; int</span>:
235241
</div>
236242

@@ -242,6 +248,7 @@ <h1 class="modulename">
242248
<span class="n">out_path2</span><span class="p">:</span> <span class="n">Union</span><span class="p">[</span><span class="nb">str</span><span class="p">,</span> <span class="n">Path</span><span class="p">]</span> <span class="o">=</span> <span class="kc">None</span><span class="p">,</span>
243249
<span class="n">force_parse</span><span class="p">:</span> <span class="nb">bool</span> <span class="o">=</span> <span class="kc">True</span><span class="p">,</span>
244250
<span class="n">visualize_diffs</span><span class="p">:</span> <span class="nb">bool</span> <span class="o">=</span> <span class="kc">True</span><span class="p">,</span>
251+
<span class="n">detail</span><span class="p">:</span> <span class="n">DetailLevel</span> <span class="o">=</span> <span class="n">DetailLevel</span><span class="o">.</span><span class="n">Default</span>
245252
<span class="p">)</span> <span class="o">-&gt;</span> <span class="nb">int</span><span class="p">:</span>
246253
<span class="sd">&#39;&#39;&#39;</span>
247254
<span class="sd"> Compare two musical scores and optionally save/display the differences as two marked-up</span>
@@ -266,6 +273,9 @@ <h1 class="modulename">
266273
<span class="sd"> visualize_diffs (bool): Whether or not to render diffs as marked up PDFs. If False,</span>
267274
<span class="sd"> the only result of the call will be the return value (the number of differences).</span>
268275
<span class="sd"> (default is True)</span>
276+
<span class="sd"> detail (DetailLevel): What level of detail to use during the diff. Can be</span>
277+
<span class="sd"> GeneralNotesOnly, AllObjects, AllObjectsWithStyle or Default (Default is</span>
278+
<span class="sd"> currently equivalent to AllObjects).</span>
269279

270280
<span class="sd"> Returns:</span>
271281
<span class="sd"> int: The number of differences found (0 means the scores were identical, None means the diff failed)</span>
@@ -331,8 +341,8 @@ <h1 class="modulename">
331341
<span class="k">return</span> <span class="kc">None</span>
332342

333343
<span class="c1"># scan each score, producing an annotated wrapper</span>
334-
<span class="n">annotated_score1</span><span class="p">:</span> <span class="n">AnnScore</span> <span class="o">=</span> <span class="n">AnnScore</span><span class="p">(</span><span class="n">score1</span><span class="p">)</span>
335-
<span class="n">annotated_score2</span><span class="p">:</span> <span class="n">AnnScore</span> <span class="o">=</span> <span class="n">AnnScore</span><span class="p">(</span><span class="n">score2</span><span class="p">)</span>
344+
<span class="n">annotated_score1</span><span class="p">:</span> <span class="n">AnnScore</span> <span class="o">=</span> <span class="n">AnnScore</span><span class="p">(</span><span class="n">score1</span><span class="p">,</span> <span class="n">detail</span><span class="p">)</span>
345+
<span class="n">annotated_score2</span><span class="p">:</span> <span class="n">AnnScore</span> <span class="o">=</span> <span class="n">AnnScore</span><span class="p">(</span><span class="n">score2</span><span class="p">,</span> <span class="n">detail</span><span class="p">)</span>
336346

337347
<span class="n">diff_list</span><span class="p">:</span> <span class="n">List</span> <span class="o">=</span> <span class="kc">None</span>
338348
<span class="n">_cost</span><span class="p">:</span> <span class="nb">int</span> <span class="o">=</span> <span class="kc">None</span>
@@ -381,6 +391,9 @@ <h6 id="args">Args</h6>
381391
<li><strong>visualize_diffs (bool):</strong> Whether or not to render diffs as marked up PDFs. If False,
382392
the only result of the call will be the return value (the number of differences).
383393
(default is True)</li>
394+
<li><strong>detail (DetailLevel):</strong> What level of detail to use during the diff. Can be
395+
GeneralNotesOnly, AllObjects, AllObjectsWithStyle or Default (Default is
396+
currently equivalent to AllObjects).</li>
384397
</ul>
385398

386399
<h6 id="returns">Returns</h6>

0 commit comments

Comments
 (0)