From 87e7882dead1d4dce5c4b7f8ca07b5a61b188ba3 Mon Sep 17 00:00:00 2001
From: Mark Watkins <jedimark@users.sourceforge.net>
Date: Sun, 11 Sep 2011 23:58:26 +1000
Subject: [PATCH] Windows GL Font test #1

---
 Graphs/gGraphView.cpp | 19 ++++++++++++++++---
 main.cpp              |  1 +
 overview.cpp          |  2 +-
 report.cpp            |  2 +-
 4 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/Graphs/gGraphView.cpp b/Graphs/gGraphView.cpp
index f0602ed0..e2101c44 100644
--- a/Graphs/gGraphView.cpp
+++ b/Graphs/gGraphView.cpp
@@ -1284,27 +1284,41 @@ void gGraphView::DrawTextQue()
     glPushAttrib(GL_COLOR_BUFFER_BIT);
     //glFlush();
     //glEnable(GL_BLEND);
-    QPainter painter(QGLContext::currentContext()->device());
     int w,h;
+    QPaintDevice *pd=QGLContext::currentContext()->device();
+
+/* #ifdef Q_WS_WIN32
+    QPixmap *pixmap=dynamic_cast<QPixmap *>(pd);
+#endif */
+
     for (int i=0;i<m_textque_items;i++) {
         // GL Font drawing is ass in Qt.. :(
         TextQue & q=m_textque[i];
 
+
         if (q.angle==0) {
             qglColor(q.color);
             renderText(q.x,q.y,q.text,*q.font);
             //painter.drawText(q.x, q.y, q.text);
         } else {
-            //glRotatef(90,0,0,-1);
+            QPainter painter;
+/*#ifdef Q_WS_WIN32
+            if (pixmap) {
+                painter.begin(pd);
+            } else
+#endif */
+            painter.begin(this);
             QBrush b(q.color);
             painter.setBrush(b);
             painter.setFont(*q.font);
             GetTextExtent(q.text, w, h, q.font);
+
             painter.translate(q.x, q.y);
             painter.rotate(-q.angle);
             painter.drawText(floor(-w/2.0), floor(-h/2.0), q.text);
             painter.rotate(+q.angle);
             painter.translate(-q.x, -q.y);
+            painter.end();
             /*QString c;
             int x=q.x-4;
             int y=q.y-(w)/2;
@@ -1325,7 +1339,6 @@ void gGraphView::DrawTextQue()
         q.text.clear();
         //q.text.squeeze();
     }
-    painter.end();
     glPopAttrib();
     //qDebug() << "rendered" << m_textque_items << "text items";
     m_textque_items=0;
diff --git a/main.cpp b/main.cpp
index 63f03bd4..a0d43fcd 100644
--- a/main.cpp
+++ b/main.cpp
@@ -50,6 +50,7 @@ int main(int argc, char *argv[])
 #ifdef Q_WS_X11
     XInitThreads();
 #endif
+    QGL::setPreferredPaintEngine(QPaintEngine::OpenGL);
     QApplication a(argc, argv);
 
     a.setApplicationName("SleepyHead");
diff --git a/overview.cpp b/overview.cpp
index d749a6aa..49a47224 100644
--- a/overview.cpp
+++ b/overview.cpp
@@ -168,7 +168,7 @@ void Overview::on_printButton_clicked()
 {
 
     if (!report) {
-        report=new Report(this,profile,NULL,this);
+        report=new Report(this,profile,m_shared,this);
     }
 
     if (report) {
diff --git a/report.cpp b/report.cpp
index d0a9b84f..ad351fa3 100644
--- a/report.cpp
+++ b/report.cpp
@@ -103,7 +103,7 @@ QPixmap Report::Snapshot(gGraph * graph)
     GraphView->SetXBounds(first,last);
 
     int w=this->width()-20;
-    QPixmap pixmap=GraphView->renderPixmap(w,240,false); //gwwidth,gwheight,false);
+    QPixmap pixmap=GraphView->renderPixmap(w,240,false);
 
     return pixmap;
 }