From 51e58b8ae565fbf71e8fdd03c9e0278edd4d3286 Mon Sep 17 00:00:00 2001 From: Mark Watkins Date: Fri, 29 Aug 2014 14:02:16 +1000 Subject: [PATCH] Fix some windows layout bugs --- sleepyhead/Graphs/gGraph.cpp | 28 +++++++++++++++++++--------- sleepyhead/Graphs/gGraphView.cpp | 18 +++++++++++------- sleepyhead/Graphs/gGraphView.h | 2 +- sleepyhead/Graphs/gLineChart.cpp | 2 +- sleepyhead/Graphs/gLineOverlay.cpp | 2 +- sleepyhead/Graphs/gXAxis.h | 2 +- sleepyhead/daily.cpp | 4 ++-- sleepyhead/reports.cpp | 1 + 8 files changed, 37 insertions(+), 22 deletions(-) diff --git a/sleepyhead/Graphs/gGraph.cpp b/sleepyhead/Graphs/gGraph.cpp index 6024f744..1fa8d059 100644 --- a/sleepyhead/Graphs/gGraph.cpp +++ b/sleepyhead/Graphs/gGraph.cpp @@ -291,7 +291,9 @@ void gGraph::paint(QPainter &painter, const QRegion ®ion) int fw, font_height; GetTextExtent("Wg@", fw, font_height); - if (m_margintop > 0) { m_margintop = font_height + (8); } + if (m_margintop > 0) { + m_margintop = font_height + (2*printScaleY()); + } //m_marginbottom=5; @@ -329,9 +331,13 @@ void gGraph::paint(QPainter &painter, const QRegion ®ion) QString t = name().section(";", -1); - QRect rec = m_rect; - rec.moveTop(rec.top() + 4); - painter.drawText(rec, Qt::AlignHCenter | Qt::AlignTop, QObject::tr("Snapshot %1").arg(t)); + QString txt = QObject::tr("Snapshot %1").arg(t); + QRectF rec = QRect(m_rect.left(),m_rect.top()+6*printScaleY(), m_rect.width(), 0); + rec = painter.boundingRect(rec, Qt::AlignCenter, txt); + + painter.drawText(rec, Qt::AlignCenter, txt); + m_margintop += rec.height(); + top = m_margintop; } @@ -479,15 +485,19 @@ QPixmap gGraph::renderPixmap(int w, int h, bool printing) QPixmap pm(w,h); + + bool pixcaching = p_profile->appearance->usePixmapCaching(); graphView()->setUsePixmapCache(false); + p_profile->appearance->setUsePixmapCaching(false); QPainter painter(&pm); painter.fillRect(0,0,w,h,QBrush(QColor(Qt::white))); QRegion region(0,0,w,h); paint(painter, region); DrawTextQue(painter); - graphView()->setUsePixmapCache(p_profile->appearance->usePixmapCaching()); painter.end(); + graphView()->setUsePixmapCache(pixcaching); + p_profile->appearance->setUsePixmapCaching(pixcaching); graphView()->setPrintScaleX(1); graphView()->setPrintScaleY(1); @@ -692,8 +702,8 @@ void gGraph::mouseMoveEvent(QMouseEvent *event) if (isSnapshot() && (x> m_graphview->titleWidth)) { // this nag might be a little too much.. ToolTip(tr("Snapshot"),x+15,y, TT_AlignLeft); - timedRedraw(0); } + timedRedraw(0); for (int i = 0; i < m_layers.size(); i++) { @@ -826,9 +836,9 @@ void gGraph::mouseMoveEvent(QMouseEvent *event) } //if (!nolayer) { // no mouse button - if (doredraw) { - m_graphview->timedRedraw(0); - } +// if (doredraw) { +// m_graphview->timedRedraw(0); +// } //} //if (x>left+m_marginleft && xtop+m_margintop && yheight()*m_scaleY); - redraw(); + timedRedraw(); } m_graph_index++; @@ -3092,10 +3092,14 @@ void gGraphView::timedRedraw(int ms) { if (timer->isActive()) { - int m = timer->remainingTime(); - if (m > ms) { + if (ms == 0) { timer->stop(); - } else return; + } else { + int m = timer->remainingTime(); + if (m > ms) { + timer->stop(); + } else return; + } } timer->setSingleShot(true); timer->start(ms); @@ -3109,7 +3113,7 @@ void gGraphView::resetLayout() } updateScale(); - redraw(); + timedRedraw(0); } void gGraphView::deselect() { diff --git a/sleepyhead/Graphs/gGraphView.h b/sleepyhead/Graphs/gGraphView.h index f9171ef4..3abd01f4 100644 --- a/sleepyhead/Graphs/gGraphView.h +++ b/sleepyhead/Graphs/gGraphView.h @@ -389,7 +389,7 @@ class gGraphView void setPointClicked(QPoint p) { m_point_clicked = p; } //! \brief Set a redraw timer for ms milliseconds, clearing any previous redraw timer. - void timedRedraw(int ms); + void timedRedraw(int ms=0); gGraph *m_selected_graph; gToolTip *m_tooltip; diff --git a/sleepyhead/Graphs/gLineChart.cpp b/sleepyhead/Graphs/gLineChart.cpp index 3fb55f64..3c1c7e69 100644 --- a/sleepyhead/Graphs/gLineChart.cpp +++ b/sleepyhead/Graphs/gLineChart.cpp @@ -1152,7 +1152,7 @@ void gLineChart::paint(QPainter &painter, gGraph &w, const QRegion ®ion) if (linecursormode) txt+=lasttext; - w.renderText(txt,left,top-4); + w.renderText(txt,left,top-6); } diff --git a/sleepyhead/Graphs/gLineOverlay.cpp b/sleepyhead/Graphs/gLineOverlay.cpp index 858099b3..ebc1600d 100644 --- a/sleepyhead/Graphs/gLineOverlay.cpp +++ b/sleepyhead/Graphs/gLineOverlay.cpp @@ -258,7 +258,7 @@ void gLineOverlayBar::paint(QPainter &painter, gGraph &w, const QRegion ®ion) if (xx < (3600000)) { QString lab = QString("%1").arg(m_label); GetTextExtent(lab, x, y); - w.renderText(lab, x1 - (x / 2), top - y + (3 * w.printScaleY()),0); + w.renderText(lab, x1 - (x / 2), top - y + (5 * w.printScaleY()),0); } diff --git a/sleepyhead/Graphs/gXAxis.h b/sleepyhead/Graphs/gXAxis.h index 26fe1d7d..1c649f45 100644 --- a/sleepyhead/Graphs/gXAxis.h +++ b/sleepyhead/Graphs/gXAxis.h @@ -18,7 +18,7 @@ class gXAxis: public Layer { public: - static const int Margin = 20; // How much room does this take up. (Bottom margin) + static const int Margin = 30; // How much room does this take up. (Bottom margin) public: gXAxis(QColor col = Qt::black, bool fadeout = true); diff --git a/sleepyhead/daily.cpp b/sleepyhead/daily.cpp index e6e75047..924d91e3 100644 --- a/sleepyhead/daily.cpp +++ b/sleepyhead/daily.cpp @@ -228,7 +228,7 @@ Daily::Daily(QWidget *parent,gGraphView * shared) SF->AddLayer(new gLabelArea(fg),LayerLeft,gYAxis::Margin); //SF->AddLayer(new gFooBar(),LayerBottom,0,1); - SF->AddLayer(new gXAxis(COLOR_Text,false),LayerBottom,0,20); //gXAxis::Margin); + SF->AddLayer(new gXAxis(COLOR_Text,false),LayerBottom,0,gXAxis::Margin); // The following list contains graphs that don't have standard xgrid/yaxis labels @@ -354,7 +354,7 @@ Daily::Daily(QWidget *parent,gGraphView * shared) if (skipgraph.contains(it.key())) continue; it.value()->AddLayer(new gYAxis(),LayerLeft,gYAxis::Margin); - it.value()->AddLayer(new gXAxis(),LayerBottom,0,20); + it.value()->AddLayer(new gXAxis(),LayerBottom,0,gXAxis::Margin); } if (p_profile->cpap->showLeakRedline()) { diff --git a/sleepyhead/reports.cpp b/sleepyhead/reports.cpp index 5ee2a559..e17363da 100644 --- a/sleepyhead/reports.cpp +++ b/sleepyhead/reports.cpp @@ -92,6 +92,7 @@ void Report::PrintReport(gGraphView *gv, QString name, QDate date) return; } + mainwin->Notify( QObject::tr("This make take some time to complete..\nPlease don't touch anything until it's done."), QObject::tr("Printing %1 Report").arg(name), 20000);