maialib 1.8.2__cp311-cp311-macosx_10_15_universal2.whl → 1.9.1__cp311-cp311-macosx_10_15_universal2.whl

maialib/maiacore/maiacore.pyi

@@ -50,10 +50,10 @@ class Chord:
     def __init__(self) -> None:
         ...
     @typing.overload
-    def __init__(self, notes: list[Note]) -> None:
+    def __init__(self, notes: list[Note], rhythmFigure: RhythmFigure = ...) -> None:
         ...
     @typing.overload
-    def __init__(self, pitches: list[str]) -> None:
+    def __init__(self, pitches: list[str], rhythmFigure: RhythmFigure = ...) -> None:
         ...
     def __ne__(self, arg0: Chord) -> bool:
         ...
@@ -295,8 +295,12 @@ class Chord:
         ...
     def isSorted(self) -> bool:
         ...
+    def isSus(self) -> bool:
+        ...
     def isTonal(self, model: typing.Callable[[Chord], bool] = None) -> bool:
         ...
+    def isWholeDiminishedChord(self) -> bool:
+        ...
     def print(self) -> None:
         ...
     def printStack(self) -> None:
@@ -427,7 +431,7 @@ class Helper:
     def freq2midiNote(freq: float, modelo: typing.Callable[[float], int] = None) -> tuple[int, int]:
         ...
     @staticmethod
-    def freq2pitch(freq: float, accType: str = '#') -> tuple[str, int]:
+    def freq2pitch(freq: float, accType: str = '') -> tuple[str, int]:
         ...
     @staticmethod
     def frequencies2cents(freq_A: float, freq_B: float) -> int:
@@ -466,6 +470,11 @@ class Helper:
     def noteType2ticks(noteType: str, divisionsPerQuarterNote: int = 256) -> int:
         ...
     @staticmethod
+    @typing.overload
+    def notes2Intervals(pitches: list[str], firstNoteAsReference: bool = False) -> list[Interval]:
+        ...
+    @staticmethod
+    @typing.overload
     def notes2Intervals(notes: list[Note], firstNoteAsReference: bool = False) -> list[Interval]:
         ...
     @staticmethod
@@ -1402,4 +1411,4 @@ C: ClefSign  # value = <ClefSign.C: 2>
 F: ClefSign  # value = <ClefSign.F: 1>
 G: ClefSign  # value = <ClefSign.G: 0>
 P: ClefSign  # value = <ClefSign.P: 3>
-__version__: str = '"1.8.2"'
+__version__: str = '"1.9.1"'

maialib/maiapy/plots.py

@@ -144,9 +144,9 @@ def _score2DataFrame(score: mc.Score, kwargs) -> Tuple[pd.DataFrame, str, str]:
                     notePitch = currentNote.getPitch()
 
                     aux = currentTimePosition + internalStaveCurrentTime
-                    noteStart = (aux / measureQuarterTimeAmount) + 1
-                    noteFinish = ((aux + noteDuration) /
-                                  measureQuarterTimeAmount) + 1
+                    noteStart = (aux / measureQuarterTimeAmount)
+                    noteFinish = (aux + noteDuration) / \
+                        measureQuarterTimeAmount
 
                     # This plotly timeline function requires the use of these 3 names below: 'Tasks', 'Start' and 'Finish'
                     noteData = {
@@ -285,8 +285,14 @@ def plotPianoRoll(score: mc.Score, **kwargs) -> Tuple[plotly.graph_objs._figure.
         d.x = df.delta.tolist()
 
     # Update plot layout
-    fig.update_xaxes(type='linear', autorange=True, showgrid=True,
-                     gridwidth=1, title="Measures")
+    fig.update_xaxes(
+        type='linear',
+        range=[1, None],  # Fixando limite inferior do eixo X em 1
+        showgrid=True,
+        gridwidth=1,
+        title="Measures"
+    )
+
     fig.update_yaxes(autorange=True, showgrid=True,
                      gridwidth=1, title='Pitch',
                      tickvals=[12, 24, 36, 48, 60, 72, 84, 96, 108, 120],
@@ -539,6 +545,17 @@ def plotScorePitchEnvelope(score: mc.Score, **kwargs) -> Tuple[plotly.graph_objs
     fig.update_layout(hovermode='x unified',
                       template="plotly_white", yaxis_showticksuffix="all")
 
+    fig.update_layout(
+        legend=dict(
+            orientation="h",          # Horizontal
+            yanchor="bottom",         # Ancorar a parte inferior da legenda
+            # Colocar a legenda abaixo do gráfico (ajuste conforme necessário)
+            y=-0.4,
+            xanchor="center",         # Centralizar horizontalmente
+            x=0.5                     # No meio do gráfico
+        )
+    )
+
     fig.add_shape(
         # Rectangle with reference to the plot
         type="rect",
@@ -634,10 +651,13 @@ def plotChordsNumberOfNotes(score: mc.Score, **kwargs) -> Tuple[plotly.graph_obj
     fig.update_xaxes(type='linear', autorange=True, showgrid=True,
                      gridwidth=1, title="Measures")
     fig.update_yaxes(autorange=True, showgrid=True,
-                     gridwidth=1, ticksuffix="  ", title="Number of Notes")
+                     gridwidth=1, ticksuffix="  ", title="Number of Notes", gridcolor='lightgray')
     fig.update_layout(title_x=0.5, font={
         "size": 14,
-    })
+    },
+        plot_bgcolor='white'
+    )
+
     fig.add_shape(
         # Rectangle with reference to the plot
         type="rect",

maialib/maiapy/sethares_dissonance.py

@@ -6,7 +6,9 @@ import plotly.graph_objects as go
 from maialib import maiacore as mc
 from typing import List, Tuple, Callable, Optional
 
-__all__ = ["plotSetharesDissonanceCurve", "plotScoreSetharesDissonance", "plotChordDyadsSetharesDissonanceHeatmap"]
+__all__ = ["plotSetharesDissonanceCurve", "plotScoreSetharesDissonance",
+           "plotChordDyadsSetharesDissonanceHeatmap"]
+
 
 def _dissmeasure(fvec: List[float], amp: List[float], model: str = 'min') -> float:
     """
@@ -27,7 +29,7 @@ def _dissmeasure(fvec: List[float], amp: List[float], model: str = 'min') -> flo
     freq_amp_dict = {}
     for f, a in zip(fr_sorted, am_sorted):
         freq_amp_dict[f] = freq_amp_dict.get(f, 0) + a
-    
+
     # Extract updated frequencies and amplitudes from the dictionary
     fr_sorted = np.array(list(freq_amp_dict.keys()))
     am_sorted = np.array(list(freq_amp_dict.values()))
@@ -64,6 +66,7 @@ def _dissmeasure(fvec: List[float], amp: List[float], model: str = 'min') -> flo
 
     return D, fr_pairs, am_pairs
 
+
 def plotSetharesDissonanceCurve(fundamentalFreq: float = 440, numPartials: int = 6, ratioLowLimit: float = 1.0, ratioHighLimit: float = 2.3, ratioStepIncrement: float = 0.001, amplCallback: Optional[Callable[[List[float]], List[float]]] = None) -> Tuple[go.Figure, pd.DataFrame]:
     """
     Compute the Sethares Dissonance Curve of a given base frequency
@@ -128,7 +131,8 @@ def plotSetharesDissonanceCurve(fundamentalFreq: float = 440, numPartials: int =
             tickvals=[n/d for n, d in filtered_intervals],
             ticktext=['{}/{}'.format(n, d) for n, d in filtered_intervals]
         ),
-        yaxis=dict(showticklabels=True)
+        yaxis=dict(showticklabels=True),
+        plot_bgcolor='white'
     )
 
     fig.add_shape(
@@ -276,8 +280,9 @@ def plotScoreSetharesDissonance(score: mc.Score, plotType='line', lineShape='lin
 
     return fig, df
 
+
 def plotChordDyadsSetharesDissonanceHeatmap(chord: mc.Chord, numPartialsPerNote: int = 6, useMinModel: bool = True, amplCallback: Optional[Callable[[
-                                    List[float]], List[float]]] = None, dissonanceThreshold: float = 0.1, dissonanceDecimalPoint: int  = 2) -> Tuple[plotly.graph_objs._figure.Figure, pd.DataFrame]:
+        List[float]], List[float]]] = None, dissonanceThreshold: float = 0.1, dissonanceDecimalPoint: int = 2) -> Tuple[plotly.graph_objs._figure.Figure, pd.DataFrame]:
     """Plot chord dyads Sethares dissonance heatmap
 
     Args:
@@ -304,28 +309,34 @@ def plotChordDyadsSetharesDissonanceHeatmap(chord: mc.Chord, numPartialsPerNote:
     >>> fig, df = plotChordDyadsSetharesDissonanceHeatmap(myChord)
     >>> fig.show()
     """
-    df = chord.getSetharesDyadsDataFrame(numPartialsPerNote=numPartialsPerNote, useMinModel=useMinModel, amplCallback=amplCallback)
+    df = chord.getSetharesDyadsDataFrame(
+        numPartialsPerNote=numPartialsPerNote, useMinModel=useMinModel, amplCallback=amplCallback)
     dfFiltered = df[df.dissonance > dissonanceThreshold]
-    
-    # Pivot the dataframe to create a matrix
-    matrix_df = dfFiltered.pivot(index='baseFreq', columns='targetFreq', values='dissonance')
+
+    # Pivot the dataframe to create a matrix with baseFreq on X and targetFreq on Y
+    matrix_df = dfFiltered.pivot(
+        index='targetFreq', columns='baseFreq', values='dissonance')
 
     # Create a heatmap using Plotly
-    fig = px.imshow(matrix_df, 
-                labels=dict(x="Target Frequency (Hz)", y="Base Frequency (Hz)", color="Dissonance"), color_continuous_scale='Inferno')
-    
+    fig = px.imshow(matrix_df,
+                    labels=dict(x="Base Frequency (Hz)",
+                                y="Target Frequency (Hz)", color="Dissonance"),
+                    color_continuous_scale='Inferno')
+
     # Extract unique frequencies for x and y ticks
-    x_ticks = sorted(matrix_df.columns.unique())
-    y_ticks = sorted(matrix_df.index.unique())
+    x_ticks = sorted(matrix_df.columns.unique())  # baseFreq
+    y_ticks = sorted(matrix_df.index.unique())    # targetFreq
 
     roundedXTicksValues = [round(num, 0) for num in x_ticks]
     roundedYTicksValues = [round(num, 0) for num in y_ticks]
 
-    # Update x and y ticks to only show unique frequencies and set log scale
-    fig.update_xaxes(type='log', tickvals=x_ticks, ticktext=roundedXTicksValues)
-    fig.update_yaxes(type='log', tickvals=y_ticks, ticktext=roundedYTicksValues)
+    fig.update_xaxes(type='linear', tickvals=x_ticks,
+                     ticktext=roundedXTicksValues)
+    fig.update_yaxes(type='linear', tickvals=y_ticks,
+                     ticktext=roundedYTicksValues, autorange=True)
 
     roundedDissonanceValue = round(df.dissonance.sum(), dissonanceDecimalPoint)
-    fig.update_layout(title=f'<b>Chord Dyads Sethares Dissonance Heatmap</b><br><i>Chord Dissonance={str(roundedDissonanceValue)}</i>', title_x=0.5)
+    fig.update_layout(
+        title=f'<b>Chord Dyads Sethares Dissonance Heatmap</b><br><i>Chord Dissonance={str(roundedDissonanceValue)}</i>', title_x=0.5)
 
     return fig, dfFiltered

{maialib-1.8.2.dist-info → maialib-1.9.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: maialib
-Version: 1.8.2
+Version: 1.9.1
 Summary: A C++/Python library to manipulate sheet music data
 Home-page: https://github.com/nyckmaia/maialib
 Author: Nycholas Maia
@@ -31,6 +31,7 @@ Dynamic: description-content-type
 Dynamic: home-page
 Dynamic: keywords
 Dynamic: license
+Dynamic: license-file
 Dynamic: project-url
 Dynamic: requires-dist
 Dynamic: requires-python

{maialib-1.8.2.dist-info → maialib-1.9.1.dist-info}/RECORD

@@ -9,18 +9,18 @@ maialib/xml-scores-examples/Strauss_Also_Sprach_Zarathustra.mxl,sha256=nOQra05RH
 maialib/xml-scores-examples/Bach_Cello_Suite_1.mxl,sha256=0XGNlcW8o0W7kkeG8j2V_M4eggdOnrxvvvCkpf6x_z4,29622
 maialib/maiacore/__init__.pyi,sha256=cJfflEKHJ6BPUTlDQt95xZmi2N3zwHJkHEXy27fBd5c,1282
 maialib/maiacore/__init__.py,sha256=IW7E0LuzAttsn0b37SEthCA0LKuzSgkepSpq8DWExYQ,77
-maialib/maiacore/maiacore.cpython-311-darwin.so,sha256=KCHvsbq4qIwPWdQzBdDlVSe9owgIWVJcqASejhPRCvM,7992288
-maialib/maiacore/maiacore.pyi,sha256=R_fUKVVS-QrDN55l1k3kb0vjHo92ZmlHZwfrBdQTucM,48067
+maialib/maiacore/maiacore.cpython-311-darwin.so,sha256=NDREM6icoqYo5IVQfkq9xb1FFhTOVz7KlBIa8L5gEFA,8255856
+maialib/maiacore/maiacore.pyi,sha256=O24ef-D3bEU4EMpwl9asJUZDROrHqMqZmRTiBhunQQ0,48404
 maialib/maiapy/other.pyi,sha256=jEmAc-MDc3iMA2-5hp41RLgNrfBQRMvq-sF2_pexhbo,2163
 maialib/maiapy/__init__.pyi,sha256=L8YtZYJMw_9TrdejcKs2c5xTbu5WMRwlHhKz6Qzulf8,77
 maialib/maiapy/__init__.py,sha256=L8YtZYJMw_9TrdejcKs2c5xTbu5WMRwlHhKz6Qzulf8,77
 maialib/maiapy/other.py,sha256=4LjETHcpDpNRjSYIbMW_9CuRZTymuoAzog_L3CkYDA0,4345
-maialib/maiapy/sethares_dissonance.py,sha256=uRQLTQN55dk74hIFpzu9RlTWP0ZhRpVT3yTLI-su1ww,12830
+maialib/maiapy/sethares_dissonance.py,sha256=M1g9IchSEXREPxez5wsSX14Y1yyuAxXbdmXJNLrO00s,12969
 maialib/maiapy/plots.pyi,sha256=nRNUQ9h9kjJHTdbQt4eXv933MOx7TIztIg-inThglB4,3620
-maialib/maiapy/plots.py,sha256=XjGhgQxFw2QfH-8iMvo3OR3gsxpNkOpBBTX_juYM1Js,23153
+maialib/maiapy/plots.py,sha256=sg6W2OjzZNl8vEVy91URn1nFhfrlRHzXoBkvd4hoZXo,23680
 maialib/maiapy/sethares_dissonance.pyi,sha256=O8D_cYRPCE1K5Zw54ckg3I5frULcBGgs_di_bTOpuBU,3609
-maialib-1.8.2.dist-info/RECORD,,
-maialib-1.8.2.dist-info/WHEEL,sha256=LQUS7-mk2BHRsce3mafctF01yD34-ifmy0t1ZpgSN1c,115
-maialib-1.8.2.dist-info/top_level.txt,sha256=sZWQaa-Up2ba00WpAxBhOLKM6qQYTpUKJMXgSE0Nc48,17
-maialib-1.8.2.dist-info/LICENSE.txt,sha256=ixuiBLtpoK3iv89l7ylKkg9rs2GzF9ukPH7ynZYzK5s,35148
-maialib-1.8.2.dist-info/METADATA,sha256=BOGGSVuAOtdWVnCgYTgcF8pN1TYi0JnFRLHMzXyOCsw,7304
+maialib-1.9.1.dist-info/RECORD,,
+maialib-1.9.1.dist-info/WHEEL,sha256=Gbb152AOxfNBOfY-AGDpXe-2V6a2OjA7bBYzci1XdfU,115
+maialib-1.9.1.dist-info/top_level.txt,sha256=sZWQaa-Up2ba00WpAxBhOLKM6qQYTpUKJMXgSE0Nc48,17
+maialib-1.9.1.dist-info/METADATA,sha256=v-dPYFfwglnbWCTSQiPwn6VEhehJuLjAtYJqAouJJ7U,7326
+maialib-1.9.1.dist-info/licenses/LICENSE.txt,sha256=ixuiBLtpoK3iv89l7ylKkg9rs2GzF9ukPH7ynZYzK5s,35148

{maialib-1.8.2.dist-info → maialib-1.9.1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (76.1.0)
+Generator: setuptools (80.9.0)
 Root-Is-Purelib: false
 Tag: cp311-cp311-macosx_10_15_universal2