From a91a11a7b953ac587828f8da0d65495db5d1f6b6 Mon Sep 17 00:00:00 2001 From: Mark Watkins Date: Fri, 29 Aug 2014 15:32:49 +1000 Subject: [PATCH] More Xaxis/yaxis layout consistency stuff --- sleepyhead/Graphs/MinutesAtPressure.cpp | 15 +++++++++++++-- sleepyhead/Graphs/gFlagsLine.cpp | 5 +++++ sleepyhead/Graphs/gFlagsLine.h | 1 + sleepyhead/Graphs/gGraph.cpp | 10 +++------- sleepyhead/Graphs/gGraph.h | 3 +++ sleepyhead/Graphs/gXAxis.cpp | 11 ++++++++++- sleepyhead/Graphs/gXAxis.h | 3 +++ sleepyhead/Graphs/gYAxis.cpp | 7 +++++++ sleepyhead/Graphs/gYAxis.h | 2 ++ sleepyhead/Graphs/layer.h | 3 +++ 10 files changed, 50 insertions(+), 10 deletions(-) diff --git a/sleepyhead/Graphs/MinutesAtPressure.cpp b/sleepyhead/Graphs/MinutesAtPressure.cpp index 9e3c00e5..e5cdeb00 100644 --- a/sleepyhead/Graphs/MinutesAtPressure.cpp +++ b/sleepyhead/Graphs/MinutesAtPressure.cpp @@ -148,6 +148,7 @@ void MinutesAtPressure::paint(QPainter &painter, gGraph &graph, const QRegion &r if ((m_lastminx != m_minx) || (m_lastmaxx != m_maxx)) { recalculate(&graph); } + m_lastminx = m_minx; m_lastmaxx = m_maxx; @@ -155,6 +156,15 @@ void MinutesAtPressure::paint(QPainter &painter, gGraph &graph, const QRegion &r painter.setFont(*defaultfont); painter.setPen(Qt::black); + if (graph.printing()) { + // lock the other mutex... + while (recalculating()) {}; + recalculate(&graph); + while (recalculating()) {}; + + } + + // Lock the stuff we need to draw timelock.lock(); @@ -353,8 +363,8 @@ void MinutesAtPressure::paint(QPainter &painter, gGraph &graph, const QRegion &r } } } - QString txt=QString("%1 %2").arg(maxmins).arg(float(maxevents * 60.0) / maxmins); - graph.renderText(txt, rect.left(), rect.top()-10); +// QString txt=QString("%1 %2").arg(maxmins).arg(float(maxevents * 60.0) / maxmins); +// graph.renderText(txt, rect.left(), rect.top()-10); timelock.unlock(); @@ -364,6 +374,7 @@ void MinutesAtPressure::paint(QPainter &painter, gGraph &graph, const QRegion &r // painter.drawText(region.boundingRect(), Qt::AlignCenter, QObject::tr("Recalculating...")); } + // painter.setPen(QPen(Qt::black,1)); // painter.drawRect(rect); diff --git a/sleepyhead/Graphs/gFlagsLine.cpp b/sleepyhead/Graphs/gFlagsLine.cpp index 67cc1223..5e61e6eb 100644 --- a/sleepyhead/Graphs/gFlagsLine.cpp +++ b/sleepyhead/Graphs/gFlagsLine.cpp @@ -26,6 +26,11 @@ bool gLabelArea::mouseMoveEvent(QMouseEvent *event, gGraph *graph) return false; } +int gLabelArea::minimumWidth() +{ + return gYAxis::Margin; +} + gFlagsGroup::gFlagsGroup() diff --git a/sleepyhead/Graphs/gFlagsLine.h b/sleepyhead/Graphs/gFlagsLine.h index 788d8a44..b0ae4d14 100644 --- a/sleepyhead/Graphs/gFlagsLine.h +++ b/sleepyhead/Graphs/gFlagsLine.h @@ -26,6 +26,7 @@ class gLabelArea: public gSpacer Q_UNUSED(painter); Q_UNUSED(region); } + virtual int minimumWidth(); protected: Layer *m_mainlayer; virtual bool mouseMoveEvent(QMouseEvent *event, gGraph *graph); diff --git a/sleepyhead/Graphs/gGraph.cpp b/sleepyhead/Graphs/gGraph.cpp index 1fa8d059..0c3f0e34 100644 --- a/sleepyhead/Graphs/gGraph.cpp +++ b/sleepyhead/Graphs/gGraph.cpp @@ -356,7 +356,7 @@ void gGraph::paint(QPainter &painter, const QRegion ®ion) if (!ll->visible()) { continue; } - tmp = ll->Height();// * m_graphview->printScaleY(); + tmp = ll->minimumHeight();// * m_graphview->printScaleY(); if (ll->position() == LayerTop) { top += tmp; } if (ll->position() == LayerBottom) { bottom += tmp * printScaleY(); } @@ -368,7 +368,7 @@ void gGraph::paint(QPainter &painter, const QRegion ®ion) if (!ll->visible()) { continue; } - tmp = ll->Width(); + tmp = ll->minimumWidth(); tmp *= m_graphview->printScaleX(); tmp *= m_graphview->devicePixelRatio(); @@ -405,7 +405,7 @@ void gGraph::paint(QPainter &painter, const QRegion ®ion) if (!ll->visible()) { continue; } - tmp = ll->Height(); + tmp = ll->minimumHeight(); if (ll->position() == LayerTop) { QRect rect(originX + left, originY + top, width - left - right, tmp); @@ -699,10 +699,6 @@ void gGraph::mouseMoveEvent(QMouseEvent *event) bool doredraw = false; - if (isSnapshot() && (x> m_graphview->titleWidth)) { - // this nag might be a little too much.. - ToolTip(tr("Snapshot"),x+15,y, TT_AlignLeft); - } timedRedraw(0); diff --git a/sleepyhead/Graphs/gGraph.h b/sleepyhead/Graphs/gGraph.h index 82b6cc4c..cf08ab7d 100644 --- a/sleepyhead/Graphs/gGraph.h +++ b/sleepyhead/Graphs/gGraph.h @@ -79,6 +79,9 @@ class gGraph : public QObject //! \brief Return Graph visibility status bool visible() { return m_visible; } + //! \brief Returns true if Graph is currently being snapshotted for printing + bool printing() { return m_printing; } + //! \brief Return height element. This is used by the scaler in gGraphView. inline const float & height() { return m_height; } diff --git a/sleepyhead/Graphs/gXAxis.cpp b/sleepyhead/Graphs/gXAxis.cpp index 396c16d3..84811dc9 100644 --- a/sleepyhead/Graphs/gXAxis.cpp +++ b/sleepyhead/Graphs/gXAxis.cpp @@ -9,6 +9,7 @@ #include "Graphs/gXAxis.h" #include +#include #include @@ -47,6 +48,14 @@ gXAxis::gXAxis(QColor col, bool fadeout) gXAxis::~gXAxis() { } + +int gXAxis::minimumHeight() +{ + QFontMetrics fm(*defaultfont); + int h = fm.height(); + return 9+h; +} + void gXAxis::paint(QPainter &painter, gGraph &w, const QRegion ®ion) { int left = region.boundingRect().left(); @@ -236,7 +245,7 @@ void gXAxis::paint(QPainter &painter, gGraph &w, const QRegion ®ion) int mintop = top + 4.0 * (float(y) / 10.0); int majtop = top + 6.0 * (float(y) / 10.0); - int texttop = majtop + y; // 18*w.printScaleY(); + int texttop = majtop + y + 2; // 18*w.printScaleY(); // Fill in the minor tick marks up to the first major alignment tick diff --git a/sleepyhead/Graphs/gXAxis.h b/sleepyhead/Graphs/gXAxis.h index 1c649f45..2fe48ddc 100644 --- a/sleepyhead/Graphs/gXAxis.h +++ b/sleepyhead/Graphs/gXAxis.h @@ -37,6 +37,9 @@ class gXAxis: public Layer void setRoundDays(bool b) { m_roundDays = b; } + //! \brief Returns the minimum height needed to fit + virtual int minimumHeight(); + virtual Layer * Clone() { gXAxis * xaxis = new gXAxis(); Layer::CloneInto(xaxis); diff --git a/sleepyhead/Graphs/gYAxis.cpp b/sleepyhead/Graphs/gYAxis.cpp index 4e59ccb9..f65d1b59 100644 --- a/sleepyhead/Graphs/gYAxis.cpp +++ b/sleepyhead/Graphs/gYAxis.cpp @@ -134,6 +134,7 @@ void gXGrid::paint(QPainter &painter, gGraph &w, const QRegion ®ion) + gYAxis::gYAxis(QColor col) : Layer(NoChannel) { @@ -144,6 +145,12 @@ gYAxis::gYAxis(QColor col) gYAxis::~gYAxis() { } + +int gYAxis::minimumWidth() +{ + return Margin; +} + void gYAxis::paint(QPainter &painter, gGraph &w, const QRegion ®ion) { int left = region.boundingRect().left(); diff --git a/sleepyhead/Graphs/gYAxis.h b/sleepyhead/Graphs/gYAxis.h index ed39340b..91ad04a3 100644 --- a/sleepyhead/Graphs/gYAxis.h +++ b/sleepyhead/Graphs/gYAxis.h @@ -90,6 +90,8 @@ class gYAxis: public Layer //! \brief Formats the ticker value.. Override to implement other types virtual const QString Format(EventDataType v, int dp); + virtual int minimumWidth(); + //! \brief Set the scale of the Y axis values.. Values can be multiplied by this to convert formats void SetScale(float f) { m_yaxis_scale = f; } diff --git a/sleepyhead/Graphs/layer.h b/sleepyhead/Graphs/layer.h index 07c6c8b2..3e63cc2a 100644 --- a/sleepyhead/Graphs/layer.h +++ b/sleepyhead/Graphs/layer.h @@ -82,6 +82,9 @@ class Layer //! \brief Override to set the minimum allowed height for this layer virtual int minimumHeight() { return 0; } + //! \brief Override to set the minimum allowed width for this layer + virtual int minimumWidth() { return 0; } + //! \brief Return this layers physical minimum date boundary virtual qint64 Minx() { return m_day ? m_day->first() : m_minx; }