diff options
author | Nino Miškić-Pletenac <nino.mip@gmail.com> | 2018-03-01 01:35:00 +0100 |
---|---|---|
committer | Nino Miškić-Pletenac <nino.mip@gmail.com> | 2018-03-01 01:35:00 +0100 |
commit | dc3a37717eff48765b98b2f8bd7c708caac6887f (patch) | |
tree | 7dfae77a9566b08f57174f72c2671b4f5bcdaa12 /src/waveform/renderers/glwaveformrenderersimplesignal.cpp | |
parent | 003980d8329058824f4cfd810d6597186859d6b1 (diff) |
Fix all the renderers to scale up correctly
Diffstat (limited to 'src/waveform/renderers/glwaveformrenderersimplesignal.cpp')
-rw-r--r-- | src/waveform/renderers/glwaveformrenderersimplesignal.cpp | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/src/waveform/renderers/glwaveformrenderersimplesignal.cpp b/src/waveform/renderers/glwaveformrenderersimplesignal.cpp index 83ae00dac7..f825058d86 100644 --- a/src/waveform/renderers/glwaveformrenderersimplesignal.cpp +++ b/src/waveform/renderers/glwaveformrenderersimplesignal.cpp @@ -97,10 +97,7 @@ void GLWaveformRendererSimpleSignal::draw(QPainter* painter, QPaintEvent* /*even } glEnd(); - glLineWidth(2.0); - glEnable(GL_LINE_SMOOTH); - - glBegin(GL_LINES); { + glBegin(GL_QUADS); { for (int visualIndex = firstVisualIndex; visualIndex < lastVisualIndex; visualIndex += 2) { @@ -114,8 +111,10 @@ void GLWaveformRendererSimpleSignal::draw(QPainter* painter, QPaintEvent* /*even maxAll[0] = (float)data[visualIndex].filtered.all; maxAll[1] = (float)data[visualIndex+1].filtered.all; glColor4f(m_signalColor_r, m_signalColor_g, m_signalColor_b, 0.9); - glVertex2f(visualIndex,maxAll[0]); - glVertex2f(visualIndex,-1.f*maxAll[1]); + glVertex2f(visualIndex - 1.0f, maxAll[0]); + glVertex2f(visualIndex - 1.0f, -1.0f * maxAll[1]); + glVertex2f(visualIndex + 1.0f, -1.0f * maxAll[1]); + glVertex2f(visualIndex + 1.0f, maxAll[0]); } } glEnd(); @@ -138,10 +137,7 @@ void GLWaveformRendererSimpleSignal::draw(QPainter* painter, QPaintEvent* /*even glScalef(1.f, allGain, 1.f); - glLineWidth(2.0); - glEnable(GL_LINE_SMOOTH); - - glBegin(GL_LINES); { + glBegin(GL_QUADS); { for (int visualIndex = firstVisualIndex; visualIndex < lastVisualIndex; visualIndex += 2) { @@ -155,8 +151,10 @@ void GLWaveformRendererSimpleSignal::draw(QPainter* painter, QPaintEvent* /*even maxAll[0] = (float)data[visualIndex].filtered.all; maxAll[1] = (float)data[visualIndex+1].filtered.all; glColor4f(m_signalColor_r, m_signalColor_g, m_signalColor_b, 0.8); - glVertex2f(float(visualIndex),0.f); - glVertex2f(float(visualIndex),math_max(maxAll[0],maxAll[1])); + glVertex2f(float(visualIndex) - 1.0f, 0.0f); + glVertex2f(float(visualIndex) - 1.0f, math_max(maxAll[0], maxAll[1])); + glVertex2f(float(visualIndex) + 1.0f, math_max(maxAll[0], maxAll[1])); + glVertex2f(float(visualIndex) + 1.0f, 0.0f); } } glEnd(); |