VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-09-06 23:27:48 -04:00
Code Issues Projects Releases Wiki Activity

GLScope: suppress VLAs

Browse Source
This commit is contained in:
f4exb 2018-03-01 03:22:47 +01:00
parent e5ad63e9b3
commit 5c055ac2ad
2 changed files with 50 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
sdrgui/gui/glscope.cpp
View File

@ -287,8 +287,9 @@ void GLScope::paintGL()
if(!m_mutex.tryLock(2)) if(!m_mutex.tryLock(2))
return; return;
if(m_configChanged) if(m_configChanged) {
applyConfig(); applyConfig();
}
handleMode(); handleMode();
@ -327,7 +328,8 @@ void GLScope::paintGL()
tickList = &m_y1Scale.getTickList(); tickList = &m_y1Scale.getTickList();
{ {
GLfloat q3[4*tickList->count()]; //GLfloat q3[4*tickList->count()];
GLfloat *q3 = m_q3TickY1.m_array;
int effectiveTicks = 0; int effectiveTicks = 0;
for (int i= 0; i < tickList->count(); i++) for (int i= 0; i < tickList->count(); i++)
@ -357,7 +359,8 @@ void GLScope::paintGL()
// Vertical X1 // Vertical X1
tickList = &m_x1Scale.getTickList(); tickList = &m_x1Scale.getTickList();
GLfloat q3[4*tickList->count()]; //GLfloat q3[4*tickList->count()];
GLfloat *q3 = m_q3TickX1.m_array;
int effectiveTicks = 0; int effectiveTicks = 0;
for(int i= 0; i < tickList->count(); i++) { for(int i= 0; i < tickList->count(); i++) {
tick = &(*tickList)[i]; tick = &(*tickList)[i];
@ -451,6 +454,7 @@ void GLScope::paintGL()
if(m_displayTrace->size() > 0) if(m_displayTrace->size() > 0)
{ {
{ {
int start = (m_timeOfsProMill/1000.0) * m_displayTrace->size(); int start = (m_timeOfsProMill/1000.0) * m_displayTrace->size();
int end = std::min(start + m_displayTrace->size()/m_timeBase, m_displayTrace->size()); int end = std::min(start + m_displayTrace->size()/m_timeBase, m_displayTrace->size());
if(end - start < 2) if(end - start < 2)
@ -458,7 +462,9 @@ void GLScope::paintGL()
float posLimit = 1.0 / m_amp1; float posLimit = 1.0 / m_amp1;
float negLimit = -1.0 / m_amp1; float negLimit = -1.0 / m_amp1;
GLfloat q3[2*(end -start)]; //GLfloat q3[2*(end -start)];
m_q3Trace.allocate(2*(end - start));
GLfloat *q3 = m_q3Trace.m_array;
for (int i = start; i < end; i++) for (int i = start; i < end; i++)
{ {
@ -525,6 +531,7 @@ void GLScope::paintGL()
if (m_displayTrace->size() > 0) if (m_displayTrace->size() > 0)
{ {
{ {
int start = (m_timeOfsProMill/1000.0) * m_displayTrace->size(); int start = (m_timeOfsProMill/1000.0) * m_displayTrace->size();
int end = std::min(start + m_displayTrace->size()/m_timeBase, m_displayTrace->size()); int end = std::min(start + m_displayTrace->size()/m_timeBase, m_displayTrace->size());
@ -532,10 +539,13 @@ void GLScope::paintGL()
start--; start--;
} }
float posLimit = 1.0 / m_amp2; float posLimit = 1.0 / m_amp2;
float negLimit = -1.0 / m_amp2; float negLimit = -1.0 / m_amp2;
GLfloat q3[2*(end - start)]; //GLfloat q3[2*(end - start)];
m_q3Trace.allocate(2*(end - start));
GLfloat *q3 = m_q3Trace.m_array;
for(int i = start; i < end; i++) for(int i = start; i < end; i++)
{ {
@ -573,7 +583,8 @@ void GLScope::paintGL()
// Horizontal Y2 // Horizontal Y2
tickList = &m_y2Scale.getTickList(); tickList = &m_y2Scale.getTickList();
{ {
GLfloat q3[4*tickList->count()]; //GLfloat q3[4*tickList->count()];
GLfloat *q3 = m_q3TickY2.m_array;
int effectiveTicks = 0; int effectiveTicks = 0;
for(int i= 0; i < tickList->count(); i++) { for(int i= 0; i < tickList->count(); i++) {
tick = &(*tickList)[i]; tick = &(*tickList)[i];
@ -637,7 +648,8 @@ void GLScope::paintGL()
// Horizontal Y2 // Horizontal Y2
tickList = &m_y2Scale.getTickList(); tickList = &m_y2Scale.getTickList();
{ {
GLfloat q3[4*tickList->count()]; //GLfloat q3[4*tickList->count()];
GLfloat *q3 = m_q3TickY2.m_array;
int effectiveTicks = 0; int effectiveTicks = 0;
for(int i= 0; i < tickList->count(); i++) { for(int i= 0; i < tickList->count(); i++) {
tick = &(*tickList)[i]; tick = &(*tickList)[i];
@ -660,7 +672,8 @@ void GLScope::paintGL()
// Vertical X2 // Vertical X2
tickList = &m_x2Scale.getTickList(); tickList = &m_x2Scale.getTickList();
{ {
GLfloat q3[4*tickList->count()]; //GLfloat q3[4*tickList->count()];
GLfloat *q3 = m_q3TickX2.m_array;
int effectiveTicks = 0; int effectiveTicks = 0;
for(int i= 0; i < tickList->count(); i++) { for(int i= 0; i < tickList->count(); i++) {
tick = &(*tickList)[i]; tick = &(*tickList)[i];
@ -750,14 +763,19 @@ void GLScope::paintGL()
{ {
if (m_mode == ModeIQPolar) if (m_mode == ModeIQPolar)
{ {
int start = (m_timeOfsProMill/1000.0) * m_displayTrace->size(); int start = (m_timeOfsProMill/1000.0) * m_displayTrace->size();
int end = std::min(start + m_displayTrace->size()/m_timeBase, m_displayTrace->size()); int end = std::min(start + m_displayTrace->size()/m_timeBase, m_displayTrace->size());
if (end - start < 2) { if (end - start < 2) {
start--; start--;
} }
{
GLfloat q3[2*(end - start)];
{
//GLfloat q3[2*(end - start)];
m_q3Trace.allocate(2*(end - start));
GLfloat *q3 = m_q3Trace.m_array;
for(int i = start; i < end; i++) for(int i = start; i < end; i++)
{ {
@ -802,10 +820,13 @@ void GLScope::paintGL()
start--; start--;
} }
float posLimit = 1.0 / m_amp2; float posLimit = 1.0 / m_amp2;
float negLimit = -1.0 / m_amp2; float negLimit = -1.0 / m_amp2;
GLfloat q3[2*(end - start)]; //GLfloat q3[2*(end - start)];
m_q3Trace.allocate(2*(end - start));
GLfloat *q3 = m_q3Trace.m_array;
for(int i = start; i < end; i++) { for(int i = start; i < end; i++) {
float v = (*m_displayTrace)[i].imag(); float v = (*m_displayTrace)[i].imag();
@ -2122,6 +2143,16 @@ void GLScope::applyConfig()
} // X2 scale } // X2 scale
} // Secondary display only } // Secondary display only
m_q3TickY1.allocate(4*m_y1Scale.getTickList().count());
m_q3TickY2.allocate(4*m_y2Scale.getTickList().count());
m_q3TickX1.allocate(4*m_x1Scale.getTickList().count());
m_q3TickX2.allocate(4*m_x1Scale.getTickList().count());
}
void GLScope::applyTraceConfig(uint32_t size)
{
m_q3Trace.allocate(2*size);
} }
void GLScope::tick() void GLScope::tick()

8
sdrgui/gui/glscope.h
View File

@ -34,6 +34,7 @@
#include "gui/glshadertextured.h" #include "gui/glshadertextured.h"
#include "util/export.h" #include "util/export.h"
#include "util/bitfieldindex.h" #include "util/bitfieldindex.h"
#include "util/incrementalarray.h"
class ScopeVis; class ScopeVis;
class QPainter; class QPainter;
@ -167,6 +168,12 @@ private:
GLShaderTextured m_glShaderBottom2Scale; GLShaderTextured m_glShaderBottom2Scale;
GLShaderTextured m_glShaderPowerOverlay; GLShaderTextured m_glShaderPowerOverlay;
IncrementalArray<GLfloat> m_q3Trace;
IncrementalArray<GLfloat> m_q3TickY1;
IncrementalArray<GLfloat> m_q3TickY2;
IncrementalArray<GLfloat> m_q3TickX1;
IncrementalArray<GLfloat> m_q3TickX2;
void initializeGL(); void initializeGL();
void resizeGL(int width, int height); void resizeGL(int width, int height);
void paintGL(); void paintGL();
@ -175,6 +182,7 @@ private:
void handleMode(); void handleMode();
void applyConfig(); void applyConfig();
void applyTraceConfig(uint32_t size);
void drawPowerOverlay(); void drawPowerOverlay();
protected slots: protected slots: