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

GLScopeMulti: suppress VLAs

Browse Source
This commit is contained in:
f4exb 2018-03-01 03:22:30 +01:00
parent 9c882a59aa
commit e5ad63e9b3
2 changed files with 40 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
sdrgui/gui/glscopemulti.cpp
View File

@ -213,7 +213,8 @@ void GLScopeMulti::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++)
@ -243,7 +244,8 @@ void GLScopeMulti::paintGL()
{ {
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];
@ -386,7 +388,8 @@ void GLScopeMulti::paintGL()
{ {
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++)
@ -416,7 +419,8 @@ void GLScopeMulti::paintGL()
{ {
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];
@ -566,7 +570,8 @@ void GLScopeMulti::paintGL()
// Horizontal Y1 // Horizontal Y1
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++)
@ -594,7 +599,8 @@ void GLScopeMulti::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];
@ -655,7 +661,8 @@ void GLScopeMulti::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];
@ -782,7 +789,8 @@ void GLScopeMulti::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];
@ -805,7 +813,8 @@ void GLScopeMulti::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];
@ -871,7 +880,8 @@ void GLScopeMulti::paintGL()
if(end - start < 2) if(end - start < 2)
start--; start--;
GLfloat q3[2*(end - start)]; //GLfloat q3[2*(end - start)];
GLfloat *q3 = m_q3Polar.m_array;
const float *trace0 = (*m_traces)[0]; const float *trace0 = (*m_traces)[0];
memcpy(q3, &(trace0[2*start+1]), (2*(end - start) - 1)*sizeof(float)); // copy X values memcpy(q3, &(trace0[2*start+1]), (2*(end - start) - 1)*sizeof(float)); // copy X values
@ -1018,6 +1028,19 @@ void GLScopeMulti::applyConfig()
{ {
setPolarDisplays(); setPolarDisplays();
} }
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());
int start = (m_timeOfsProMill/1000.0) * m_traceSize;
int end = std::min(start + m_traceSize/m_timeBase, m_traceSize);
if(end - start < 2)
start--;
m_q3Polar.allocate(2*(end - start));
} }
void GLScopeMulti::setUniqueDisplays() void GLScopeMulti::setUniqueDisplays()

7
sdrgui/gui/glscopemulti.h
View File

@ -31,6 +31,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 QPainter; class QPainter;
@ -131,6 +132,12 @@ private:
GLShaderTextured m_glShaderBottom2Scale; GLShaderTextured m_glShaderBottom2Scale;
GLShaderTextured m_glShaderPowerOverlay; GLShaderTextured m_glShaderPowerOverlay;
IncrementalArray<GLfloat> m_q3Polar;
IncrementalArray<GLfloat> m_q3TickY1;
IncrementalArray<GLfloat> m_q3TickY2;
IncrementalArray<GLfloat> m_q3TickX1;
IncrementalArray<GLfloat> m_q3TickX2;
static const int m_topMargin = 5; static const int m_topMargin = 5;
static const int m_botMargin = 20; static const int m_botMargin = 20;
static const int m_leftMargin = 35; static const int m_leftMargin = 35;