]> sigrok.org Git - pulseview.git/blobdiff - pv/view/ruler.cpp
TimeMarker: Fixed display of negative value in popup
[pulseview.git] / pv / view / ruler.cpp
index adab57dbed21344dab3cf39a072492a40950e82f..56651169afee06f96813d2625475e0d717add254 100644 (file)
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#include "ruler.h"
+#include "ruler.hpp"
 
-#include "cursor.h"
-#include "view.h"
-#include "viewport.h"
+#include "view.hpp"
+#include "pv/util.hpp"
 
 #include <extdef.h>
 
-#include <assert.h>
-#include <math.h>
-#include <limits.h>
-
-#include <QMouseEvent>
-#include <QPainter>
-#include <QTextStream>
-
-using namespace std;
+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),
-       _grabbed_marker(NULL)
+       MarginWidget(parent)
 {
        setMouseTracking(true);
 
-       connect(&_view, SIGNAL(hover_point_changed()),
+       connect(&view_, SIGNAL(hover_point_changed()),
                this, SLOT(hover_point_changed()));
 }
 
-QString Ruler::format_time(double t, unsigned int prefix,
-       unsigned int precision)
+QSize Ruler::sizeHint() const
 {
-       const double multiplier = pow(10.0,
-               - prefix * 3 - FirstSIPrefixPower);
-
-       QString s;
-       QTextStream ts(&s);
-       ts.setRealNumberPrecision(precision);
-       ts << fixed << forcesign << (t  * multiplier) <<
-               SIPrefixes[prefix] << "s";
-       return s;
+       return QSize(0, RulerHeight);
 }
 
 void Ruler::paintEvent(QPaintEvent*)
 {
-       using namespace Qt;
-
-       const double SpacingIncrement = 32.0f;
-       const double MinValueSpacing = 32.0f;
        const int ValueMargin = 3;
 
        QPainter p(this);
        p.setRenderHint(QPainter::Antialiasing);
 
-       double min_width = SpacingIncrement, typical_width;
-       double tick_period;
-       unsigned int prefix;
-
-       // Find tick spacing, and number formatting that does not cause
-       // value to collide.
-       do
-       {
-               const double min_period = _view.scale() * min_width;
-
-               const int order = (int)floorf(log10f(min_period));
-               const double order_decimal = pow(10, order);
-
-               unsigned int unit = 0;
-
-               do
-               {
-                       tick_period = order_decimal * ScaleUnits[unit++];
-               } while (tick_period < min_period && unit < countof(ScaleUnits));
-
-               prefix = (order - FirstSIPrefixPower) / 3;
-               assert(prefix < countof(SIPrefixes));
+       std::pair<double, unsigned int> spacing =
+               calculate_tick_spacing(p, view_.scale(), view_.offset());
 
-
-               typical_width = p.boundingRect(0, 0, INT_MAX, INT_MAX,
-                       AlignLeft | AlignTop, format_time(_view.offset(),
-                       prefix)).width() + MinValueSpacing;
-
-               min_width += SpacingIncrement;
-
-       } while(typical_width > tick_period / _view.scale());
+       double tick_period = spacing.first;
+       unsigned int prefix = spacing.second;
 
        const int text_height = p.boundingRect(0, 0, INT_MAX, INT_MAX,
                AlignLeft | AlignTop, "8").height();
@@ -124,32 +71,30 @@ void Ruler::paintEvent(QPaintEvent*)
 
        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);
+               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;
 
-       while (1)
-       {
-               const double t = t0 + division * minor_tick_period;
-               const double x = (t - _view.offset()) / _view.scale();
+       double x;
 
-               if (x >= width())
-                       break;
+       do {
+               const double t = t0 + division * minor_tick_period;
+               x = (t - view_.offset()) / view_.scale();
 
                if (division % MinorTickSubdivision == 0)
                {
                        // Draw a major tick
                        p.drawText(x, ValueMargin, 0, text_height,
                                AlignCenter | AlignTop | TextDontClip,
-                               format_time(t, prefix));
+                               pv::util::format_time(t, prefix));
                        p.drawLine(QPointF(x, major_tick_y1),
                                QPointF(x, tick_y2));
                }
@@ -161,69 +106,22 @@ void Ruler::paintEvent(QPaintEvent*)
                }
 
                division++;
-       }
 
-       // Draw the cursors
-       draw_cursors(p, prefix);
+       } while (x < width());
 
        // Draw the hover mark
        draw_hover_mark(p);
-
-       p.end();
-}
-
-void Ruler::mouseMoveEvent(QMouseEvent *e)
-{
-       if (!_grabbed_marker)
-               return;
-
-       _grabbed_marker->set_time(_view.offset() +
-               ((double)e->x() + 0.5) * _view.scale());
-}
-
-void Ruler::mousePressEvent(QMouseEvent *e)
-{
-       if (e->buttons() & Qt::LeftButton) {
-               _grabbed_marker = NULL;
-
-               if (_view.cursors_shown()) {
-                       std::pair<Cursor, Cursor> &cursors =
-                               _view.cursors();
-                       if (cursors.first.get_label_rect(
-                               rect()).contains(e->pos()))
-                               _grabbed_marker = &cursors.first;
-                       else if (cursors.second.get_label_rect(
-                               rect()).contains(e->pos()))
-                               _grabbed_marker = &cursors.second;
-               }
-       }
-}
-
-void Ruler::mouseReleaseEvent(QMouseEvent *)
-{
-       _grabbed_marker = NULL;
-}
-
-void Ruler::draw_cursors(QPainter &p, unsigned int prefix)
-{
-       if (!_view.cursors_shown())
-               return;
-
-       const QRect r = rect();
-       pair<Cursor, Cursor> &cursors = _view.cursors();
-       cursors.first.paint_label(p, r, prefix);
-       cursors.second.paint_label(p, r, prefix);
 }
 
 void Ruler::draw_hover_mark(QPainter &p)
 {
-       const int x = _view.hover_point().x();
+       const int x = view_.hover_point().x();
 
-       if (x == -1 || _grabbed_marker)
+       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[] = {
@@ -239,5 +137,41 @@ void Ruler::hover_point_changed()
        update();
 }
 
+std::pair<double, unsigned int> Ruler::calculate_tick_spacing(
+       QPainter& p, double scale, double offset)
+{
+       const double SpacingIncrement = 32.0f;
+       const double MinValueSpacing = 32.0f;
+
+       double min_width = SpacingIncrement, typical_width;
+
+       double tick_period;
+       unsigned int prefix;
+
+       do {
+               const double min_period = scale * min_width;
+
+               const int order = (int)floorf(log10f(min_period));
+               const double order_decimal = pow(10.0, order);
+
+               unsigned int unit = 0;
+
+               do {
+                       tick_period = order_decimal * ScaleUnits[unit++];
+               } while (tick_period < min_period && unit < countof(ScaleUnits));
+
+               prefix = (order - pv::util::FirstSIPrefixPower) / 3;
+
+               typical_width = p.boundingRect(0, 0, INT_MAX, INT_MAX,
+                       AlignLeft | AlignTop, pv::util::format_time(offset,
+                       prefix)).width() + MinValueSpacing;
+
+               min_width += SpacingIncrement;
+
+       } while(typical_width > tick_period / scale);
+
+       return std::make_pair(tick_period, prefix);
+}
+
 } // namespace view
 } // namespace pv