X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fviewport.cpp;h=0e0ae8ae4ad0807f5b99abe1f31ca458f437af94;hp=ee30965d603e12ee29994c49855ad71188977600;hb=38eeddeab105aea3f8015dda5399ebbead21550a;hpb=1d8dca913d07df3a53184e40246eb2e333520e31 diff --git a/pv/view/viewport.cpp b/pv/view/viewport.cpp index ee30965d..0e0ae8ae 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 "signal.h" +#include "../sigsession.h" #include -#include - -#include #include @@ -39,88 +34,53 @@ using namespace std; namespace pv { namespace view { -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); + + connect(&_view, SIGNAL(signals_moved()), + this, SLOT(on_signals_moved())); } int Viewport::get_total_height() const { - int height = 0; - BOOST_FOREACH(const shared_ptr s, - _view.session().get_signals()) { - assert(s); - height += View::SignalHeight; + int h = 0; + const vector< shared_ptr > traces(_view.get_traces()); + BOOST_FOREACH(const shared_ptr t, traces) { + assert(t); + h = max(t->get_v_offset() + View::SignalHeight, h); } - return height; -} - -void Viewport::initializeGL() -{ -} - -void Viewport::resizeGL(int width, int height) -{ - setup_viewport(width, height); + return h; } -void Viewport::paintEvent(QPaintEvent *event) +void Viewport::paintEvent(QPaintEvent*) { - int offset; - - const vector< shared_ptr > &sigs = - _view.session().get_signals(); - - // Prepare for OpenGL rendering - makeCurrent(); - glMatrixMode(GL_MODELVIEW); - glPushMatrix(); + const vector< shared_ptr > traces(_view.get_traces()); - setup_viewport(width(), height()); + QPainter p(this); + p.setRenderHint(QPainter::Antialiasing); - qglClearColor(Qt::white); - glClear(GL_COLOR_BUFFER_BIT); + if (_view.cursors_shown()) + _view.cursors().draw_viewport_background(p, rect()); // Plot the signal - glEnable(GL_SCISSOR_TEST); - glScissor(0, 0, width(), height()); - offset = View::RulerHeight - _view.v_offset(); - BOOST_FOREACH(const shared_ptr s, sigs) + const int v_offset = _view.v_offset(); + BOOST_FOREACH(const shared_ptr t, traces) { - assert(s); - - const QRect signal_rect(0, offset, - width(), View::SignalHeight); - - s->paint(*this, signal_rect, _view.scale(), _view.offset()); - - offset += View::SignalHeight; + assert(t); + t->paint(p, t->get_v_offset() - v_offset, 0, width(), + _view.scale(), _view.offset()); } - glDisable(GL_SCISSOR_TEST); - - // Prepare for QPainter rendering - glMatrixMode(GL_MODELVIEW); - glPopMatrix(); - - QPainter painter(this); - painter.setRenderHint(QPainter::Antialiasing); + if (_view.cursors_shown()) + _view.cursors().draw_viewport_foreground(p, rect()); - // Paint the ruler - paint_ruler(painter); - - painter.end(); + p.end(); } void Viewport::mousePressEvent(QMouseEvent *event) @@ -135,7 +95,7 @@ void Viewport::mouseMoveEvent(QMouseEvent *event) { assert(event); - if(event->buttons() & Qt::LeftButton) + if (event->buttons() & Qt::LeftButton) { _view.set_scale_offset(_view.scale(), _mouse_down_offset + @@ -144,90 +104,24 @@ void Viewport::mouseMoveEvent(QMouseEvent *event) } } -void Viewport::mouseReleaseEvent(QMouseEvent *event) -{ - assert(event); -} - void Viewport::wheelEvent(QWheelEvent *event) { assert(event); - _view.zoom(event->delta() / 120, event->x()); -} -void Viewport::setup_viewport(int width, int height) -{ - glViewport(0, 0, (GLint)width, (GLint)height); - glMatrixMode(GL_PROJECTION); - glLoadIdentity(); - glOrtho(0, width, height, 0, -1, 1); - glMatrixMode(GL_MODELVIEW); + if (event->orientation() == Qt::Vertical) { + // Vertical scrolling is interpreted as zooming in/out + _view.zoom(event->delta() / 120, event->x()); + } else if (event->orientation() == Qt::Horizontal) { + // Horizontal scrolling is interpreted as moving left/right + _view.set_scale_offset(_view.scale(), + event->delta() * _view.scale() + + _view.offset()); + } } -void Viewport::paint_ruler(QPainter &p) +void Viewport::on_signals_moved() { - 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); - - int unit = 0; - double tick_period = 0.0f; - - 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); - - 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; - - 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(); - - 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++; - } + update(); } } // namespace view