diff --git a/spectrogramplot.cpp b/spectrogramplot.cpp index 077daac..9c19073 100644 --- a/spectrogramplot.cpp +++ b/spectrogramplot.cpp @@ -37,8 +37,6 @@ SpectrogramPlot::SpectrogramPlot(SampleSource> *src) zoomLevel = 0; powerMax = 0.0f; powerMin = -50.0f; - timeScaleIsEnabled = true; - deltaDragIsEnabled = true; for (int i = 0; i < 256; i++) { float p = (float)i / 256; @@ -53,17 +51,6 @@ SpectrogramPlot::~SpectrogramPlot() delete inputSource; } -QSize SpectrogramPlot::sizeHint() const -{ - return QSize(1024, 2048); -} - -void SpectrogramPlot::xyToFreqTime(int x, int y, float *freq, float *time) -{ - *freq = labs(x - (fftSize / 2)) * sampleRate / 2 / (float)fftSize; - *time = (float)lineToSample(y) / sampleRate; -} - void SpectrogramPlot::paintMid(QPainter &painter, QRect &rect, range_t sampleRange) { if (!inputSource || inputSource->count() == 0) @@ -149,25 +136,9 @@ void SpectrogramPlot::getLine(float *dest, off_t sample) } } -void SpectrogramPlot::paintCursors(QPainter *painter, QRect rect) -{ - if (cursorStartX != -1) { - painter->save(); - QPen pen(Qt::white, 1, Qt::DashLine); - painter->setPen(pen); - painter->drawLine(rect.left(), cursorStartY, rect.right(), cursorStartY); - painter->drawLine(cursorStartX, rect.top(), cursorStartX, rect.bottom()); - painter->drawLine(rect.left(), cursorEndY, rect.right(), cursorEndY); - painter->drawLine(cursorEndX, rect.top(), cursorEndX, rect.bottom()); - painter->restore(); - - } -} - void SpectrogramPlot::setSampleRate(int rate) { sampleRate = rate; - update(); } void SpectrogramPlot::setFFTSize(int size) @@ -188,14 +159,12 @@ void SpectrogramPlot::setPowerMax(int power) { powerMax = power; pixmapCache.clear(); - update(); } void SpectrogramPlot::setPowerMin(int power) { powerMin = power; pixmapCache.clear(); - update(); } void SpectrogramPlot::setZoomLevel(int zoom) @@ -203,19 +172,6 @@ void SpectrogramPlot::setZoomLevel(int zoom) zoomLevel = clamp(zoom, 0, (int)log2(fftSize)); } -void SpectrogramPlot::setTimeScaleEnable(int state) -{ - timeScaleIsEnabled = (state == Qt::Checked); - pixmapCache.clear(); - update(); -} - -void SpectrogramPlot::setDeltaDragEnable(int state) -{ - deltaDragIsEnabled = (state == Qt::Checked); -} - - int SpectrogramPlot::getHeight() { if (!inputSource) diff --git a/spectrogramplot.h b/spectrogramplot.h index bfafd91..48cb30e 100644 --- a/spectrogramplot.h +++ b/spectrogramplot.h @@ -49,22 +49,12 @@ public: SampleSource> *inputSource = nullptr; -signals: - void cursorFrequencyChanged(QString); - void cursorTimeChanged(QString); - void deltaFrequencyChanged(QString); - void deltaTimeChanged(QString); - void needUpdate(); - public slots: void setSampleRate(int rate); void setFFTSize(int size); void setPowerMax(int power); void setPowerMin(int power); void setZoomLevel(int zoom); - void setTimeScaleEnable(int state); - void setDeltaDragEnable(int state); - void update() { emit needUpdate(); }; protected: void mouseReleaseEvent(QMouseEvent * event); @@ -88,10 +78,6 @@ private: int zoomLevel; float powerMax; float powerMin; - bool timeScaleIsEnabled; - bool deltaDragIsEnabled; - int cursorStartX = -1, cursorStartY; - int cursorEndX, cursorEndY; QPixmap* getPixmapTile(off_t tile); float* getFFTTile(off_t tile); @@ -100,7 +86,6 @@ private: int sampleToLine(off_t sample); QString sampleToTime(off_t sample); int linesPerTile(); - void xyToFreqTime(int x, int y, float *freq, float *time); }; class TileCacheKey