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

Interim Blank Event Breakdown

Browse Source
This commit is contained in:
Mark Watkins 2011-08-07 17:46:59 +10:00
parent c0a7559a85
commit afc483dbf1
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Graphs/gSegmentChart.cpp
View File

@ -44,7 +44,7 @@ void gSegmentChart::Plot(gGraphWindow & w,float scrx,float scry)
{ {
if (!m_visible) return; if (!m_visible) return;
if (!m_day) return; if (!m_day) return;
if (!m_total) return; //if (!m_total) return;
int start_px=w.GetLeftMargin(); int start_px=w.GetLeftMargin();
int start_py=w.GetBottomMargin(); int start_py=w.GetBottomMargin();
int width=scrx-(w.GetLeftMargin()+w.GetRightMargin()); int width=scrx-(w.GetLeftMargin()+w.GetRightMargin());
@ -59,10 +59,6 @@ void gSegmentChart::Plot(gGraphWindow & w,float scrx,float scry)
float step=1.0/45.0; float step=1.0/45.0;
float px,py; float px,py;
float q; float q;
glEnable(GL_BLEND);
glEnable(GL_LINE_SMOOTH);
glLineWidth(1.5);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
float xmult=float(width)/float(m_total); float xmult=float(width)/float(m_total);
float ymult=float(height)/float(m_total); float ymult=float(height)/float(m_total);
@ -71,13 +67,26 @@ void gSegmentChart::Plot(gGraphWindow & w,float scrx,float scry)
int xoffset=width/2; int xoffset=width/2;
int yoffset=height/2; int yoffset=height/2;
if (m_total==0) {
w.qglColor(Qt::green);
QString a=":-)";
float x,y;
GetTextExtent(a,x,y,bigfont);
w.renderText(start_px+xoffset-x/2, scry-(start_py+yoffset-y/2),a,*bigfont);
return;
}
glEnable(GL_BLEND);
glEnable(GL_LINE_SMOOTH);
glLineWidth(1.5);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
int data; int data;
unsigned size=m_values.size(); unsigned size=m_values.size();
float line_step=float(width)/float(size-1); float line_step=float(width)/float(size-1);
bool line_first=true; bool line_first=true;
int line_last; int line_last;
if (m_graph_type==GST_Line) { if (m_graph_type==GST_Line) {
w.qglColor(m_outline_color); w.qglColor(m_outline_color);
glBegin(GL_LINES); glBegin(GL_LINES);

2
daily.cpp
View File

@ -61,8 +61,10 @@ Daily::Daily(QWidget *parent,QGLWidget * shared, MainWindow *mw)
ui->graphLayout->addWidget(scrollArea,1); ui->graphLayout->addWidget(scrollArea,1);
scrollArea->setWidgetResizable(true); scrollArea->setWidgetResizable(true);
scrollArea->setAutoFillBackground(false);
GraphLayout=new QWidget(scrollArea); GraphLayout=new QWidget(scrollArea);
GraphLayout->setAutoFillBackground(false);
scrollArea->setWidget(GraphLayout); scrollArea->setWidget(GraphLayout);
splitter=new QVBoxLayout(GraphLayout); splitter=new QVBoxLayout(GraphLayout);