X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fviewport.cpp;h=2dcf9dc78f83ac740b3d3051d639ee8caa88c288;hp=572e38b154317f30612e57e07165548f560bdd80;hb=f76af6375b8aea6b7edb2d6ee838e1589c3490f3;hpb=cdf7bea7f0eead18de2616cbfd8697ac0fffb59b diff --git a/pv/view/viewport.cpp b/pv/view/viewport.cpp index 572e38b1..2dcf9dc7 100644 --- a/pv/view/viewport.cpp +++ b/pv/view/viewport.cpp @@ -1,5 +1,5 @@ /* - * This file is part of the sigrok project. + * This file is part of the PulseView project. * * Copyright (C) 2012 Joel Holdsworth * @@ -21,15 +21,10 @@ #include "view.h" #include "viewport.h" -#include "../../sigsession.h" -#include "../../signal.h" - -#include "../../extdef.h" +#include "../sigsession.h" +#include "../signal.h" #include -#include - -#include #include @@ -39,103 +34,54 @@ using namespace std; namespace pv { namespace view { -const int Viewport::SignalHeight = 50; - -const int Viewport::MinorTickSubdivision = 4; -const int Viewport::ScaleUnits[3] = {1, 2, 5}; - -const QString Viewport::SIPrefixes[9] = - {"f", "p", "n", QChar(0x03BC), "m", "", "k", "M", "G"}; -const int Viewport::FirstSIPrefixPower = -15; - Viewport::Viewport(View &parent) : - QGLWidget(&parent), + QWidget(&parent), _view(parent) { setMouseTracking(true); - setAutoFillBackground(false); + setAutoFillBackground(true); + setBackgroundRole(QPalette::Base); } int Viewport::get_total_height() const { int height = 0; BOOST_FOREACH(const shared_ptr s, - _view._session.get_signals()) { + _view.session().get_signals()) { assert(s); - height += SignalHeight; + height += View::SignalHeight; } return height; } -void Viewport::initializeGL() -{ -} - -void Viewport::resizeGL(int width, int height) -{ - setup_viewport(width, height); -} - void Viewport::paintEvent(QPaintEvent *event) { - int offset; - const vector< shared_ptr > &sigs = - _view._session.get_signals(); + _view.session().get_signals(); - // Prepare for OpenGL rendering - makeCurrent(); - glMatrixMode(GL_MODELVIEW); - glPushMatrix(); + QPainter p(this); + p.setRenderHint(QPainter::Antialiasing); - setup_viewport(width(), height()); - - qglClearColor(Qt::white); - glClear(GL_COLOR_BUFFER_BIT); + draw_cursors_background(p); // Plot the signal - glEnable(GL_SCISSOR_TEST); - glScissor(View::LabelMarginWidth, 0, width(), height()); - offset = View::RulerHeight - _view.v_offset(); + int offset = -_view.v_offset(); BOOST_FOREACH(const shared_ptr s, sigs) { assert(s); - const QRect signal_rect(View::LabelMarginWidth, offset, - width() - View::LabelMarginWidth, SignalHeight); + const QRect signal_rect(0, offset, + width(), View::SignalHeight); - s->paint(*this, signal_rect, _view.scale(), _view.offset()); + s->paint(p, signal_rect, _view.scale(), _view.offset()); - offset += SignalHeight; + offset += View::SignalHeight; } - glDisable(GL_SCISSOR_TEST); - - // Prepare for QPainter rendering - glMatrixMode(GL_MODELVIEW); - glPopMatrix(); + draw_cursors_foreground(p); - QPainter painter(this); - painter.setRenderHint(QPainter::Antialiasing); - - // Paint the labels - offset = View::RulerHeight - _view.v_offset(); - BOOST_FOREACH(const shared_ptr s, sigs) - { - assert(s); - - const QRect label_rect(0, offset, - View::LabelMarginWidth, SignalHeight); - s->paint_label(painter, label_rect); - - offset += SignalHeight; - } - - // Paint the ruler - paint_ruler(painter); - - painter.end(); + p.end(); } void Viewport::mousePressEvent(QMouseEvent *event) @@ -167,84 +113,35 @@ void Viewport::mouseReleaseEvent(QMouseEvent *event) void Viewport::wheelEvent(QWheelEvent *event) { assert(event); - _view.zoom(event->delta() / 120, event->x() - - View::LabelMarginWidth); + _view.zoom(event->delta() / 120, event->x()); } -void Viewport::setup_viewport(int width, int height) +void Viewport::draw_cursors_background(QPainter &p) { - glViewport(0, 0, (GLint)width, (GLint)height); - glMatrixMode(GL_PROJECTION); - glLoadIdentity(); - glOrtho(0, width, height, 0, -1, 1); - glMatrixMode(GL_MODELVIEW); -} - -void Viewport::paint_ruler(QPainter &p) -{ - const double MinSpacing = 80; - - const double min_period = _view.scale() * MinSpacing; + if(!_view.cursors_shown()) + return; - const int order = (int)floorf(log10f(min_period)); - const double order_decimal = pow(10, order); + p.setPen(Qt::NoPen); + p.setBrush(QBrush(View::CursorAreaColour)); - int unit = 0; - double tick_period = 0.0f; + const pair &c = _view.cursors(); + const float x1 = (c.first.time() - _view.offset()) / _view.scale(); + const float x2 = (c.second.time() - _view.offset()) / _view.scale(); + const int l = (int)max(min(x1, x2), 0.0f); + const int r = (int)min(max(x1, x2), (float)width()); - do - { - tick_period = order_decimal * ScaleUnits[unit++]; - } while(tick_period < min_period && unit < countof(ScaleUnits)); - - const int prefix = (order - FirstSIPrefixPower) / 3; - assert(prefix >= 0); - assert(prefix < countof(SIPrefixes)); - - const int text_height = p.boundingRect(0, 0, INT_MAX, INT_MAX, - Qt::AlignLeft | Qt::AlignTop, "8").height(); - - // Draw the tick marks - p.setPen(Qt::black); + p.drawRect(l, 0, r - l, height()); +} - 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; +void Viewport::draw_cursors_foreground(QPainter &p) +{ + if(!_view.cursors_shown()) + return; - 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() + - View::LabelMarginWidth; - - if(x >= width()) - break; - - if(division % MinorTickSubdivision == 0) - { - // Draw a major tick - QString s; - QTextStream ts(&s); - ts << (t / order_decimal) << SIPrefixes[prefix] << "s"; - p.drawText(x, 0, 0, text_height, Qt::AlignCenter | Qt::AlignTop | - Qt::TextDontClip, s); - p.drawLine(x, text_height, x, View::RulerHeight); - } - else - { - // Draw a minor tick - p.drawLine(x, - (text_height + View::RulerHeight) / 2, x, - View::RulerHeight); - } - - division++; - } + const QRect r = rect(); + pair &cursors = _view.cursors(); + cursors.first.paint(p, r); + cursors.second.paint(p, r); } } // namespace view