comparison layer/SpectrogramLayer.h @ 1060:5eb4d79334b9 spectrogram-minor-refactor

Replace old logic with calls to new functions; basic refactor part A done, the code now compiles again
author Chris Cannam
date Wed, 15 Jun 2016 09:46:20 +0100
parents e1c2dcc7790e
children a0f234acd6e7
comparison
equal deleted inserted replaced
1059:e1c2dcc7790e 1060:5eb4d79334b9
385 MagnitudeRange &overallMag, 385 MagnitudeRange &overallMag,
386 bool &overallMagChanged, 386 bool &overallMagChanged,
387 bool rightToLeft, 387 bool rightToLeft,
388 double softTimeLimit) const; 388 double softTimeLimit) const;
389 389
390 void normalise(std::vector<float> &, Normalization norm) const;
391
392 std::vector<float> getColumnFromFFTModel(FFTModel *model, 390 std::vector<float> getColumnFromFFTModel(FFTModel *model,
393 int sx, 391 int sx,
394 int minbin, 392 int minbin,
395 int bincount) const; 393 int bincount) const;
396 394
397 std::vector<float> getColumnFromGenericModel(DenseThreeDimensionalModel *model, 395 std::vector<float> getColumnFromGenericModel(DenseThreeDimensionalModel *model,
398 int sx, 396 int sx,
399 int minbin, 397 int minbin,
400 int bincount) const; 398 int bincount) const;
401 399
402 void scaleColumn(std::vector<float> &col) const; 400 std::vector<float> scaleColumn(const std::vector<float> &in) const;
403 401
404 std::vector<float> distributeColumn(const std::vector<float> &in, 402 std::vector<float> distributeColumn(const std::vector<float> &in,
405 int h, 403 int h,
406 const std::vector<double> &binfory, 404 const std::vector<double> &binfory,
407 int minbin, 405 int minbin,
410 void recordColumnExtents(const std::vector<float> &col, 408 void recordColumnExtents(const std::vector<float> &col,
411 int sx, 409 int sx,
412 MagnitudeRange &overallMag, 410 MagnitudeRange &overallMag,
413 bool &overallMagChanged) const; 411 bool &overallMagChanged) const;
414 412
413 std::vector<float> normalizeColumn(const std::vector<float> &in) const;
414
415 std::vector<float> peakPickColumn(const std::vector<float> &in) const; 415 std::vector<float> peakPickColumn(const std::vector<float> &in) const;
416 416
417 std::vector<float> applyDisplayGain(const std::vector<float> &in) const; 417 std::vector<float> applyDisplayGain(const std::vector<float> &in) const;
418 418
419 virtual void updateMeasureRectYCoords(LayerGeometryProvider *v, 419 virtual void updateMeasureRectYCoords(LayerGeometryProvider *v,