Remove redundant view <-> model value mapping stuff from AudioRegionGainLine.

[ardour.git] / gtk2_ardour / fft_graph.cc

diff --git a/gtk2_ardour/fft_graph.cc b/gtk2_ardour/fft_graph.cc
index 0989247e0904caa28473cce4a8409696d64fc6ea..e7a0fd75b6ffadb8904307c04f72f99e32c18b4b 100644 (file)
--- a/gtk2_ardour/fft_graph.cc
+++ b/gtk2_ardour/fft_graph.cc
@@ -58,7 +58,7 @@ void
 FFTGraph::setWindowSize(int windowSize)
 {
        if (_a_window) {
-               LockMonitor lm (_a_window->track_list_lock, __LINE__, __FILE__);
+               Glib::Mutex::Lock lm  (_a_window->track_list_lock);
                setWindowSize_internal(windowSize);
        } else {
                setWindowSize_internal(windowSize);
@@ -123,8 +123,9 @@ FFTGraph::setWindowSize_internal(int windowSize)
        }
        
        _logScale = (int *) malloc(sizeof(int) * _dataSize);
+       //float count = 0;
        for (int i = 0; i < _dataSize; i++) {
-               _logScale[i] = (int)floor(log10( 1.0 + i * 9.0 / (double)_dataSize) * (double)scaleWidth);
+               _logScale[i] = 0;
        }
        _plan = fftwf_plan_r2r_1d(_windowSize, _in, _out, FFTW_R2HC, FFTW_ESTIMATE);
 }
@@ -234,27 +235,28 @@ FFTGraph::draw_scales(Glib::RefPtr<Gdk::Window> window)
                while (_logScale[logscale_pos] < position_on_scale)
                        logscale_pos++;
                
-               int coord = v_margin + 1.0 + position_on_scale;
+               int coord = (int)(v_margin + 1.0 + position_on_scale);
                
                int SR = 44100;
 
-               int rate_at_pos = (double)(SR/2) * (double)logscale_pos / (double)_dataSize;
+               int rate_at_pos = (int)((double)(SR/2) * (double)logscale_pos / (double)_dataSize);
                
                char buf[32];
-               snprintf(buf,32,"%dhz",rate_at_pos);
-               
+               if (rate_at_pos < 1000)
+                       snprintf(buf,32,"%dHz",rate_at_pos);
+               else
+                       snprintf(buf,32,"%dk",(int)floor( (float)rate_at_pos/(float)1000) );
+
                std::string label = buf;
                
                layout->set_text(label);
                
                window->draw_line(graph_gc, coord, v_margin, coord, height - v_margin);
 
-               int layoutWidth;
-               int layoutHeight;
-               layout->get_pixel_size(layoutWidth,layoutHeight);
-                       
+               int width, height;
+               layout->get_pixel_size (width, height);
                
-               window->draw_layout(white, coord - layoutWidth / 2, v_margin / 2, layout);
+               window->draw_layout(white, coord - width / 2, v_margin / 2, layout);
                
        }
 
@@ -263,7 +265,7 @@ FFTGraph::draw_scales(Glib::RefPtr<Gdk::Window> window)
 void
 FFTGraph::redraw()
 {      
-       LockMonitor lm (_a_window->track_list_lock, __LINE__, __FILE__ );
+       Glib::Mutex::Lock lm  (_a_window->track_list_lock);
 
        draw_scales(get_window());
        
@@ -373,12 +375,22 @@ FFTGraph::on_size_request(Gtk::Requisition* requisition)
        if (_logScale != 0) {
                free(_logScale);
        }
-
        _logScale = (int *) malloc(sizeof(int) * _dataSize);
-       //cerr << "LogScale: " << endl;
+
+       float SR = 44100;
+       float FFT_START = SR/(double)_dataSize;
+       float FFT_END = SR/2.0;
+       float FFT_RANGE = log( FFT_END / FFT_START);
+       float pixel = 0;
        for (int i = 0; i < _dataSize; i++) {
-               _logScale[i] = (int)floor(log10( 1.0 + i * 9.0 / (double)_dataSize) * (double)scaleWidth);
-               //cerr << i << ":\t" << _logScale[i] << endl;
+               float freq_at_bin = (SR/2.0) * ((double)i / (double)_dataSize);
+               float freq_at_pixel = FFT_START * exp( FFT_RANGE * pixel / (double)scaleWidth );
+               while (freq_at_bin > freq_at_pixel) {
+                       pixel++;
+                       freq_at_pixel = FFT_START * exp( FFT_RANGE * pixel / (double)scaleWidth );
+               }
+               _logScale[i] = (int)floor(pixel);
+//printf("logscale at %d = %3.3f, freq_at_pixel %3.3f, freq_at_bin %3.3f, scaleWidth %d\n", i, pixel, freq_at_pixel, freq_at_bin, scaleWidth);
        }
 
        requisition->width  = width;;
@@ -386,7 +398,7 @@ FFTGraph::on_size_request(Gtk::Requisition* requisition)
 }
 
 void
-FFTGraph::on_size_allocate(Gtk::Allocation alloc)
+FFTGraph::on_size_allocate(Gtk::Allocation & alloc)
 {
        width = alloc.get_width();
        height = alloc.get_height();