comparison layer/SpectrumLayer.cpp @ 1387:bca9870301b7 spectrogramparam

Small speedups

             ColourMapper(ColourMapper::WhiteOnBlack, m_colourInverted, 0, 1);
         
         int peakminbin = 0;
         int peakmaxbin = fft->getHeight() - 1;
         double peakmaxfreq = Pitch::getFrequencyForPitch(128);
-        peakmaxbin = int(((peakmaxfreq * fft->getHeight() * 2) / fft->getSampleRate()));
+        peakmaxbin = int(((peakmaxfreq * fft->getHeight() * 2) /
+                          fft->getSampleRate()));
         
         FFTModel::PeakSet peaks = fft->getPeakFrequencies
             (FFTModel::MajorPitchAdaptivePeaks, col, peakminbin, peakmaxbin);
 
         BiasCurve curve;
         getBiasCurve(curve);
         int cs = int(curve.size());
 
+        int px = -1;
+
         for (FFTModel::PeakSet::iterator i = peaks.begin();
              i != peaks.end(); ++i) {
+
+            double freq = i->second;
+            int x = int(lrint(getXForFrequency(v, freq)));
+            if (x == px) {
+                continue;
+            }
 
             int bin = i->first;
             
 //            cerr << "bin = " << bin << ", thresh = " << thresh << ", value = " << fft->getMagnitudeAt(col, bin) << endl;
 
             double value = fft->getValueAt(col, bin);
             if (value < thresh) continue;
             if (bin < cs) value *= curve[bin];
             
-            double freq = i->second;
-            int x = int(lrint(getXForFrequency(v, freq)));
-            
             double norm = 0.f;
             // don't need return value, need norm:            
             (void)getYForValue(v, value, norm);
 
-            paint.setPen(mapper.map(norm));
+            paint.setPen(QPen(mapper.map(norm), 1));
             paint.drawLine(x, 0, x, v->getPaintHeight() - scaleHeight - 1);
+
+            px = x;
         }
 
         paint.restore();
     }