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

More Print Cleanups

Browse Source
This commit is contained in:
Mark Watkins 2011-09-12 00:36:51 +10:00
parent 87e7882dea
commit 94c0dc3702
4 changed files with 23 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Graphs/gGraphView.cpp
View File

@ -1285,11 +1285,12 @@ void gGraphView::DrawTextQue()
//glFlush(); //glFlush();
//glEnable(GL_BLEND); //glEnable(GL_BLEND);
int w,h; int w,h;
QPaintDevice *pd=QGLContext::currentContext()->device();
/* #ifdef Q_WS_WIN32 /* #ifdef Q_WS_WIN32
QPaintDevice *pd=QGLContext::currentContext()->device();
QPixmap *pixmap=dynamic_cast<QPixmap *>(pd); QPixmap *pixmap=dynamic_cast<QPixmap *>(pd);
#endif */ #endif */
QPainter painter;
for (int i=0;i<m_textque_items;i++) { for (int i=0;i<m_textque_items;i++) {
// GL Font drawing is ass in Qt.. :( // GL Font drawing is ass in Qt.. :(
@ -1301,7 +1302,6 @@ void gGraphView::DrawTextQue()
renderText(q.x,q.y,q.text,*q.font); renderText(q.x,q.y,q.text,*q.font);
//painter.drawText(q.x, q.y, q.text); //painter.drawText(q.x, q.y, q.text);
} else { } else {
QPainter painter;
/*#ifdef Q_WS_WIN32 /*#ifdef Q_WS_WIN32
if (pixmap) { if (pixmap) {
painter.begin(pd); painter.begin(pd);
@ -1319,22 +1319,6 @@ void gGraphView::DrawTextQue()
painter.rotate(+q.angle); painter.rotate(+q.angle);
painter.translate(-q.x, -q.y); painter.translate(-q.x, -q.y);
painter.end(); painter.end();
/*QString c;
int x=q.x-4;
int y=q.y-(w)/2;
int tp=y;
qDebug() << "DrawText" << q.text << "@" <<x<< ","<< y;
for (int i=0;i<q.text.length();i++) {
c=q.text[i];
GetTextExtent(c, w, h, q.font);
if (c==" ") {
y=tp;
x+=w+6;
}
painter.drawText(x-w/2,y,c);
y+=h+3;
} */
} }
q.text.clear(); q.text.clear();
//q.text.squeeze(); //q.text.squeeze();

3
overview.cpp
View File

@ -14,6 +14,8 @@
#include "Graphs/gLineChart.h" #include "Graphs/gLineChart.h"
#include "Graphs/gYAxis.h" #include "Graphs/gYAxis.h"
const int default_height=220;
Overview::Overview(QWidget *parent,Profile * _profile,gGraphView * shared) : Overview::Overview(QWidget *parent,Profile * _profile,gGraphView * shared) :
QWidget(parent), QWidget(parent),
ui(new Ui::Overview), ui(new Ui::Overview),
@ -48,7 +50,6 @@ Overview::Overview(QWidget *parent,Profile * _profile,gGraphView * shared) :
layout->layout(); layout->layout();
const int default_height=180;
AHI=new gGraph(GraphView,"AHI",default_height,0); AHI=new gGraph(GraphView,"AHI",default_height,0);
UC=new gGraph(GraphView,"Usage",default_height,0); UC=new gGraph(GraphView,"Usage",default_height,0);
PR=new gGraph(GraphView,"Pressure",default_height,0); PR=new gGraph(GraphView,"Pressure",default_height,0);

34
report.cpp
View File

@ -21,25 +21,22 @@ Report::Report(QWidget *parent, Profile * _profile, gGraphView * shared, Overvie
GraphView=new gGraphView(this,shared); GraphView=new gGraphView(this,shared);
GraphView->hide(); GraphView->hide();
// Create a new graph, but reuse the layers..
int default_height=150;
// Reusing the layer data from overview screen, // Reusing the layer data from overview screen,
// (Can't reuse the graphs objects without breaking things) // (Can't reuse the graphs objects without breaking things)
UC=new gGraph(GraphView,"Usage",default_height,0); UC=new gGraph(GraphView,"Usage",graph_height,0);
UC->AddLayer(m_overview->uc); UC->AddLayer(m_overview->uc);
AHI=new gGraph(GraphView,"AHI",default_height,0); AHI=new gGraph(GraphView,"AHI",graph_height,0);
AHI->AddLayer(m_overview->bc); AHI->AddLayer(m_overview->bc);
PR=new gGraph(GraphView,"Pressure",default_height,0); PR=new gGraph(GraphView,"Pressure",graph_height,0);
PR->AddLayer(m_overview->pr); PR->AddLayer(m_overview->pr);
LK=new gGraph(GraphView,"Leaks",default_height,0); LK=new gGraph(GraphView,"Leaks",graph_height,0);
LK->AddLayer(m_overview->lk); LK->AddLayer(m_overview->lk);
NPB=new gGraph(GraphView,"% in PB",default_height,0); NPB=new gGraph(GraphView,"% in PB",graph_height,0);
NPB->AddLayer(m_overview->npb); NPB->AddLayer(m_overview->npb);
graphs.push_back(AHI); graphs.push_back(AHI);
@ -85,8 +82,8 @@ void Report::ReloadGraphs()
void Report::resizeEvent(QResizeEvent *event) void Report::resizeEvent(QResizeEvent *event)
{ {
QWidget::resizeEvent(event); QWidget::resizeEvent(event);
GraphView->setMinimumSize(event->size().width()-20,240); GraphView->setMinimumSize(1280,graph_height);
GraphView->setMaximumSize(event->size().width()-20,240); GraphView->setMaximumSize(1280,graph_height);
//GenerateReport(startDate,endDate); //GenerateReport(startDate,endDate);
} }
@ -102,8 +99,7 @@ QPixmap Report::Snapshot(gGraph * graph)
GraphView->ResetBounds(); GraphView->ResetBounds();
GraphView->SetXBounds(first,last); GraphView->SetXBounds(first,last);
int w=this->width()-20; QPixmap pixmap=GraphView->renderPixmap(1280,graph_height,false);
QPixmap pixmap=GraphView->renderPixmap(w,240,false);
return pixmap; return pixmap;
} }
@ -118,7 +114,7 @@ void Report::GenerateReport(QDate start, QDate end)
QString html="<html><head><style type='text/css'>p,a,td,body { font-family: 'FreeSans', 'Sans Serif'; } p,a,td,body { font-size: 12px; } </style>" QString html="<html><head><style type='text/css'>p,a,td,body { font-family: 'FreeSans', 'Sans Serif'; } p,a,td,body { font-size: 12px; } </style>"
"</head>" "</head>"
"<body leftmargin=0 rightmargin=0 topmargin=0 marginwidth=0 marginheight=0>" "<body leftmargin=0 rightmargin=0 topmargin=0 marginwidth=0 marginheight=0>"
"<table width=100% cellpadding=0 cellspacing=0>" "<div align=center><table width='1280px' cellpadding=0 cellspacing=0>"
"<tr><td valign=top>"; "<tr><td valign=top>";
html+="<h2>CPAP Overview</h2>"; html+="<h2>CPAP Overview</h2>";
html+="<table border='1px'><tr><td valign=top><table border=0>"; html+="<table border='1px'><tr><td valign=top><table border=0>";
@ -161,9 +157,12 @@ void Report::GenerateReport(QDate start, QDate end)
} }
html+="</table></td></tr></table>"; html+="</table></td></tr></table>";
html+="<td ><div align=center><img src='qrc:/docs/sheep.png' width=100 height=100'><br/>SleepyHead v"+pref["VersionString"].toString()+"</div></td></tr></table>&nbsp;<br/>" html+="<td ><div align=center><img src='qrc:/docs/sheep.png' width=100 height=100'><br/>SleepyHead v"+pref["VersionString"].toString()+"</div></td></tr>"
"Reporting from <b>"+startDate.toString()+"</b> to <b>"+endDate.toString()+"</b><br/>" "<tr><td colspan=2>"
"<hr>"; "Reporting from <b>"+startDate.toString()+"</b> to <b>"+endDate.toString()+"</b>"
"<hr width=1270px>"
"</td></tr>"
"</table></div>&nbsp;<br/>";
@ -174,7 +173,7 @@ void Report::GenerateReport(QDate start, QDate end)
QBuffer buffer(&byteArray); // use buffer to store pixmap into byteArray QBuffer buffer(&byteArray); // use buffer to store pixmap into byteArray
buffer.open(QIODevice::WriteOnly); buffer.open(QIODevice::WriteOnly);
pixmap.save(&buffer, "PNG"); pixmap.save(&buffer, "PNG");
html += "<div align=center><img src=\"data:image/png;base64," + byteArray.toBase64() + "\" width=\"100%\" height=\"240px\"></div>\n"; // html += "<div align=center><img src=\"data:image/png;base64," + byteArray.toBase64() + "\" width=\"1280px\" height=\""+QString::number(graph_height)+"px\"></div>\n"; //
} }
html+="</body></html>"; html+="</body></html>";
@ -190,6 +189,7 @@ void Report::on_printButton_clicked()
printer.setOrientation(QPrinter::Portrait); printer.setOrientation(QPrinter::Portrait);
//printer.setPaperSize(QPrinter::A4); //printer.setPaperSize(QPrinter::A4);
printer.setResolution(QPrinter::HighResolution); printer.setResolution(QPrinter::HighResolution);
//printer.setPageSize();
printer.setFullPage(false); printer.setFullPage(false);
printer.setNumCopies(1); printer.setNumCopies(1);
printer.setPageMargins(10,10,10,10,QPrinter::Millimeter); printer.setPageMargins(10,10,10,10,QPrinter::Millimeter);

2
report.h
View File

@ -11,6 +11,8 @@ namespace Ui {
class Report; class Report;
} }
const int graph_height=220;
class Daily; class Daily;
class Overview; class Overview;
class Report : public QWidget class Report : public QWidget