maialib 1.9.0__pp38-pypy38_pp73-win_amd64.whl → 1.9.1__pp38-pypy38_pp73-win_amd64.whl

maialib/maiacore/Release/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:
         ...
@@ -431,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:
@@ -470,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
@@ -1406,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.9.0"'
+__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.9.0.dist-info → maialib-1.9.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: maialib
-Version: 1.9.0
+Version: 1.9.1
 Summary: A C++/Python library to manipulate sheet music data
 Home-page: https://github.com/nyckmaia/maialib
 Author: Nycholas Maia

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

@@ -3,15 +3,15 @@ maialib/setup.py,sha256=SRFKCV1MVKftVrdnbrjQkL-ee4nR6pzlaURgwSJgqXU,2221
 maialib/maiacore/__init__.py,sha256=0sK4fUTlwdUaieWSoGvL11TBkw6BebR2cd-MpYpJn1o,81
 maialib/maiacore/__init__.pyi,sha256=68w5bv3qhq6lEK0JNHSWER9zuyQN8mxJV-y3JayNxNA,1472
 maialib/maiacore/Release/__init__.pyi,sha256=ncPiCbsaSZXZUykVnOw-yqVPbE-I285Kj5moTnKTNCU,84
-maialib/maiacore/Release/maiacore.pyi,sha256=GTaAQqFpuCuMKbhVUTtuloJgsrCCR0nyBKJGZ2u0jRc,49575
-maialib/maiacore/Release/maiacore.pypy38-pp73-win_amd64.pyd,sha256=PJc2EfedAGNg4DfXOAXIHOkdGSDPXx90gfCGI9YzcKQ,4585472
+maialib/maiacore/Release/maiacore.pyi,sha256=QVaokZgCNtkhHm-x7UnbPoGxKDVjOSU8MeTC-Bo1X4c,49818
+maialib/maiacore/Release/maiacore.pypy38-pp73-win_amd64.pyd,sha256=zUOK1w8tWFq7fhG1KERyNGMa7WbFSlxXpyldQY-vOOY,4594688
 maialib/maiapy/__init__.py,sha256=Kd9D0GBofeJYa6ampk8C47otrr20uwoTYlJlPyMu6fU,80
 maialib/maiapy/__init__.pyi,sha256=Kd9D0GBofeJYa6ampk8C47otrr20uwoTYlJlPyMu6fU,80
 maialib/maiapy/other.py,sha256=Gcxbxp5zWsbYWi8Zd9ikBJPDOAVqm53tj5_KdzAURh4,4484
 maialib/maiapy/other.pyi,sha256=kjn7QULRPrLmGCwj0SJzcuJ544Yo4vpduumq3v9CUzg,2242
-maialib/maiapy/plots.py,sha256=FMzxaGp1k73K1V11118hua3JQPzmNbdRpgxMyGoVtHc,23809
+maialib/maiapy/plots.py,sha256=d7Uic7eAZqZZHHravS_o2tkF4-AKnK_aob1C9U4DlV0,24356
 maialib/maiapy/plots.pyi,sha256=FCiM2grDLYPqFkyHPG3x0-Y1NbD8L6UfAMWXFMLv5K0,3723
-maialib/maiapy/sethares_dissonance.py,sha256=oDphSv2-jRlCFAk1hcDT4gDjonqX6QP77ybwkRlfu6U,13161
+maialib/maiapy/sethares_dissonance.py,sha256=Prxd5R2NN5HOeTbUwKQR5nmLf9hIVotF3oIFpjKZDQE,13311
 maialib/maiapy/sethares_dissonance.pyi,sha256=iBoK28luL78I--NeJMxa-CaOYyG7OuvO6qXH7meTGA0,3680
 maialib/xml-scores-examples/Bach_Cello_Suite_1.mxl,sha256=0XGNlcW8o0W7kkeG8j2V_M4eggdOnrxvvvCkpf6x_z4,29622
 maialib/xml-scores-examples/Beethoven_Symphony_5_mov_1.xml,sha256=GHDk53y0lbR9Ajc-63vHDP2tT1BX0ZWfx9jpFDUU5sU,4947722
@@ -20,8 +20,8 @@ maialib/xml-scores-examples/Dvorak_Symphony_9_mov_4.mxl,sha256=s7FGUEmFmgcIdmkZ-
 maialib/xml-scores-examples/Mahler_Symphony_8_Finale.mxl,sha256=F2-QBKNYjBv_sWT-z4LWi1rX84-P3msxtl-g6joA2FQ,229034
 maialib/xml-scores-examples/Mozart_Requiem_Introitus.mxl,sha256=_wc4hMaPhtgocUoL94uVzfVN3TGb08z8Xa2BL4SHfgA,91112
 maialib/xml-scores-examples/Strauss_Also_Sprach_Zarathustra.mxl,sha256=nOQra05RHHDe_dXFs5WBJG2l9R1KQk64urV7lWYC2vw,18863
-maialib-1.9.0.dist-info/LICENSE.txt,sha256=gcuuhKKc5-dwvyvHsXjlC9oM6N5gZ6umYbC8ewW1Yvg,35821
-maialib-1.9.0.dist-info/METADATA,sha256=qYsKoPXb982MfHmCiJ6UdWkrML6wWMx3SkMtPlN2hIY,7241
-maialib-1.9.0.dist-info/WHEEL,sha256=Ud1iIBeo_0He1fs5taa1TvkeU9XIUeToqiq5pfQ8w5w,106
-maialib-1.9.0.dist-info/top_level.txt,sha256=sZWQaa-Up2ba00WpAxBhOLKM6qQYTpUKJMXgSE0Nc48,17
-maialib-1.9.0.dist-info/RECORD,,
+maialib-1.9.1.dist-info/LICENSE.txt,sha256=gcuuhKKc5-dwvyvHsXjlC9oM6N5gZ6umYbC8ewW1Yvg,35821
+maialib-1.9.1.dist-info/METADATA,sha256=FjM-EcGmwzKZE3jI6oUayTumgkWwnLaiAccmpjh9Xg4,7241
+maialib-1.9.1.dist-info/WHEEL,sha256=Ud1iIBeo_0He1fs5taa1TvkeU9XIUeToqiq5pfQ8w5w,106
+maialib-1.9.1.dist-info/top_level.txt,sha256=sZWQaa-Up2ba00WpAxBhOLKM6qQYTpUKJMXgSE0Nc48,17
+maialib-1.9.1.dist-info/RECORD,,