chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-05 02:30:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed vertarray buffer overrun (forgot to allocate the extra bit)

Browse Source
This commit is contained in:
Mark Watkins 2011-08-02 14:20:26 +10:00
parent bf4fafb862
commit 2c0069d46a
16 changed files with 87 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Graphs/gBarChart.h
View File

@ -28,6 +28,7 @@ class gBarChart:public gLayer
virtual const QString & FormatY(double v) { static QString t; t.sprintf("%.1f",v); return t; }
gXAxis *Xaxis;
QVector<QColor> color;
};
#endif // GBARCHART_H

20
Graphs/gFlagsLine.cpp
View File

@ -67,11 +67,9 @@ void gFlagsGroup::Plot(gGraphWindow &w, float scrx, float scry)
}
gFlagsLine::gFlagsLine(ChannelID code,QColor col,QString label,bool always_visible,FlagType flt)
:gLayer(code),m_label(label),m_always_visible(always_visible),m_flt(flt)
gFlagsLine::gFlagsLine(ChannelID code,QColor flag_color,QString label,bool always_visible,FlagType flt)
:gLayer(code),m_label(label),m_always_visible(always_visible),m_flt(flt),m_flag_color(flag_color)
{
color.clear();
color.push_back(col);
}
gFlagsLine::~gFlagsLine()
{
@ -111,16 +109,18 @@ void gFlagsLine::Plot(gGraphWindow & w,float scrx,float scry)
float line_top=(start_py+height-line_h)-line_num*line_h;
// Alternating box color
QColor *barcol=&col2;
QColor * barcol=&col2;
if (line_num & 1)
barcol=&col1;
int qo=0;
//if (evil_intel_graphics_card) qo=1;
// Filled rectangle
glColor4ub(barcol->red(),barcol->green(),barcol->blue(),barcol->alpha());
w.qglColor(*barcol);
glBegin(GL_QUADS);
glVertex2f(start_px+1, line_top);
glVertex2f(start_px+1, line_top+line_h);
glVertex2f(start_px+qo, line_top);
glVertex2f(start_px+qo, line_top+line_h);
glVertex2f(start_px+width-1, line_top+line_h);
glVertex2f(start_px+width-1, line_top);
glEnd();
@ -140,8 +140,6 @@ void gFlagsLine::Plot(gGraphWindow & w,float scrx,float scry)
DrawText(w,m_label,start_px-x-10,(scry-line_top)-(line_h/2)+(y/2));
float x1,x2;
QColor & col=color[0];
float top=floor(line_top)+2;
float bottom=top+floor(line_h)-3;
@ -176,7 +174,6 @@ void gFlagsLine::Plot(gGraphWindow & w,float scrx,float scry)
}
}
}
glColor4ub(col.red(),col.green(),col.blue(),col.alpha());
glScissor(w.GetLeftMargin(),w.GetBottomMargin(),width,height);
glEnable(GL_SCISSOR_TEST);
@ -190,6 +187,7 @@ void gFlagsLine::Plot(gGraphWindow & w,float scrx,float scry)
} else glLineWidth (1);
glEnableClientState(GL_VERTEX_ARRAY);
w.qglColor(m_flag_color);
if (quadcnt>0) {
glVertexPointer(2, GL_SHORT, 0, quadarray);
glDrawArrays(GL_QUADS, 0, quadcnt>>1);

1
Graphs/gFlagsLine.h
View File

@ -30,6 +30,7 @@ class gFlagsLine:public gLayer
bool m_always_visible;
int total_lines,line_num;
FlagType m_flt;
QColor m_flag_color;
};
class gFlagsGroup:public gLayerGroup

23
Graphs/gFooBar.cpp
View File

@ -6,12 +6,9 @@
#include "gFooBar.h"
gFooBar::gFooBar(int offset,QColor col1,QColor col2,bool funkbar)
:gLayer(EmptyChannel),m_funkbar(funkbar),m_offset(offset)
gFooBar::gFooBar(int offset,QColor handle_color,QColor line_color,bool shadow,QColor shadow_color)
:gLayer(EmptyChannel),m_offset(offset),m_shadow(shadow),m_handle_color(handle_color),m_line_color(line_color),m_shadow_color(shadow_color)
{
color.clear();
color.push_back(col2);
color.push_back(col1);
}
gFooBar::~gFooBar()
{
@ -30,15 +27,12 @@ void gFooBar::Plot(gGraphWindow & w,float scrx,float scry)
int height=scry - (w.GetTopMargin() + w.GetBottomMargin());
int end_px=scrx-w.GetRightMargin();
QColor & col1=color[0];
QColor & col2=color[1];
glDisable(GL_DEPTH_TEST);
float h=m_offset;
glColor4ub(col1.red(),col1.green(),col1.blue(),col1.alpha());
glLineWidth(1);
glBegin(GL_LINES);
w.qglColor(m_line_color);
glVertex2f(start_px, h);
glVertex2f(start_px+width, h);
glEnd();
@ -47,30 +41,27 @@ void gFooBar::Plot(gGraphWindow & w,float scrx,float scry)
double px=((1/rmx)*(w.min_x-w.rmin_x))*width;
double py=((1/rmx)*(w.max_x-w.rmin_x))*width;
glColor4ub(col2.red(),col2.green(),col2.blue(),col2.alpha());
glLineWidth(4);
glBegin(GL_LINES);
w.qglColor(m_handle_color);
glVertex2f(start_px+px-4,h);
glVertex2f(start_px+py+4,h);
glEnd();
glLineWidth(1);
if ((m_funkbar)) { // && ((w.min_x>w.rmin_x) || (w.max_x<w.rmax_x))) {
if ((m_shadow)) {
glEnable(GL_BLEND);
glBlendFunc(GL_SRC_ALPHA,GL_ONE_MINUS_SRC_ALPHA);
glColor4f(.2,.2,.2,.2);
glBegin(GL_QUADS);
w.qglColor(m_shadow_color);
glVertex2f(start_px, w.GetBottomMargin());
glVertex2f(start_px, w.GetBottomMargin()+height);
glVertex2f(start_px+px, w.GetBottomMargin()+height);
glVertex2f(start_px+px, w.GetBottomMargin());
//glEnd();
//glDisable(GL_BLEND);
//glColor4f(.2,.2,.2,.3);
//glBegin(GL_QUADS);
glVertex2f(start_px+py, w.GetBottomMargin());
glVertex2f(start_px+py, w.GetBottomMargin()+height);
glVertex2f(end_px, w.GetBottomMargin()+height);

7
Graphs/gFooBar.h
View File

@ -12,13 +12,16 @@
class gFooBar:public gLayer
{
public:
gFooBar(int offset=10,QColor color1=QColor("orange"),QColor color2=QColor("dark grey"),bool funkbar=false);
gFooBar(int offset=10,QColor handle_color=QColor("orange"),QColor line_color=QColor("dark grey"),bool shadow=false,QColor shadow_color=QColor(40,40,40,40));
virtual ~gFooBar();
virtual void Plot(gGraphWindow & w,float scrx,float scry);
static const int Margin=15;
protected:
bool m_funkbar;
int m_offset;
QColor m_line_color;
QColor m_handle_color;
QColor m_shadow_color;
bool m_shadow;
};
#endif // GFOOBAR_H

6
Graphs/gLineOverlay.cpp
View File

@ -11,8 +11,7 @@
gLineOverlayBar::gLineOverlayBar(ChannelID code,QColor col,QString label,FlagType flt)
:gLayer(code),m_label(label),m_flt(flt)
{
color.clear();
color.push_back(col);
m_flag_color=col;
}
gLineOverlayBar::~gLineOverlayBar()
{
@ -51,7 +50,6 @@ void gLineOverlayBar::Plot(gGraphWindow & w,float scrx,float scry)
}
float bottom=start_py+25, top=start_py+height-25;
QColor & col=color[0];
double X;
double Y;
@ -141,7 +139,7 @@ void gLineOverlayBar::Plot(gGraphWindow & w,float scrx,float scry)
} else glLineWidth (1);
glEnableClientState(GL_VERTEX_ARRAY);
glColor4ub(col.red(),col.green(),col.blue(),col.alpha());
w.qglColor(m_flag_color);
if (quadcnt>0) {
//glEnableClientState(GL_VERTEX_ARRAY);
glVertexPointer(2, GL_SHORT, 0, quadarray);

3
Graphs/gLineOverlay.h
View File

@ -12,7 +12,7 @@
class gLineOverlayBar:public gLayer
{
public:
gLineOverlayBar(ChannelID code,QColor col=QColor("black"),QString _label="",FlagType _flt=FT_Bar);
gLineOverlayBar(ChannelID code,QColor col,QString _label="",FlagType _flt=FT_Bar);
virtual ~gLineOverlayBar();
virtual void Plot(gGraphWindow & w,float scrx,float scry);
@ -20,6 +20,7 @@ class gLineOverlayBar:public gLayer
virtual EventDataType Maxy() { return 0; }
virtual bool isEmpty() { return true; }
protected:
QColor m_flag_color;
QString m_label;
FlagType m_flt;
};

1
Graphs/gSessionTime.h
View File

@ -37,6 +37,7 @@ class gSessionTime:public gLayer
virtual const QString & FormatY(double v) { static QString t; t.sprintf("%.1f",v); return t; }
gXAxis *Xaxis;
QVector<QColor> color;
};
#endif // GSESSIONTIME_H

10
Graphs/gXAxis.cpp
View File

@ -1,8 +1,8 @@
/********************************************************************
/*
gXAxis Implementation
Copyright (c)2011 Mark Watkins <jedimark@users.sourceforge.net>
License: GPL
*********************************************************************/
*/
#include <math.h>
#include <QDebug>
@ -11,8 +11,10 @@
gXAxis::gXAxis(QColor col)
:gLayer(EmptyChannel)
{
color.clear();
color.push_back(col);
m_line_color=col;
m_text_color=col;
m_major_color=Qt::darkGray;
m_minor_color=Qt::lightGray;
m_show_major_lines=false;
m_show_minor_lines=false;
m_show_minor_ticks=true;

5
Graphs/gXAxis.h
View File

@ -31,5 +31,10 @@ class gXAxis:public gLayer
bool m_show_minor_ticks;
bool m_show_major_ticks;
QColor m_line_color;
QColor m_text_color;
QColor m_major_color;
QColor m_minor_color;
};
#endif // GXAXIS_H

56
Graphs/gYAxis.cpp
View File

@ -11,8 +11,10 @@
gYAxis::gYAxis(QColor col)
:gLayer(EmptyChannel)
{
color.clear();
color.push_back(col);
m_line_color=col;
m_text_color=col;
m_major_color=Qt::darkGray;
m_minor_color=Qt::lightGray;
m_show_major_lines=true;
m_show_minor_lines=true;
@ -23,8 +25,6 @@ gYAxis::~gYAxis()
}
void gYAxis::Plot(gGraphWindow &w,float scrx,float scry)
{
static QColor DARK_GREY(0xc0,0xc0,0xc0,0x80);
static QColor LIGHT_GREY(0xd8,0xd8,0xd8,0x80);
float x,y;
int labelW=0;
@ -79,9 +79,6 @@ void gYAxis::Plot(gGraphWindow &w,float scrx,float scry)
int height=scry-(topm+start_py);
if (height<0) return;
const QColor & linecol1=LIGHT_GREY;
const QColor & linecol2=DARK_GREY;
QString fd="0";
GetTextExtent(fd,x,y);
@ -102,14 +99,17 @@ void gYAxis::Plot(gGraphWindow &w,float scrx,float scry)
float ty,h;
qint32 vertcnt=0;
GLshort * vertarray=vertex_array[0];
if (vertarray==NULL) {
qWarning() << "VertArray==NULL";
GLshort * vertarray=(GLshort *)vertex_array[0];
qint32 minorvertcnt=0;
GLshort * minorvertarray=(GLshort *)vertex_array[1];
qint32 majorvertcnt=0;
GLshort * majorvertarray=(GLshort *)vertex_array[2];
if ((vertarray==NULL) || (minorvertarray==NULL) || (majorvertarray==NULL)) {
qWarning() << "gYAxis::Plot() VertArray==NULL";
return;
}
glColor4ub(linecol1.red(),linecol1.green(),linecol1.blue(),linecol1.alpha());
glLineWidth(1);
if (min_ytick<=0) {
qDebug() << "min_ytick error in gYAxis::Plot()";
return;
@ -127,14 +127,14 @@ void gYAxis::Plot(gGraphWindow &w,float scrx,float scry)
vertarray[vertcnt++]=start_px;
vertarray[vertcnt++]=h;
if (m_show_minor_lines && (i > miny)) {
glBegin(GL_LINES);
glVertex2f(start_px+1, h);
glVertex2f(start_px+width, h);
glEnd();
minorvertarray[minorvertcnt++]=start_px+1;
minorvertarray[minorvertcnt++]=h;
minorvertarray[minorvertcnt++]=start_px+width;
minorvertarray[minorvertcnt++]=h;
}
if (vertcnt>maxverts) {
qWarning() << "vertarray bounds exceeded in gYAxis for " << w.Title() << "graph" << "MinY =" <<miny << "MaxY =" << maxy << "min_ytick=" <<min_ytick;
return;
break;
}
}
@ -144,7 +144,7 @@ void gYAxis::Plot(gGraphWindow &w,float scrx,float scry)
GetTextExtent(fd,x,y);
if (x>labelW) labelW=x;
h=start_py+ty;
DrawText(w,fd,start_px-12-x,scry-(h-(y/2.0)),0);
DrawText(w,fd,start_px-12-x,scry-(h-(y/2.0)),0,m_text_color);
vertarray[vertcnt++]=start_px-4;
vertarray[vertcnt++]=h;
@ -156,11 +156,10 @@ void gYAxis::Plot(gGraphWindow &w,float scrx,float scry)
}
if (m_show_major_lines && (i > miny)) {
glColor4ub(linecol2.red(),linecol2.green(),linecol2.blue(),linecol2.alpha());
glBegin(GL_LINES);
glVertex2f(start_px+1, h);
glVertex2f(start_px+width, h);
glEnd();
majorvertarray[majorvertcnt++]=start_px+1;
majorvertarray[majorvertcnt++]=h;
majorvertarray[majorvertcnt++]=start_px+width;
majorvertarray[majorvertcnt++]=h;
}
}
if (vertcnt>=maxverts) {
@ -168,12 +167,19 @@ void gYAxis::Plot(gGraphWindow &w,float scrx,float scry)
return;
}
// Draw the little ticks.
// Draw the lines & ticks
// Turn on blending??
glLineWidth(1);
glColor3f(0,0,0);
w.qglColor(m_line_color);
glEnableClientState(GL_VERTEX_ARRAY);
glVertexPointer(2, GL_SHORT, 0, vertarray);
glDrawArrays(GL_LINES, 0, vertcnt>>1);
w.qglColor(m_minor_color);
glVertexPointer(2, GL_SHORT, 0, minorvertarray);
glDrawArrays(GL_LINES, 0, minorvertcnt>>1);
w.qglColor(m_major_color);
glVertexPointer(2, GL_SHORT, 0, majorvertarray);
glDrawArrays(GL_LINES, 0, majorvertcnt>>1);
glDisableClientState(GL_VERTEX_ARRAY); // deactivate vertex arrays after drawing
}

10
Graphs/gYAxis.h
View File

@ -1,8 +1,8 @@
/********************************************************************
/*
gYAxis Header
Copyright (c)2011 Mark Watkins <jedimark@users.sourceforge.net>
License: GPL
*********************************************************************/
*/
#ifndef GYAXIS_H
#define GYAXIS_H
@ -34,6 +34,12 @@ class gYAxis:public gLayer
bool m_show_minor_ticks;
bool m_show_major_ticks;
float m_yaxis_scale;
QColor m_line_color;
QColor m_text_color;
QColor m_major_color;
QColor m_minor_color;
};
#endif // GYAXIS_H

8
Graphs/glcommon.cpp
View File

@ -19,19 +19,19 @@ QFont * defaultfont=NULL;
QFont * mediumfont=NULL;
QFont * bigfont=NULL;
GLshort *vertex_array[num_vert_arrays]={NULL};
GLshort * vertex_array[num_vert_arrays]={0};
bool evil_intel_graphics_chip=false;
// Must be called from a thread inside the application.
void InitGraphs()
{
if (!_graph_init) {
defaultfont=new QFont("FreeSans",10);
bigfont=new QFont("FreeSans",35);
mediumfont=new QFont("FreeSans",18);
for (int i=0;i<num_vert_arrays;i++) {
vertex_array[i]=new GLshort[maxverts];
GLshort *a=(GLshort *)calloc(maxverts+8,sizeof(GLshort));
vertex_array[i]=a;
}
_graph_init=true;
}
@ -43,7 +43,7 @@ void DoneGraphs()
delete bigfont;
delete mediumfont;
for (int i=0;i<num_vert_arrays;i++) {
delete [] vertex_array[i];
free(vertex_array[i]);
}
_graph_init=false;
}

4
Graphs/graphlayer.cpp
View File

@ -11,8 +11,8 @@ gLayer::gLayer(ChannelID code,QString title)
{
m_visible = true;
m_movable = false;
color.push_back(QColor("red"));
color.push_back(QColor("green"));
//color.push_back(QColor("red"));
//color.push_back(QColor("green"));
m_day=NULL;
m_miny=m_maxy=0;
m_minx=m_maxx=0;

4
Graphs/graphlayer.h
View File

@ -20,7 +20,7 @@ public:
gLayer(ChannelID code=EmptyChannel,QString title="");
virtual ~gLayer();
virtual void Plot(gGraphWindow & w,float scrx,float scry)=0;
QVector<QColor> color;
//QVector<QColor> color;
virtual void SetDay(Day * d);
virtual void SetCode(ChannelID c) { m_code=c; }
@ -42,8 +42,8 @@ protected:
bool m_movable;
qint64 m_minx,m_maxx;
EventDataType m_miny,m_maxy;
QString m_title;
ChannelID m_code;
QString m_title;
};
class gLayerGroup:public gLayer

2
Graphs/graphwindow.cpp
View File

@ -45,6 +45,7 @@ gGraphWindow::gGraphWindow(QWidget *parent, const QString & title, QGLWidget * s
min_x=max_x=0;
rmin_y=rmax_y=0;
min_y=max_y=0;
InitGraphs();
}
/*gGraphWindow::gGraphWindow(QWidget *parent, const QString & title, QGLContext * context,Qt::WindowFlags f)
@ -862,7 +863,6 @@ void gGraphWindow::paintGL()
if (m_scrX<=0) return;
if (m_scrY<=0) return;
InitGraphs();
//glDisable(GL_DEPTH_TEST);
Render(m_scrX,m_scrY);