]> sigrok.org Git - pulseview.git/blobdiff - pv/view/ruler.cpp
Ruler: Fix tick mark calculation
[pulseview.git] / pv / view / ruler.cpp
index 3cc2eb173404e0213c87d6161c198f2b00ad94c1..87f5f9b08d3f831eb638fdc065bfbeaf82cf54d3 100644 (file)
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#include "ruler.h"
+#include <extdef.h>
 
-#include "view.h"
-#include "pv/util.h"
+#include <QApplication>
+#include <QFontMetrics>
+#include <QMouseEvent>
 
-#include <extdef.h>
+#include "ruler.hpp"
+#include "view.hpp"
+
+#include <pv/util.hpp>
 
 using namespace Qt;
 
+using std::shared_ptr;
+using std::vector;
+
 namespace pv {
 namespace view {
 
-const int Ruler::RulerHeight = 30;
+const float Ruler::RulerHeight = 2.5f;  // x Text Height
 const int Ruler::MinorTickSubdivision = 4;
-const int Ruler::ScaleUnits[3] = {1, 2, 5};
 
-const int Ruler::HoverArrowSize = 5;
+const float Ruler::HoverArrowSize = 0.5f;  // x Text Height
 
 Ruler::Ruler(View &parent) :
        MarginWidget(parent)
 {
        setMouseTracking(true);
 
-       connect(&_view, SIGNAL(hover_point_changed()),
+       connect(&view_, SIGNAL(hover_point_changed()),
                this, SLOT(hover_point_changed()));
 }
 
 QSize Ruler::sizeHint() const
 {
-       return QSize(0, RulerHeight);
+       const int text_height = calculate_text_height();
+       return QSize(0, RulerHeight * text_height);
+}
+
+QSize Ruler::extended_size_hint() const
+{
+       QRectF max_rect;
+       std::vector< std::shared_ptr<TimeItem> > items(view_.time_items());
+       for (auto &i : items)
+               max_rect = max_rect.united(i->label_rect(QRect()));
+       return QSize(0, sizeHint().height() - max_rect.top() / 2 +
+               ViewItem::HighlightRadius);
+}
+
+vector< shared_ptr<ViewItem> > Ruler::items()
+{
+       const vector< shared_ptr<TimeItem> > time_items(view_.time_items());
+       return vector< shared_ptr<ViewItem> >(
+               time_items.begin(), time_items.end());
+}
+
+shared_ptr<ViewItem> Ruler::get_mouse_over_item(const QPoint &pt)
+{
+       const vector< shared_ptr<TimeItem> > items(view_.time_items());
+       for (auto i = items.rbegin(); i != items.rend(); i++)
+               if ((*i)->enabled() && (*i)->label_rect(rect()).contains(pt))
+                       return *i;
+       return nullptr;
 }
 
 void Ruler::paintEvent(QPaintEvent*)
@@ -57,65 +90,77 @@ void Ruler::paintEvent(QPaintEvent*)
        QPainter p(this);
        p.setRenderHint(QPainter::Antialiasing);
 
-       std::pair<double, unsigned int> spacing =
-               calculate_tick_spacing(p, _view.scale(), _view.offset());
-
-       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();
+       const double tick_period = view_.tick_period();
 
        // Draw the tick marks
        p.setPen(palette().color(foregroundRole()));
 
        const double minor_tick_period = tick_period / MinorTickSubdivision;
-       const double first_major_division =
-               floor(_view.offset() / tick_period);
-       const double first_minor_division =
-               ceil(_view.offset() / minor_tick_period);
-       const double t0 = first_major_division * tick_period;
+       const pv::util::Timestamp first_major_division =
+               floor(view_.offset() / tick_period);
+       const pv::util::Timestamp first_minor_division =
+               ceil(view_.offset() / minor_tick_period);
+       const pv::util::Timestamp t0 = first_major_division * tick_period;
 
-       int division = (int)round(first_minor_division -
-               first_major_division * MinorTickSubdivision) - 1;
+       int division = (round(first_minor_division -
+               first_major_division * MinorTickSubdivision)).convert_to<int>() - 1;
 
+       const int text_height = calculate_text_height();
+       const int ruler_height = RulerHeight * text_height;
        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;
+       const int minor_tick_y1 = (major_tick_y1 + ruler_height) / 2;
 
        double x;
 
        do {
-               const double t = t0 + division * minor_tick_period;
-               x = (t - _view.offset()) / _view.scale();
+               const pv::util::Timestamp t = t0 + division * minor_tick_period;
+               x = ((t - view_.offset()) / view_.scale()).convert_to<double>();
 
                if (division % MinorTickSubdivision == 0)
                {
                        // Draw a major tick
                        p.drawText(x, ValueMargin, 0, text_height,
                                AlignCenter | AlignTop | TextDontClip,
-                               pv::util::format_time(t, prefix));
+                               util::format_time(t, view_.tick_prefix(), view_.time_unit(),
+                                       view_.tick_precision()));
                        p.drawLine(QPointF(x, major_tick_y1),
-                               QPointF(x, tick_y2));
+                               QPointF(x, ruler_height));
                }
                else
                {
                        // Draw a minor tick
                        p.drawLine(QPointF(x, minor_tick_y1),
-                               QPointF(x, tick_y2));
+                               QPointF(x, ruler_height));
                }
 
                division++;
-
        } while (x < width());
 
        // Draw the hover mark
-       draw_hover_mark(p);
+       draw_hover_mark(p, text_height);
+
+       // The cursor labels are not drawn with the arrows exactly on the
+       // bottom line of the widget, because then the selection shadow
+       // would be clipped away.
+       const QRect r = rect().adjusted(0, 0, 0, -ViewItem::HighlightRadius);
+
+       // Draw the items
+       const vector< shared_ptr<TimeItem> > items(view_.time_items());
+       for (auto &i : items) {
+               const bool highlight = !item_dragging_ &&
+                       i->label_rect(r).contains(mouse_point_);
+               i->paint_label(p, r, highlight);
+       }
 }
 
-void Ruler::draw_hover_mark(QPainter &p)
+void Ruler::mouseDoubleClickEvent(QMouseEvent *e)
 {
-       const int x = _view.hover_point().x();
+       view_.add_flag(view_.offset() + ((double)e->x() + 0.5) * view_.scale());
+}
+
+void Ruler::draw_hover_mark(QPainter &p, int text_height)
+{
+       const int x = view_.hover_point().x();
 
        if (x == -1)
                return;
@@ -123,54 +168,24 @@ void Ruler::draw_hover_mark(QPainter &p)
        p.setPen(QPen(Qt::NoPen));
        p.setBrush(QBrush(palette().color(foregroundRole())));
 
-       const int b = height() - 1;
+       const int b = RulerHeight * text_height;
+       const float hover_arrow_size = HoverArrowSize * text_height;
        const QPointF points[] = {
                QPointF(x, b),
-               QPointF(x - HoverArrowSize, b - HoverArrowSize),
-               QPointF(x + HoverArrowSize, b - HoverArrowSize)
+               QPointF(x - hover_arrow_size, b - hover_arrow_size),
+               QPointF(x + hover_arrow_size, b - hover_arrow_size)
        };
        p.drawPolygon(points, countof(points));
 }
 
-void Ruler::hover_point_changed()
+int Ruler::calculate_text_height() const
 {
-       update();
+       return QFontMetrics(font()).ascent();
 }
 
-std::pair<double, unsigned int> Ruler::calculate_tick_spacing(
-       QPainter& p, double scale, double offset)
+void Ruler::hover_point_changed()
 {
-       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);
+       update();
 }
 
 } // namespace view