From 941b1a807ab1147bf64a081eac6053b0431526a6 Mon Sep 17 00:00:00 2001 From: Edouard Griffiths Date: Mon, 19 Oct 2015 23:40:17 +0200 Subject: [PATCH] Removed anti-aliasing on spectrum and scope traces --- sdrbase/gui/glscope.cpp | 24 ++++++++++++------------ sdrbase/gui/glspectrum.cpp | 8 ++++---- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/sdrbase/gui/glscope.cpp b/sdrbase/gui/glscope.cpp index 80289f515..e25705002 100644 --- a/sdrbase/gui/glscope.cpp +++ b/sdrbase/gui/glscope.cpp @@ -331,7 +331,7 @@ void GLScope::paintGL() glScalef(m_glScopeRect1.width(), -(m_glScopeRect1.height() / 2) * m_amp1, 1); glEnable(GL_BLEND); glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); - glEnable(GL_LINE_SMOOTH); + //glEnable(GL_LINE_SMOOTH); glLineWidth(1.0f); glColor4f(0, 1, 0, 0.5f); glBegin(GL_LINE_LOOP); @@ -355,7 +355,7 @@ void GLScope::paintGL() } glEnd(); - glDisable(GL_LINE_SMOOTH); + //glDisable(GL_LINE_SMOOTH); glPopMatrix(); } @@ -366,7 +366,7 @@ void GLScope::paintGL() glScalef(m_glScopeRect1.width() * (float)m_timeBase / (float)(m_displayTrace->size() - 1), -(m_glScopeRect1.height() / 2) * m_amp1, 1); glEnable(GL_BLEND); glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); - glEnable(GL_LINE_SMOOTH); + //glEnable(GL_LINE_SMOOTH); glLineWidth(1.0f); glColor4f(1, 1, 0.25f, m_displayTraceIntensity / 100.0); int start = (m_timeOfsProMill/1000.0) * m_displayTrace->size(); @@ -385,7 +385,7 @@ void GLScope::paintGL() glVertex2f(i - start, v); } glEnd(); - glDisable(GL_LINE_SMOOTH); + //glDisable(GL_LINE_SMOOTH); glPopMatrix(); } @@ -405,7 +405,7 @@ void GLScope::paintGL() glScalef(m_glScopeRect1.width() * (float)m_timeBase / (float)(m_displayTrace->size() - 1), -(m_glScopeRect1.height() / 2) * m_amp1, 1); glEnable(GL_BLEND); glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); - glEnable(GL_LINE_SMOOTH); + //glEnable(GL_LINE_SMOOTH); glLineWidth(1.0f); glColor4f(0, 1, 0, 0.5f); glBegin(GL_LINE_LOOP); @@ -416,7 +416,7 @@ void GLScope::paintGL() glVertex2f(x, negLimit); glEnd(); - glDisable(GL_LINE_SMOOTH); + //glDisable(GL_LINE_SMOOTH); glPopMatrix(); } } @@ -548,7 +548,7 @@ void GLScope::paintGL() glScalef(m_glScopeRect2.width(), -(m_glScopeRect2.height() / 2) * m_amp2, 1); glEnable(GL_BLEND); glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); - glEnable(GL_LINE_SMOOTH); + //glEnable(GL_LINE_SMOOTH); glLineWidth(1.0f); glColor4f(0, 1, 0, 0.5f); glBegin(GL_LINE_LOOP); @@ -561,7 +561,7 @@ void GLScope::paintGL() glVertex2f(0, m_triggerLevelLow); glVertex2f(1, m_triggerLevelLow); glEnd();*/ - glDisable(GL_LINE_SMOOTH); + //glDisable(GL_LINE_SMOOTH); glPopMatrix(); } @@ -572,7 +572,7 @@ void GLScope::paintGL() glScalef(m_glScopeRect2.width() * (float)m_timeBase / (float)(m_displayTrace->size() - 1), -(m_glScopeRect2.height() / 2) * m_amp2, 1); glEnable(GL_BLEND); glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); - glEnable(GL_LINE_SMOOTH); + //glEnable(GL_LINE_SMOOTH); glLineWidth(1.0f); glColor4f(1, 1, 0.25f, m_displayTraceIntensity / 100.0); int start = (m_timeOfsProMill/1000.0) * m_displayTrace->size(); @@ -591,7 +591,7 @@ void GLScope::paintGL() glVertex2f(i - start, v); } glEnd(); - glDisable(GL_LINE_SMOOTH); + //glDisable(GL_LINE_SMOOTH); glPopMatrix(); } @@ -610,7 +610,7 @@ void GLScope::paintGL() glScalef(m_glScopeRect2.width() * (float)m_timeBase / (float)(m_displayTrace->size() - 1), -(m_glScopeRect2.height() / 2) * m_amp2, 1); glEnable(GL_BLEND); glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); - glEnable(GL_LINE_SMOOTH); + //glEnable(GL_LINE_SMOOTH); glLineWidth(1.0f); glColor4f(0, 1, 0, 0.5f); glBegin(GL_LINE_LOOP); @@ -621,7 +621,7 @@ void GLScope::paintGL() glVertex2f(x, negLimit); glEnd(); - glDisable(GL_LINE_SMOOTH); + //glDisable(GL_LINE_SMOOTH); glPopMatrix(); } } diff --git a/sdrbase/gui/glspectrum.cpp b/sdrbase/gui/glspectrum.cpp index 4d68fb97e..c9c870aaa 100644 --- a/sdrbase/gui/glspectrum.cpp +++ b/sdrbase/gui/glspectrum.cpp @@ -810,7 +810,7 @@ void GLSpectrum::paintGL() glScalef(m_glHistogramRect.width() / (float)(m_fftSize - 1), -m_glHistogramRect.height() / m_powerRange, 1); glEnable(GL_BLEND); glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); - glEnable(GL_LINE_SMOOTH); + //glEnable(GL_LINE_SMOOTH); glLineWidth(1.0f); glColor4f(1, 0, 0, m_displayTraceIntensity / 100.0); Real bottom = -m_powerRange; @@ -824,7 +824,7 @@ void GLSpectrum::paintGL() glVertex2f(i, v); } glEnd(); - glDisable(GL_LINE_SMOOTH); + //glDisable(GL_LINE_SMOOTH); glPopMatrix(); } @@ -835,7 +835,7 @@ void GLSpectrum::paintGL() glScalef(m_glHistogramRect.width() / (float)(m_fftSize - 1), -m_glHistogramRect.height() / m_powerRange, 1); glEnable(GL_BLEND); glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); - glEnable(GL_LINE_SMOOTH); + //glEnable(GL_LINE_SMOOTH); glLineWidth(1.0f); glColor4f(1.0f, 1.0f, 0.25f, m_displayTraceIntensity / 100.0); // intense yellow Real bottom = -m_powerRange; @@ -849,7 +849,7 @@ void GLSpectrum::paintGL() glVertex2f(i, v); } glEnd(); - glDisable(GL_LINE_SMOOTH); + //glDisable(GL_LINE_SMOOTH); glPopMatrix(); }