More Xaxis/yaxis layout consistency stuff

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);
+//    QString txt=QString("%1 %2").arg(maxmins).arg(float(maxevents * 60.0) / maxmins);
-    graph.renderText(txt, rect.left(), rect.top()-10);
+//    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);
 

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()

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);

sleepyhead/Graphs/gGraph.cpp

@@ -356,7 +356,7 @@ void gGraph::paint(QPainter &painter, const QRegion &region)
 
         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 &region)
 
         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 &region)
 
         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);
 
 

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; }
 

sleepyhead/Graphs/gXAxis.cpp

@@ -9,6 +9,7 @@
 #include "Graphs/gXAxis.h"
 
 #include <QDebug>
+#include <QFontMetrics>
 
 #include <math.h>
 
@@ -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 &region)
 {
     int left = region.boundingRect().left();
@@ -236,7 +245,7 @@ void gXAxis::paint(QPainter &painter, gGraph &w, const QRegion &region)
 
         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
 

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);

sleepyhead/Graphs/gYAxis.cpp

@@ -134,6 +134,7 @@ void gXGrid::paint(QPainter &painter, gGraph &w, const QRegion &region)
 
 
 
+
 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 &region)
 {
     int left = region.boundingRect().left();

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; }
 

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; }