changeset 274:e412f65884ee

* Fix piano keyboard in spectrum, add pitch labels to frequency displays in
  measurement rect (clunkily done) and harmonic cursor in spectrum

--- a/base/Pitch.cpp	Tue Jul 03 12:46:18 2007 +0000
+++ b/base/Pitch.cpp	Tue Jul 03 18:47:39 2007 +0000
@@ -101,3 +101,12 @@
     return getPitchLabel(midiPitch, centsOffset, useFlats);
 }
 
+bool
+Pitch::isFrequencyInMidiRange(float frequency,
+                              float concertA)
+{
+    float centsOffset = 0.0;
+    int midiPitch = getPitchForFrequency(frequency, &centsOffset, concertA);
+    return (midiPitch >= 0 && midiPitch < 128);
+}
+

--- a/base/Pitch.h	Tue Jul 03 12:46:18 2007 +0000
+++ b/base/Pitch.h	Tue Jul 03 18:47:39 2007 +0000
@@ -21,23 +21,79 @@
 class Pitch
 {
 public:
-    /* If concertA <= 0, it will be taken from current preferences */
-
+    /**
+     * Return the frequency at the given MIDI pitch plus centsOffset
+     * cents (1/100ths of a semitone).  centsOffset does not have to
+     * be in any particular range or sign.
+     *
+     * If concertA is non-zero, use that as the reference frequency
+     * for the A at MIDI pitch 69; otherwise use the tuning frequency
+     * specified in the application preferences (default 440Hz).
+     */
     static float getFrequencyForPitch(int midiPitch,
 				      float centsOffset = 0,
 				      float concertA = 0.0);
 
+    /**
+     * Return the nearest MIDI pitch to the given frequency.
+     *
+     * If centsOffsetReturn is non-NULL, return in *centsOffsetReturn
+     * the number of cents (1/100ths of a semitone) difference between
+     * the given frequency and that of the returned MIDI pitch.  The
+     * cents offset will be in the range [-50,50).
+     * 
+     * If concertA is non-zero, use that as the reference frequency
+     * for the A at MIDI pitch 69; otherwise use the tuning frequency
+     * specified in the application preferences (default 440Hz).
+     */
     static int getPitchForFrequency(float frequency,
 				    float *centsOffsetReturn = 0,
 				    float concertA = 0.0);
 
+    /**
+     * Return a string describing the given MIDI pitch, with optional
+     * cents offset.  This consists of the note name, octave number
+     * (with MIDI pitch 0 having octave number -2), and optional
+     * cents.
+     *
+     * For example, "A#3" (A# in octave 3) or "C2-12c" (C in octave 2,
+     * minus 12 cents).
+     *
+     * If useFlats is true, spell notes with flats instead of sharps,
+     * e.g. Bb3 instead of A#3.
+     */
     static QString getPitchLabel(int midiPitch,
 				 float centsOffset = 0,
 				 bool useFlats = false);
 
+    /**
+     * Return a string describing the nearest MIDI pitch to the given
+     * frequency, with cents offset.
+     *
+     * If concertA is non-zero, use that as the reference frequency
+     * for the A at MIDI pitch 69; otherwise use the tuning frequency
+     * specified in the application preferences (default 440Hz).
+     *
+     * If useFlats is true, spell notes with flats instead of sharps,
+     * e.g. Bb3 instead of A#3.
+     */
     static QString getPitchLabelForFrequency(float frequency,
 					     float concertA = 0.0,
 					     bool useFlats = false);
+
+    /**
+     * Return true if the given frequency falls within the range of
+     * MIDI note pitches, plus or minus half a semitone.  This is
+     * equivalent to testing whether getPitchForFrequency returns a
+     * pitch in the MIDI range (0 to 127 inclusive) with any cents
+     * offset.
+     *
+     * If concertA is non-zero, use that as the reference frequency
+     * for the A at MIDI pitch 69; otherwise use the tuning frequency
+     * specified in the application preferences (default 440Hz).
+     */
+    static bool isFrequencyInMidiRange(float frequency,
+                                       float concertA = 0.0);
 };