Signal: Save and load signal names as UTF-8 strings.

[pulseview.git] / pv / view / ruler.cpp

diff --git a/pv/view/ruler.cpp b/pv/view/ruler.cpp
index c5f194f2f76f4011009107659c2ad70790605e6f..ee521f0e82a1203438d8a7420ec2336baec89af4 100644 (file)
--- a/pv/view/ruler.cpp
+++ b/pv/view/ruler.cpp
@@ -18,125 +18,106 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#include "ruler.h"
-#include "view.h"
-#include "viewport.h"
+#include "ruler.hpp"
 
-#include <extdef.h>
+#include "view.hpp"
+#include "pv/util.hpp"
 
-#include <assert.h>
-#include <math.h>
+#include <extdef.h>
 
-#include <QMouseEvent>
-#include <QPainter>
-#include <QTextStream>
+using namespace Qt;
 
 namespace pv {
 namespace view {
 
+const int Ruler::RulerHeight = 30;
 const int Ruler::MinorTickSubdivision = 4;
-const int Ruler::ScaleUnits[3] = {1, 2, 5};
-
-const QString Ruler::SIPrefixes[9] =
-       {"f", "p", "n", QChar(0x03BC), "m", "", "k", "M", "G"};
-const int Ruler::FirstSIPrefixPower = -15;
 
 const int Ruler::HoverArrowSize = 5;
 
 Ruler::Ruler(View &parent) :
-       QWidget(&parent),
-       _view(parent)
+       MarginWidget(parent)
 {
        setMouseTracking(true);
 
-       connect(&_view, SIGNAL(hover_point_changed()),
+       connect(&view_, SIGNAL(hover_point_changed()),
                this, SLOT(hover_point_changed()));
 }
 
-void Ruler::paintEvent(QPaintEvent *event)
+QSize Ruler::sizeHint() const
 {
-       QPainter p(this);
-       p.setRenderHint(QPainter::Antialiasing);
-
-       const double MinSpacing = 80;
-
-       const double min_period = _view.scale() * MinSpacing;
-
-       const int order = (int)floorf(log10f(min_period));
-       const double order_decimal = pow(10, order);
-
-       unsigned int unit = 0;
-       double tick_period = 0.0f;
+       return QSize(0, RulerHeight);
+}
 
-       do
-       {
-               tick_period = order_decimal * ScaleUnits[unit++];
-       } while(tick_period < min_period && unit < countof(ScaleUnits));
+void Ruler::paintEvent(QPaintEvent*)
+{
+       const int ValueMargin = 3;
 
-       const unsigned int prefix = (order - FirstSIPrefixPower) / 3;
-       assert(prefix >= 0);
-       assert(prefix < countof(SIPrefixes));
+       QPainter p(this);
+       p.setRenderHint(QPainter::Antialiasing);
 
-       const double multiplier = pow(10.0, - prefix * 3 - FirstSIPrefixPower);
+       const double tick_period = view_.tick_period();
+       const unsigned int prefix = view_.tick_prefix();
 
        const int text_height = p.boundingRect(0, 0, INT_MAX, INT_MAX,
-               Qt::AlignLeft | Qt::AlignTop, "8").height();
+               AlignLeft | AlignTop, "8").height();
 
        // Draw the tick marks
-       p.setPen(Qt::black);
+       p.setPen(palette().color(foregroundRole()));
 
        const double minor_tick_period = tick_period / MinorTickSubdivision;
        const double first_major_division =
-               floor(_view.offset() / tick_period);
+               floor(view_.offset() / tick_period);
        const double first_minor_division =
-               ceil(_view.offset() / minor_tick_period);
+               ceil(view_.offset() / minor_tick_period);
        const double t0 = first_major_division * tick_period;
 
        int division = (int)round(first_minor_division -
-               first_major_division * MinorTickSubdivision);
-       while(1)
-       {
-               const double t = t0 + division * minor_tick_period;
-               const double x = (t - _view.offset()) / _view.scale();
+               first_major_division * MinorTickSubdivision) - 1;
+
+       const int major_tick_y1 = text_height + ValueMargin * 2;
+       const int tick_y2 = height();
+       const int minor_tick_y1 = (major_tick_y1 + tick_y2) / 2;
 
-               if(x >= width())
-                       break;
+       double x;
 
-               if(division % MinorTickSubdivision == 0)
+       do {
+               const double t = t0 + division * minor_tick_period;
+               x = (t - view_.offset()) / view_.scale();
+
+               if (division % MinorTickSubdivision == 0)
                {
                        // Draw a major tick
-                       QString s;
-                       QTextStream ts(&s);
-                       ts << (t * multiplier) << SIPrefixes[prefix] << "s";
-                       p.drawText(x, 0, 0, text_height, Qt::AlignCenter |
-                               Qt::AlignTop | Qt::TextDontClip, s);
-                       p.drawLine(QPointF(x, text_height),
-                               QPointF(x, height()));
+                       p.drawText(x, ValueMargin, 0, text_height,
+                               AlignCenter | AlignTop | TextDontClip,
+                               pv::util::format_time(t, prefix));
+                       p.drawLine(QPointF(x, major_tick_y1),
+                               QPointF(x, tick_y2));
                }
                else
                {
                        // Draw a minor tick
-                       p.drawLine(QPointF(x, (text_height + height()) / 2),
-                               QPointF(x, height()));
+                       p.drawLine(QPointF(x, minor_tick_y1),
+                               QPointF(x, tick_y2));
                }
 
                division++;
-       }
+
+       } while (x < width());
 
        // Draw the hover mark
        draw_hover_mark(p);
-
-       p.end();
 }
 
 void Ruler::draw_hover_mark(QPainter &p)
 {
-       const int x = _view.hover_point().x();
-       if(x == -1)
+       const int x = view_.hover_point().x();
+
+       if (x == -1)
                return;
 
        p.setPen(QPen(Qt::NoPen));
-       p.setBrush(QBrush(QColor(Qt::black)));
+       p.setBrush(QBrush(palette().color(foregroundRole())));
 
        const int b = height() - 1;
        const QPointF points[] = {