VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-11-26 17:58:43 -05:00
Code Issues Projects Releases Wiki Activity

OpenGL modernization: draw the spectrum line in the new way. Rectangle calculation update.

Browse Source
This commit is contained in:
f4exb 2016-03-02 09:16:21 +01:00
parent add5a382f3
commit a1e2f541da
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sdrbase/gui/glspectrum.cpp
View File

@ -1247,9 +1247,9 @@ void GLSpectrum::paintGL()
QMatrix4x4 tsMatrix; QMatrix4x4 tsMatrix;
tsMatrix.setToIdentity(); tsMatrix.setToIdentity();
//qDebug("GLSpectrum::paintGL: %f %f %f %f", m_glHistogramRect.x(), m_glHistogramRect.y(), m_glHistogramRect.width(), m_glHistogramRect.height()); //qDebug("GLSpectrum::paintGL: %f %f %f %f", m_glHistogramRect.x(), m_glHistogramRect.y(), m_glHistogramRect.width(), m_glHistogramRect.height());
//tsMatrix.translate(m_glHistogramRect.x(), m_glHistogramRect.y(), 0);
tsMatrix.translate(m_glHistogramRect2.x(), m_glHistogramRect2.y(), 0); tsMatrix.translate(m_glHistogramRect2.x(), m_glHistogramRect2.y(), 0);
tsMatrix.scale((2.0f * m_glHistogramRect.width()) / (float)(m_fftSize - 1), (2.0f * m_glHistogramRect.height()) / m_powerRange, 1); //tsMatrix.scale((2.0f * m_glHistogramRect.width()) / (float)(m_fftSize - 1), m_glHistogramRect2.height() / m_powerRange, 1);
tsMatrix.scale((2.0f * m_glHistogramRect.width()) / (float)(m_fftSize - 1), m_glHistogramRect2.height() / m_powerRange, 1);
m_program->setUniformValue(m_matrixLoc, tsMatrix); m_program->setUniformValue(m_matrixLoc, tsMatrix);
m_program->setUniformValue(m_colorLoc, color); m_program->setUniformValue(m_colorLoc, color);
f->glEnable(GL_BLEND); f->glEnable(GL_BLEND);
@ -1592,7 +1592,7 @@ void GLSpectrum::applyChanges()
m_glHistogramRect2 = QRectF( m_glHistogramRect2 = QRectF(
-1.0f + ((float)leftMargin / width2), -1.0f + ((float)leftMargin / width2),
1.0f - ((float)histogramTop / height2), 1.0f - ((float)histogramTop / height2),
1.0f - ((float)(width2 - leftMargin - rightMargin) / width2), -1.0f + (((float) (width() - leftMargin - rightMargin)) / width2),
1.0f - ((float)histogramHeight / height2) 1.0f - ((float)histogramHeight / height2)
); );