#include <cmath>
#include <algorithm>
-#include "view.h"
-#include "viewport.h"
+#include "signal.hpp"
+#include "view.hpp"
+#include "viewitempaintparams.hpp"
+#include "viewport.hpp"
-#include "signal.h"
-#include "../sigsession.h"
+#include <pv/session.hpp>
#include <QMouseEvent>
using std::abs;
using std::max;
using std::min;
+using std::none_of;
using std::shared_ptr;
using std::stable_sort;
using std::vector;
namespace view {
Viewport::Viewport(View &parent) :
- QWidget(&parent),
- _view(parent),
- _mouse_down_valid(false),
- _pinch_zoom_active(false)
+ ViewWidget(parent),
+ mouse_down_valid_(false),
+ pinch_zoom_active_(false)
{
setAttribute(Qt::WA_AcceptTouchEvents, true);
- setMouseTracking(true);
setAutoFillBackground(true);
setBackgroundRole(QPalette::Base);
- connect(&_view.session(), SIGNAL(signals_changed()),
- this, SLOT(on_signals_changed()));
-
- connect(&_view, SIGNAL(signals_moved()),
+ connect(&view_, SIGNAL(signals_moved()),
this, SLOT(on_signals_moved()));
}
-int Viewport::get_total_height() const
-{
- int h = 0;
- for (auto &i : _view)
- h = max(i->v_offset() + View::SignalHeight, h);
- return h;
-}
-
void Viewport::paintEvent(QPaintEvent*)
{
- vector< shared_ptr<RowItem> > row_items(_view.begin(), _view.end());
+ vector< shared_ptr<RowItem> > row_items(view_.begin(), view_.end());
+ assert(none_of(row_items.begin(), row_items.end(),
+ [](const shared_ptr<RowItem> &r) { return !r; }));
+
stable_sort(row_items.begin(), row_items.end(),
[](const shared_ptr<RowItem> &a, const shared_ptr<RowItem> &b) {
- return a->v_offset() < b->v_offset(); });
+ return a->visual_v_offset() < b->visual_v_offset(); });
+
+ const vector< shared_ptr<TimeItem> > time_items(view_.time_items());
+ assert(none_of(time_items.begin(), time_items.end(),
+ [](const shared_ptr<TimeItem> &t) { return !t; }));
QPainter p(this);
p.setRenderHint(QPainter::Antialiasing);
- if (_view.cursors_shown())
- _view.cursors().draw_viewport_background(p, rect());
+ const ViewItemPaintParams pp(rect(), view_.scale(), view_.offset());
- // Plot the signal
+ for (const shared_ptr<TimeItem> t : time_items)
+ t->paint_back(p, pp);
for (const shared_ptr<RowItem> r : row_items)
- {
- assert(r);
- r->paint_back(p, 0, width());
- }
+ r->paint_back(p, pp);
+ for (const shared_ptr<TimeItem> t : time_items)
+ t->paint_mid(p, pp);
for (const shared_ptr<RowItem> r : row_items)
- r->paint_mid(p, 0, width());
+ r->paint_mid(p, pp);
for (const shared_ptr<RowItem> r : row_items)
- r->paint_fore(p, 0, width());
-
- if (_view.cursors_shown())
- _view.cursors().draw_viewport_foreground(p, rect());
+ r->paint_fore(p, pp);
+ for (const shared_ptr<TimeItem> t : time_items)
+ t->paint_fore(p, pp);
p.end();
}
assert(event);
if (event->button() == Qt::LeftButton) {
- _mouse_down_point = event->pos();
- _mouse_down_offset = _view.offset();
- _mouse_down_valid = true;
+ mouse_down_point_ = event->pos();
+ mouse_down_offset_ = view_.offset();
+ mouse_down_valid_ = true;
}
}
assert(event);
if (event->button() == Qt::LeftButton)
- _mouse_down_valid = false;
+ mouse_down_valid_ = false;
}
void Viewport::mouseMoveEvent(QMouseEvent *event)
assert(event);
if (event->buttons() & Qt::LeftButton) {
- if (!_mouse_down_valid) {
- _mouse_down_point = event->pos();
- _mouse_down_offset = _view.offset();
- _mouse_down_valid = true;
+ if (!mouse_down_valid_) {
+ mouse_down_point_ = event->pos();
+ mouse_down_offset_ = view_.offset();
+ mouse_down_valid_ = true;
}
- _view.set_scale_offset(_view.scale(),
- _mouse_down_offset +
- (_mouse_down_point - event->pos()).x() *
- _view.scale());
+ view_.set_scale_offset(view_.scale(),
+ mouse_down_offset_ +
+ (mouse_down_point_ - event->pos()).x() *
+ view_.scale());
}
}
assert(event);
if (event->buttons() & Qt::LeftButton)
- _view.zoom(2.0, event->x());
+ view_.zoom(2.0, event->x());
else if (event->buttons() & Qt::RightButton)
- _view.zoom(-2.0, event->x());
+ view_.zoom(-2.0, event->x());
}
void Viewport::wheelEvent(QWheelEvent *event)
if (event->orientation() == Qt::Vertical) {
// Vertical scrolling is interpreted as zooming in/out
- _view.zoom(event->delta() / 120, event->x());
+ 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());
+ view_.set_scale_offset(view_.scale(),
+ event->delta() * view_.scale()
+ + view_.offset());
}
}
QList<QTouchEvent::TouchPoint> touchPoints = event->touchPoints();
if (touchPoints.count() != 2) {
- _pinch_zoom_active = false;
+ pinch_zoom_active_ = false;
return false;
}
const QTouchEvent::TouchPoint &touchPoint0 = touchPoints.first();
const QTouchEvent::TouchPoint &touchPoint1 = touchPoints.last();
- if (!_pinch_zoom_active ||
+ if (!pinch_zoom_active_ ||
(event->touchPointStates() & Qt::TouchPointPressed)) {
- _pinch_offset0 = _view.offset() + _view.scale() * touchPoint0.pos().x();
- _pinch_offset1 = _view.offset() + _view.scale() * touchPoint1.pos().x();
- _pinch_zoom_active = true;
+ pinch_offset0_ = view_.offset() + view_.scale() * touchPoint0.pos().x();
+ pinch_offset1_ = view_.offset() + view_.scale() * touchPoint1.pos().x();
+ pinch_zoom_active_ = true;
}
double w = touchPoint1.pos().x() - touchPoint0.pos().x();
if (abs(w) >= 1.0) {
- double scale = (_pinch_offset1 - _pinch_offset0) / w;
+ double scale = (pinch_offset1_ - pinch_offset0_) / w;
if (scale < 0)
scale = -scale;
- double offset = _pinch_offset0 - touchPoint0.pos().x() * scale;
+ double offset = pinch_offset0_ - touchPoint0.pos().x() * scale;
if (scale > 0)
- _view.set_scale_offset(scale, offset);
+ view_.set_scale_offset(scale, offset);
}
if (event->touchPointStates() & Qt::TouchPointReleased) {
- _pinch_zoom_active = false;
+ pinch_zoom_active_ = false;
if (touchPoint0.state() & Qt::TouchPointReleased) {
// Primary touch released
- _mouse_down_valid = false;
+ mouse_down_valid_ = false;
} else {
// Update the mouse down fields so that continued
// dragging with the primary touch will work correctly
- _mouse_down_point = touchPoint0.pos().toPoint();
- _mouse_down_offset = _view.offset();
- _mouse_down_valid = true;
+ mouse_down_point_ = touchPoint0.pos().toPoint();
+ mouse_down_offset_ = view_.offset();
+ mouse_down_valid_ = true;
}
}
return true;
}
-void Viewport::on_signals_changed()
-{
- for (shared_ptr<RowItem> r : _view) {
- assert(r);
- connect(r.get(), SIGNAL(appearance_changed()),
- this, SLOT(update()));
- }
-}
-
void Viewport::on_signals_moved()
{
update();
projects / pulseview.git / blobdiff