fixed #1283, format and tick locations for CQT plots (#1290)

* fixed #1283, format and tick locations for CQT plots * updating freetype requirements; regenerated ref images
librosa · Mar 3, 2021 · 20ab762 · 20ab762
1 parent 8d9a1de
commit 20ab762
Show file tree

Hide file tree

Showing 36 changed files with 4 additions and 4 deletions.
diff --git a/appveyor.yml b/appveyor.yml
@@ -20,7 +20,7 @@ install:
   - "IF NOT EXIST %MINICONDA%\\envs\\test-environment-%PYTHON_VERSION% conda create -q -n test-environment-%PYTHON_VERSION% python=%PYTHON_VERSION% numpy scipy coverage scikit-learn!=0.19.0 numba"
   - "activate test-environment-%PYTHON_VERSION%"
   - conda info -a
-  - conda install -c conda-forge ffmpeg
+  - conda install -c conda-forge ffmpeg "freetype>=2.10"
   - pip install -e .[tests]
 
 test_script:

diff --git a/librosa/display.py b/librosa/display.py
@@ -213,7 +213,7 @@ def __call__(self, x, pos=None):
 
         cents = vmax <= 2 * max(1, vmin)
 
-        return core.hz_to_note(int(x), octave=self.octave, cents=cents, key=self.key)
+        return core.hz_to_note(x, octave=self.octave, cents=cents, key=self.key)
 
 
 class SvaraFormatter(Formatter):
@@ -1061,7 +1061,7 @@ def __decorate_axis(axis, ax_type, key="C:maj", Sa=None, mela=None, thaat=None):
         axis.set_major_locator(LogLocator(base=2.0, subs=(C_offset,)))
         axis.set_minor_formatter(NoteFormatter(key=key, major=False))
         axis.set_minor_locator(
-            LogLocator(base=2.0, subs=2.0 ** (np.arange(1, 12) / 12.0))
+            LogLocator(base=2.0, subs=C_offset * 2.0 ** (np.arange(1, 12) / 12.0))
         )
         axis.set_label_text("Note")
 
@@ -1085,7 +1085,7 @@ def __decorate_axis(axis, ax_type, key="C:maj", Sa=None, mela=None, thaat=None):
         axis.set_major_locator(LogLocator(base=2.0))
         axis.set_minor_formatter(LogHzFormatter(major=False))
         axis.set_minor_locator(
-            LogLocator(base=2.0, subs=2.0 ** (np.arange(1, 12) / 12.0))
+            LogLocator(base=2.0, subs=C_offset * 2.0 ** (np.arange(1, 12) / 12.0))
         )
         axis.set_label_text("Hz")
 

diff --git a/tests/baseline_images/test_display/test_abs_input.png b/tests/baseline_images/test_display/test_abs_input.png
diff --git a/tests/baseline_images/test_display/test_chroma.png b/tests/baseline_images/test_display/test_chroma.png
diff --git a/tests/baseline_images/test_display/test_chroma_svara.png b/tests/baseline_images/test_display/test_chroma_svara.png
diff --git a/tests/baseline_images/test_display/test_complex_input.png b/tests/baseline_images/test_display/test_complex_input.png
diff --git a/tests/baseline_images/test_display/test_coords.png b/tests/baseline_images/test_display/test_coords.png
diff --git a/tests/baseline_images/test_display/test_cqt_hz.png b/tests/baseline_images/test_display/test_cqt_hz.png
diff --git a/tests/baseline_images/test_display/test_cqt_note.png b/tests/baseline_images/test_display/test_cqt_note.png
diff --git a/tests/baseline_images/test_display/test_display_cqt_svara.png b/tests/baseline_images/test_display/test_display_cqt_svara.png
diff --git a/tests/baseline_images/test_display/test_double_chroma.png b/tests/baseline_images/test_display/test_double_chroma.png
diff --git a/tests/baseline_images/test_display/test_fourier_tempo.png b/tests/baseline_images/test_display/test_fourier_tempo.png
diff --git a/tests/baseline_images/test_display/test_sharex_specshow_ms.png b/tests/baseline_images/test_display/test_sharex_specshow_ms.png
diff --git a/tests/baseline_images/test_display/test_sharex_waveplot_ms.png b/tests/baseline_images/test_display/test_sharex_waveplot_ms.png
diff --git a/tests/baseline_images/test_display/test_specshow_ext_axes.png b/tests/baseline_images/test_display/test_specshow_ext_axes.png
diff --git a/tests/baseline_images/test_display/test_tempo.png b/tests/baseline_images/test_display/test_tempo.png
diff --git a/tests/baseline_images/test_display/test_time_scales_auto.png b/tests/baseline_images/test_display/test_time_scales_auto.png
diff --git a/tests/baseline_images/test_display/test_time_unit.png b/tests/baseline_images/test_display/test_time_unit.png
diff --git a/tests/baseline_images/test_display/test_time_unit_lag.png b/tests/baseline_images/test_display/test_time_unit_lag.png
diff --git a/tests/baseline_images/test_display/test_tonnetz.png b/tests/baseline_images/test_display/test_tonnetz.png
diff --git a/tests/baseline_images/test_display/test_waveplot_ext_axes.png b/tests/baseline_images/test_display/test_waveplot_ext_axes.png
diff --git a/tests/baseline_images/test_display/test_waveplot_mono.png b/tests/baseline_images/test_display/test_waveplot_mono.png
diff --git a/tests/baseline_images/test_display/test_waveplot_stereo.png b/tests/baseline_images/test_display/test_waveplot_stereo.png
diff --git a/tests/baseline_images/test_display/test_x_mel.png b/tests/baseline_images/test_display/test_x_mel.png
diff --git a/tests/baseline_images/test_display/test_xaxis_frames_yaxis_none.png b/tests/baseline_images/test_display/test_xaxis_frames_yaxis_none.png
diff --git a/tests/baseline_images/test_display/test_xaxis_lag_yaxis_none.png b/tests/baseline_images/test_display/test_xaxis_lag_yaxis_none.png
diff --git a/tests/baseline_images/test_display/test_xaxis_linear_yaxis_none.png b/tests/baseline_images/test_display/test_xaxis_linear_yaxis_none.png
diff --git a/tests/baseline_images/test_display/test_xaxis_log_yaxis_none.png b/tests/baseline_images/test_display/test_xaxis_log_yaxis_none.png
diff --git a/tests/baseline_images/test_display/test_xaxis_none_yaxis_frames.png b/tests/baseline_images/test_display/test_xaxis_none_yaxis_frames.png
diff --git a/tests/baseline_images/test_display/test_xaxis_none_yaxis_linear.png b/tests/baseline_images/test_display/test_xaxis_none_yaxis_linear.png
diff --git a/tests/baseline_images/test_display/test_xaxis_none_yaxis_log.png b/tests/baseline_images/test_display/test_xaxis_none_yaxis_log.png
diff --git a/tests/baseline_images/test_display/test_xaxis_none_yaxis_time.png b/tests/baseline_images/test_display/test_xaxis_none_yaxis_time.png
diff --git a/tests/baseline_images/test_display/test_xaxis_time_yaxis_lag.png b/tests/baseline_images/test_display/test_xaxis_time_yaxis_lag.png
diff --git a/tests/baseline_images/test_display/test_xaxis_time_yaxis_none.png b/tests/baseline_images/test_display/test_xaxis_time_yaxis_none.png
diff --git a/tests/baseline_images/test_display/test_y_mel.png b/tests/baseline_images/test_display/test_y_mel.png
diff --git a/tests/baseline_images/test_display/test_y_mel_bounded.png b/tests/baseline_images/test_display/test_y_mel_bounded.png