projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ViewWidget: Moved in mouse handlers
[pulseview.git]
/
pv
/
view
/
viewport.cpp
diff --git
a/pv/view/viewport.cpp
b/pv/view/viewport.cpp
index 8963e047b355dc8f3f0d2d2eba30fd2cb3b92766..83df7aa4d1eaaa9543add3896e2b6363457ba200 100644
(file)
--- a/
pv/view/viewport.cpp
+++ b/
pv/view/viewport.cpp
@@
-22,17
+22,21
@@
#include <cmath>
#include <algorithm>
#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;
#include <QMouseEvent>
using std::abs;
+using std::back_inserter;
+using std::copy;
using std::max;
using std::min;
using std::max;
using std::min;
+using std::none_of;
using std::shared_ptr;
using std::stable_sort;
using std::vector;
using std::shared_ptr;
using std::stable_sort;
using std::vector;
@@
-41,66
+45,67
@@
namespace pv {
namespace view {
Viewport::Viewport(View &parent) :
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);
{
setAttribute(Qt::WA_AcceptTouchEvents, true);
- setMouseTracking(true);
setAutoFillBackground(true);
setBackgroundRole(QPalette::Base);
setAutoFillBackground(true);
setBackgroundRole(QPalette::Base);
-
- connect(&_view, SIGNAL(signals_moved()),
- this, SLOT(on_signals_moved()));
}
}
-int Viewport::get_total_height() const
+shared_ptr<ViewItem> Viewport::get_mouse_over_item(const QPoint &pt)
{
{
- int h = 0;
- for (auto &i : _view)
- h = max(i->v_offset() + View::SignalHeight, h);
- return h;
+ const vector< shared_ptr<ViewItem> > items(this->items());
+ for (auto i = items.rbegin(); i != items.rend(); i++)
+ if ((*i)->enabled() &&
+ (*i)->hit_box_rect(rect()).contains(pt))
+ return *i;
+ return nullptr;
}
}
-v
oid Viewport::signals_updated
()
+v
ector< shared_ptr<ViewItem> > Viewport::items
()
{
{
- for (shared_ptr<RowItem> r : _view) {
- assert(r);
- connect(r.get(), SIGNAL(appearance_changed()),
- this, SLOT(update()));
- }
+ vector< shared_ptr<ViewItem> > items(view_.begin(), view_.end());
+ const vector< shared_ptr<TimeItem> > time_items(view_.time_items());
+ copy(time_items.begin(), time_items.end(), back_inserter(items));
+ return items;
}
void Viewport::paintEvent(QPaintEvent*)
{
}
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) {
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);
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)
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)
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)
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();
}
p.end();
}
@@
-127,9
+132,9
@@
void Viewport::mousePressEvent(QMouseEvent *event)
assert(event);
if (event->button() == Qt::LeftButton) {
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;
}
}
}
}
@@
-138,7
+143,7
@@
void Viewport::mouseReleaseEvent(QMouseEvent *event)
assert(event);
if (event->button() == Qt::LeftButton)
assert(event);
if (event->button() == Qt::LeftButton)
-
_mouse_down_valid
= false;
+
mouse_down_valid_
= false;
}
void Viewport::mouseMoveEvent(QMouseEvent *event)
}
void Viewport::mouseMoveEvent(QMouseEvent *event)
@@
-146,16
+151,16
@@
void Viewport::mouseMoveEvent(QMouseEvent *event)
assert(event);
if (event->buttons() & Qt::LeftButton) {
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());
}
}
}
}
@@
-164,9
+169,9
@@
void Viewport::mouseDoubleClickEvent(QMouseEvent *event)
assert(event);
if (event->buttons() & Qt::LeftButton)
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)
else if (event->buttons() & Qt::RightButton)
-
_view
.zoom(-2.0, event->x());
+
view_
.zoom(-2.0, event->x());
}
void Viewport::wheelEvent(QWheelEvent *event)
}
void Viewport::wheelEvent(QWheelEvent *event)
@@
-175,12
+180,12
@@
void Viewport::wheelEvent(QWheelEvent *event)
if (event->orientation() == Qt::Vertical) {
// Vertical scrolling is interpreted as zooming in/out
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
} 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());
}
}
}
}
@@
-189,52
+194,47
@@
bool Viewport::touchEvent(QTouchEvent *event)
QList<QTouchEvent::TouchPoint> touchPoints = event->touchPoints();
if (touchPoints.count() != 2) {
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();
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)) {
(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 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;
if (scale < 0)
scale = -scale;
- double offset =
_pinch_offset0
- touchPoint0.pos().x() * scale;
+ double offset =
pinch_offset0_
- touchPoint0.pos().x() * scale;
if (scale > 0)
if (scale > 0)
-
_view
.set_scale_offset(scale, offset);
+
view_
.set_scale_offset(scale, offset);
}
if (event->touchPointStates() & Qt::TouchPointReleased) {
}
if (event->touchPointStates() & Qt::TouchPointReleased) {
-
_pinch_zoom_active
= false;
+
pinch_zoom_active_
= false;
if (touchPoint0.state() & Qt::TouchPointReleased) {
// Primary touch released
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
} 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;
}
}
}
return true;
}
-void Viewport::on_signals_moved()
-{
- update();
-}
-
} // namespace view
} // namespace pv
} // namespace view
} // namespace pv