comparison layer/SpectrogramLayer.h @ 907:28d05ae8741c cxx11

More type fixes, primarily in the spectrogram
author Chris Cannam
date Tue, 10 Mar 2015 10:31:27 +0000
parents 12ab113ca2b1
children 94e4952a6774 8053c0dfa919
comparison
equal deleted inserted replaced
906:12ab113ca2b1 907:28d05ae8741c
308 */ 308 */
309 struct ImageCache 309 struct ImageCache
310 { 310 {
311 QImage image; 311 QImage image;
312 QRect validArea; 312 QRect validArea;
313 int startFrame; 313 sv_frame_t startFrame;
314 int zoomLevel; 314 int zoomLevel;
315 }; 315 };
316 typedef std::map<const View *, ImageCache> ViewImageCache; 316 typedef std::map<const View *, ImageCache> ViewImageCache;
317 void invalidateImageCaches(); 317 void invalidateImageCaches();
318 void invalidateImageCaches(sv_frame_t startFrame, sv_frame_t endFrame); 318 void invalidateImageCaches(sv_frame_t startFrame, sv_frame_t endFrame);
332 bool m_exiting; 332 bool m_exiting;
333 333
334 void initialisePalette(); 334 void initialisePalette();
335 void rotatePalette(int distance); 335 void rotatePalette(int distance);
336 336
337 unsigned char getDisplayValue(View *v, float input) const; 337 unsigned char getDisplayValue(View *v, double input) const;
338 338
339 int getColourScaleWidth(QPainter &) const; 339 int getColourScaleWidth(QPainter &) const;
340 340
341 void illuminateLocalFeatures(View *v, QPainter &painter) const; 341 void illuminateLocalFeatures(View *v, QPainter &painter) const;
342 342
426 mutable ViewMagMap m_viewMags; 426 mutable ViewMagMap m_viewMags;
427 mutable std::vector<MagnitudeRange> m_columnMags; 427 mutable std::vector<MagnitudeRange> m_columnMags;
428 void invalidateMagnitudes(); 428 void invalidateMagnitudes();
429 bool updateViewMagnitudes(View *v) const; 429 bool updateViewMagnitudes(View *v) const;
430 bool paintDrawBuffer(View *v, int w, int h, 430 bool paintDrawBuffer(View *v, int w, int h,
431 int *binforx, double *binfory, 431 const std::vector<int> &binforx,
432 const std::vector<double> &binfory,
432 bool usePeaksCache, 433 bool usePeaksCache,
433 MagnitudeRange &overallMag, 434 MagnitudeRange &overallMag,
434 bool &overallMagChanged) const; 435 bool &overallMagChanged) const;
435 bool paintDrawBufferPeakFrequencies(View *v, int w, int h, 436 bool paintDrawBufferPeakFrequencies(View *v, int w, int h,
436 int *binforx, 437 const std::vector<int> &binforx,
437 int minbin, 438 int minbin,
438 int maxbin, 439 int maxbin,
439 double displayMinFreq, 440 double displayMinFreq,
440 double displayMaxFreq, 441 double displayMaxFreq,
441 bool logarithmic, 442 bool logarithmic,