X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fruler.cpp;h=56651169afee06f96813d2625475e0d717add254;hp=ad7082e63bf35a62d7c785ebfe3395db0d58b5db;hb=2acdb232d6bb452cfdfaea3ef5218fb4da592329;hpb=a28a212c7a9a3470e300911fe8aa62833a62d26a diff --git a/pv/view/ruler.cpp b/pv/view/ruler.cpp index ad7082e6..56651169 100644 --- a/pv/view/ruler.cpp +++ b/pv/view/ruler.cpp @@ -18,113 +18,50 @@ * 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 -#include -#include -#include - -#include -#include -#include - -#include - -using namespace boost; -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) : - MarginWidget(parent), - _dragging(false) + MarginWidget(parent) { setMouseTracking(true); - connect(&_view, SIGNAL(hover_point_changed()), + connect(&view_, SIGNAL(hover_point_changed()), this, SLOT(hover_point_changed())); } -void Ruler::clear_selection() -{ - CursorPair &cursors = _view.cursors(); - cursors.first()->select(false); - cursors.second()->select(false); - update(); -} - -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; + std::pair spacing = + calculate_tick_spacing(p, view_.scale(), view_.offset()); - 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)); - - - 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(); @@ -134,9 +71,9 @@ 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 - @@ -150,14 +87,14 @@ void Ruler::paintEvent(QPaintEvent*) do { const double t = t0 + division * minor_tick_period; - x = (t - _view.offset()) / _view.scale(); + 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)); } @@ -172,80 +109,15 @@ void Ruler::paintEvent(QPaintEvent*) } while (x < width()); - // Draw the cursors - if (_view.cursors_shown()) - _view.cursors().draw_markers(p, rect(), prefix); - // Draw the hover mark draw_hover_mark(p); - - p.end(); -} - -void Ruler::mouseMoveEvent(QMouseEvent *e) -{ - if (!(e->buttons() & Qt::LeftButton)) - return; - - if ((e->pos() - _mouse_down_point).manhattanLength() < - QApplication::startDragDistance()) - return; - - _dragging = true; - - if (shared_ptr m = _grabbed_marker.lock()) - m->set_time(_view.offset() + - ((double)e->x() + 0.5) * _view.scale()); -} - -void Ruler::mousePressEvent(QMouseEvent *e) -{ - if (e->buttons() & Qt::LeftButton) - { - _mouse_down_point = e->pos(); - - _grabbed_marker.reset(); - - clear_selection(); - - if (_view.cursors_shown()) { - CursorPair &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(); - } - - if (shared_ptr m = _grabbed_marker.lock()) - m->select(); - - selection_changed(); - } -} - -void Ruler::mouseReleaseEvent(QMouseEvent *) -{ - using pv::widgets::Popup; - - if (!_dragging) - if (shared_ptr m = _grabbed_marker.lock()) { - Popup *const p = m->create_popup(&_view); - p->set_position(mapToGlobal(QPoint(m->get_x(), - height())), Popup::Bottom); - p->show(); - } - - _dragging = false; - _grabbed_marker.reset(); } void Ruler::draw_hover_mark(QPainter &p) { - const int x = _view.hover_point().x(); + const int x = view_.hover_point().x(); - if (x == -1 || _dragging) + if (x == -1) return; p.setPen(QPen(Qt::NoPen)); @@ -265,5 +137,41 @@ void Ruler::hover_point_changed() update(); } +std::pair 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