[Audacity-cvs] audacity-src/src FreqWindow.cpp, 1.68, 1.69 FreqWindow.h, 1.15, 1.16

[Martyn]

Update of /cvsroot/audacity/audacity-src/src
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv27737

Modified Files:
        FreqWindow.cpp FreqWindow.h 
Log Message:
Use prefs /GUI/EnvdBRange for the vertical scaling, to avoid problems at small 
signal levels and allow 24-bit signals to be measured.

Index: FreqWindow.h
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/FreqWindow.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- FreqWindow.h        24 Mar 2009 05:00:19 -0000      1.15
+++ FreqWindow.h        15 Apr 2009 22:39:08 -0000      1.16
@@ -88,6 +88,7 @@
    int mAlg;
    int mFunc;
    int mAxis;
+   int dBRange;
 
 #ifdef __WXMSW__
    static const int fontSize = 8;

Index: FreqWindow.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/FreqWindow.cpp,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -d -r1.68 -r1.69
--- FreqWindow.cpp      4 Apr 2009 16:41:16 -0000       1.68
+++ FreqWindow.cpp      15 Apr 2009 22:39:08 -0000      1.69
@@ -154,6 +154,7 @@
    gPrefs->Read(wxT("/FreqWindow/AlgChoice"), &mAlg, 0);
    gPrefs->Read(wxT("/FreqWindow/FuncChoice"), &mFunc, 3);
    gPrefs->Read(wxT("/FreqWindow/AxisChoice"), &mAxis, 0);
+   gPrefs->Read(wxT("/GUI/EnvdBRange"), &dBRange, ENV_DB_RANGE);
 
    mFreqPlot = new FreqPlot(this, 0,
                             wxDefaultPosition, wxDefaultSize);
@@ -307,7 +308,7 @@
    vRuler = new RulerPanel(this, wxID_ANY);
    vRuler->ruler.SetBounds(0, 0, 100, 100); // Ruler can't handle small sizes
    vRuler->ruler.SetOrientation(wxVERTICAL);
-   vRuler->ruler.SetRange(10.0, -90.0);
+   vRuler->ruler.SetRange(10.0, -dBRange);
    vRuler->ruler.SetFormat(Ruler::LinearDBFormat);
    vRuler->ruler.SetUnits(_("dB"));
    vRuler->ruler.SetLabelEdges(true);
@@ -1087,9 +1088,12 @@
          else if(mProcessed[i] < mYMin)
             mYMin = mProcessed[i];
       }
-      if(mYMin < -90.)
-         mYMin = -90.;
-      mYMax += .5;
+      if(mYMin < -dBRange)
+         mYMin = -dBRange;
+      if(mYMax <= -dBRange)
+         mYMax = -dBRange + 10.; // it's all out of range, but show a scale.
+      else
+         mYMax += .5;
 
       mProcessedSize = half;
       mYStep = 10;
@@ -1231,6 +1235,7 @@
 
 void FreqWindow::OnReplot(wxCommandEvent & WXUNUSED(event))
 {
+   gPrefs->Read(wxT("/GUI/EnvdBRange"), &dBRange, ENV_DB_RANGE);
    GetAudio();
    gFreqWindow->Plot();
 }


------------------------------------------------------------------------------
Stay on top of everything new and different, both inside and 
around Java (TM) technology - register by April 22, and save
$200 on the JavaOne (SM) conference, June 2-5, 2009, San Francisco.
300 plus technical and hands-on sessions. Register today. 
Use priority code J9JMT32. http://p.sf.net/sfu/p
_______________________________________________
Audacity-cvs mailing list
Audacity-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/audacity-cvs