X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fview.cpp;h=c5465ff3c6ba19eef1cd68ba2082ba40d7f413c4;hp=4e0fed063fca8c4d42e67c5bcb6cb58c23cee390;hb=4b192962559bb212408a94f48a9a8efead024aa7;hpb=ccdd3ef548ce34f25c6c168598556a350831aa37 diff --git a/pv/view/view.cpp b/pv/view/view.cpp index 4e0fed06..c5465ff3 100644 --- a/pv/view/view.cpp +++ b/pv/view/view.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 * @@ -19,21 +19,24 @@ */ #include +#include #include #include #include +#include #include #include "header.h" #include "ruler.h" +#include "signal.h" #include "view.h" #include "viewport.h" -#include "../../logicdata.h" -#include "../../logicdatasnapshot.h" -#include "../../sigsession.h" +#include "../logicdata.h" +#include "../logicdatasnapshot.h" +#include "../sigsession.h" using namespace boost; using namespace std; @@ -47,7 +50,15 @@ const double View::MinScale = 1e-15; const int View::LabelMarginWidth = 70; const int View::RulerHeight = 30; -const int View::SignalHeight = 50; +const int View::MaxScrollValue = INT_MAX / 2; + +const int View::SignalHeight = 30; +const int View::SignalMargin = 10; +const int View::SignalSnapGridSize = 10; + +const QColor View::CursorAreaColour(220, 231, 243); + +const QSizeF View::LabelPadding(4, 0); View::View(SigSession &session, QWidget *parent) : QAbstractScrollArea(parent), @@ -58,7 +69,11 @@ View::View(SigSession &session, QWidget *parent) : _data_length(0), _scale(1e-6), _offset(0), - _v_offset(0) + _v_offset(0), + _show_cursors(false), + _cursors(pair(Cursor(*this, 0.0), + Cursor(*this, 1.0))), + _hover_point(-1, -1) { connect(horizontalScrollBar(), SIGNAL(valueChanged(int)), this, SLOT(h_scroll_value_changed(int))); @@ -67,8 +82,20 @@ View::View(SigSession &session, QWidget *parent) : connect(&_session, SIGNAL(data_updated()), this, SLOT(data_updated())); + connect(&_cursors.first, SIGNAL(time_changed()), + this, SLOT(marker_time_changed())); + connect(&_cursors.second, SIGNAL(time_changed()), + this, SLOT(marker_time_changed())); + + connect(_header, SIGNAL(signals_moved()), + this, SLOT(on_signals_moved())); + setViewportMargins(LabelMarginWidth, RulerHeight, 0, 0); setViewport(_viewport); + + _viewport->installEventFilter(this); + _ruler->installEventFilter(this); + _header->installEventFilter(this); } SigSession& View::session() @@ -96,6 +123,19 @@ void View::zoom(double steps) zoom(steps, (width() - LabelMarginWidth) / 2); } +void View::zoom(double steps, int offset) +{ + const double cursor_offset = _offset + _scale * offset; + _scale *= pow(3.0/2.0, -steps); + _scale = max(min(_scale, MaxScale), MinScale); + _offset = cursor_offset - _scale * offset; + + _ruler->update(); + _viewport->update(); + update_scroll(); +} + + void View::set_scale_offset(double scale, double offset) { _scale = scale; @@ -106,6 +146,54 @@ void View::set_scale_offset(double scale, double offset) _viewport->update(); } +bool View::cursors_shown() const +{ + return _show_cursors; +} + +void View::show_cursors(bool show) +{ + _show_cursors = show; + _ruler->update(); + _viewport->update(); +} + +std::pair& View::cursors() +{ + return _cursors; +} + +const QPoint& View::hover_point() const +{ + return _hover_point; +} + +void View::normalize_layout() +{ + vector< shared_ptr > &sigs = _session.get_signals(); + + int v_min = INT_MAX; + BOOST_FOREACH(const shared_ptr s, sigs) + v_min = min(s->get_v_offset(), v_min); + + const int delta = -min(v_min, 0); + BOOST_FOREACH(shared_ptr s, sigs) + s->set_v_offset(s->get_v_offset() + delta); + + verticalScrollBar()->setSliderPosition(_v_offset + delta); + v_scroll_value_changed(verticalScrollBar()->sliderPosition()); +} + +void View::get_scroll_layout(double &length, double &offset) const +{ + const shared_ptr sig_data = _session.get_data(); + if(!sig_data) + return; + + length = _data_length / (sig_data->get_samplerate() * _scale); + offset = _offset / _scale; +} + void View::update_scroll() { assert(_viewport); @@ -114,34 +202,62 @@ void View::update_scroll() // Set the horizontal scroll bar double length = 0, offset = 0; - const shared_ptr sig_data = _session.get_data(); - if(sig_data) { - length = _data_length / - (sig_data->get_samplerate() * _scale); - offset = _offset / _scale; - } + get_scroll_layout(length, offset); + length = max(length - areaSize.width(), 0.0); horizontalScrollBar()->setPageStep(areaSize.width()); - horizontalScrollBar()->setRange(0, - max((int)(length - areaSize.width()), 0)); - horizontalScrollBar()->setSliderPosition(offset); + + if(length < MaxScrollValue) { + horizontalScrollBar()->setRange(0, length); + horizontalScrollBar()->setSliderPosition(offset); + } else { + horizontalScrollBar()->setRange(0, MaxScrollValue); + horizontalScrollBar()->setSliderPosition( + _offset * MaxScrollValue / (_scale * length)); + } // Set the vertical scrollbar verticalScrollBar()->setPageStep(areaSize.height()); verticalScrollBar()->setRange(0, - _viewport->get_total_height() - areaSize.height()); + _viewport->get_total_height() + SignalMargin - + areaSize.height()); } -void View::zoom(double steps, int offset) +void View::reset_signal_layout() { - const double cursor_offset = _offset + _scale * offset; - _scale *= pow(3.0/2.0, -steps); - _scale = max(min(_scale, MaxScale), MinScale); - _offset = cursor_offset - _scale * offset; + int offset = SignalMargin; + vector< shared_ptr > &sigs = _session.get_signals(); + BOOST_FOREACH(shared_ptr s, sigs) { + s->set_v_offset(offset); + offset += SignalHeight + 2 * SignalMargin; + } - _ruler->update(); - _viewport->update(); - update_scroll(); + normalize_layout(); +} + +bool View::eventFilter(QObject *object, QEvent *event) +{ + const QEvent::Type type = event->type(); + if(type == QEvent::MouseMove) { + + const QMouseEvent *const mouse_event = (QMouseEvent*)event; + if(object == _viewport) + _hover_point = mouse_event->pos(); + else if(object == _ruler) + _hover_point = QPoint(mouse_event->x(), 0); + else if(object == _header) + _hover_point = QPoint(0, mouse_event->y()); + else + _hover_point = QPoint(-1, -1); + + hover_point_changed(); + + } else if(type == QEvent::Leave) { + _hover_point = QPoint(-1, -1); + hover_point_changed(); + } + + return QObject::eventFilter(object, event); } bool View::viewportEvent(QEvent *e) @@ -171,7 +287,15 @@ void View::resizeEvent(QResizeEvent *e) void View::h_scroll_value_changed(int value) { - _offset = _scale * value; + const int range = horizontalScrollBar()->maximum(); + if(range < MaxScrollValue) + _offset = _scale * value; + else { + double length = 0, offset; + get_scroll_layout(length, offset); + _offset = _scale * length * value / MaxScrollValue; + } + _ruler->update(); _viewport->update(); } @@ -202,6 +326,21 @@ void View::data_updated() // Repaint the view _viewport->update(); + + /// @todo: Call this only once when the signals are first created. + reset_signal_layout(); +} + +void View::marker_time_changed() +{ + _ruler->update(); + _viewport->update(); +} + +void View::on_signals_moved() +{ + update_scroll(); + signals_moved(); } } // namespace view