X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fviewport.cpp;h=d81befae9cb69522ea3a52f82f6b85540bfa6d19;hb=b8f1cdeba7cf6c2b749ff60102ce4e260fa1309e;hp=8963e047b355dc8f3f0d2d2eba30fd2cb3b92766;hpb=14009012e02866aa8e8d338026901d180d00fcc6;p=pulseview.git
diff --git a/pv/view/viewport.cpp b/pv/view/viewport.cpp
index 8963e04..d81befa 100644
--- a/pv/view/viewport.cpp
+++ b/pv/view/viewport.cpp
@@ -14,227 +14,213 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * along with this program; if not, see .
*/
+#include
#include
#include
-#include
+#include
-#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
#include
+#include
+
using std::abs;
-using std::max;
-using std::min;
+using std::back_inserter;
+using std::copy;
+using std::dynamic_pointer_cast;
+using std::none_of; // Used in assert()s.
using std::shared_ptr;
using std::stable_sort;
using std::vector;
namespace pv {
-namespace view {
+namespace views {
+namespace TraceView {
Viewport::Viewport(View &parent) :
- QWidget(&parent),
- _view(parent),
- _mouse_down_valid(false),
- _pinch_zoom_active(false)
+ ViewWidget(parent),
+ pinch_zoom_active_(false)
{
- setAttribute(Qt::WA_AcceptTouchEvents, true);
-
- setMouseTracking(true);
setAutoFillBackground(true);
setBackgroundRole(QPalette::Base);
-
- 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::signals_updated()
-{
- for (shared_ptr r : _view) {
- assert(r);
- connect(r.get(), SIGNAL(appearance_changed()),
- this, SLOT(update()));
- }
-}
-
-void Viewport::paintEvent(QPaintEvent*)
-{
- vector< shared_ptr > row_items(_view.begin(), _view.end());
- stable_sort(row_items.begin(), row_items.end(),
- [](const shared_ptr &a, const shared_ptr &b) {
- return a->v_offset() < b->v_offset(); });
-
- QPainter p(this);
- p.setRenderHint(QPainter::Antialiasing);
-
- if (_view.cursors_shown())
- _view.cursors().draw_viewport_background(p, rect());
-
- // Plot the signal
- for (const shared_ptr r : row_items)
- {
- assert(r);
- r->paint_back(p, 0, width());
- }
-
- for (const shared_ptr r : row_items)
- r->paint_mid(p, 0, width());
-
- for (const shared_ptr r : row_items)
- r->paint_fore(p, 0, width());
-
- if (_view.cursors_shown())
- _view.cursors().draw_viewport_foreground(p, rect());
-
- p.end();
}
-bool Viewport::event(QEvent *event)
+shared_ptr Viewport::get_mouse_over_item(const QPoint &pt)
{
- switch (event->type()) {
- case QEvent::TouchBegin:
- case QEvent::TouchUpdate:
- case QEvent::TouchEnd:
- if (touchEvent(static_cast(event)))
- return true;
- break;
-
- default:
- break;
- }
-
- return QWidget::event(event);
+ const ViewItemPaintParams pp(rect(), view_.scale(), view_.offset());
+ const vector< shared_ptr > items(this->items());
+ for (auto i = items.rbegin(); i != items.rend(); i++)
+ if ((*i)->enabled() && (*i)->hit_box_rect(pp).contains(pt))
+ return *i;
+ return nullptr;
}
-void Viewport::mousePressEvent(QMouseEvent *event)
+void Viewport::item_hover(const shared_ptr &item)
{
- assert(event);
-
- if (event->button() == Qt::LeftButton) {
- _mouse_down_point = event->pos();
- _mouse_down_offset = _view.offset();
- _mouse_down_valid = true;
- }
+ if (item && item->is_draggable())
+ setCursor(dynamic_pointer_cast(item) ?
+ Qt::SizeVerCursor : Qt::SizeHorCursor);
+ else
+ unsetCursor();
}
-void Viewport::mouseReleaseEvent(QMouseEvent *event)
+void Viewport::drag()
{
- assert(event);
-
- if (event->button() == Qt::LeftButton)
- _mouse_down_valid = false;
+ drag_offset_ = view_.offset();
+ drag_v_offset_ = view_.owner_visual_v_offset();
}
-void Viewport::mouseMoveEvent(QMouseEvent *event)
+void Viewport::drag_by(const QPoint &delta)
{
- assert(event);
+ if (drag_offset_ == boost::none)
+ return;
- if (event->buttons() & Qt::LeftButton) {
- if (!_mouse_down_valid) {
- _mouse_down_point = event->pos();
- _mouse_down_offset = _view.offset();
- _mouse_down_valid = true;
- }
+ view_.set_scale_offset(view_.scale(),
+ (*drag_offset_ - delta.x() * view_.scale()));
- _view.set_scale_offset(_view.scale(),
- _mouse_down_offset +
- (_mouse_down_point - event->pos()).x() *
- _view.scale());
- }
+ view_.set_v_offset(-drag_v_offset_ - delta.y());
}
-void Viewport::mouseDoubleClickEvent(QMouseEvent *event)
+void Viewport::drag_release()
{
- assert(event);
-
- if (event->buttons() & Qt::LeftButton)
- _view.zoom(2.0, event->x());
- else if (event->buttons() & Qt::RightButton)
- _view.zoom(-2.0, event->x());
+ drag_offset_ = boost::none;
}
-void Viewport::wheelEvent(QWheelEvent *event)
+vector< shared_ptr > Viewport::items()
{
- assert(event);
-
- 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());
- }
+ vector< shared_ptr > items;
+ const vector< shared_ptr > view_items(
+ view_.list_by_type());
+ copy(view_items.begin(), view_items.end(), back_inserter(items));
+ const vector< shared_ptr > time_items(view_.time_items());
+ copy(time_items.begin(), time_items.end(), back_inserter(items));
+ return items;
}
-bool Viewport::touchEvent(QTouchEvent *event)
+bool Viewport::touch_event(QTouchEvent *event)
{
QList 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()).convert_to();
+ pinch_offset1_ = (view_.offset() + view_.scale() * touchPoint1.pos().x()).convert_to();
+ pinch_zoom_active_ = true;
}
double w = touchPoint1.pos().x() - touchPoint0.pos().x();
if (abs(w) >= 1.0) {
- double scale = (_pinch_offset1 - _pinch_offset0) / w;
- if (scale < 0)
- scale = -scale;
- double offset = _pinch_offset0 - touchPoint0.pos().x() * scale;
+ const double scale =
+ fabs((pinch_offset1_ - pinch_offset0_) / w);
+ 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;
+ drag_release();
} 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();
+ drag();
}
}
return true;
}
-void Viewport::on_signals_moved()
+void Viewport::paintEvent(QPaintEvent*)
+{
+ vector< shared_ptr > row_items(view_.list_by_type());
+ assert(none_of(row_items.begin(), row_items.end(),
+ [](const shared_ptr &r) { return !r; }));
+
+ stable_sort(row_items.begin(), row_items.end(),
+ [](const shared_ptr &a, const shared_ptr &b) {
+ return a->point(QRect()).y() < b->point(QRect()).y(); });
+
+ const vector< shared_ptr > time_items(view_.time_items());
+ assert(none_of(time_items.begin(), time_items.end(),
+ [](const shared_ptr &t) { return !t; }));
+
+ QPainter p(this);
+ p.setRenderHint(QPainter::Antialiasing);
+
+ const ViewItemPaintParams pp(rect(), view_.scale(), view_.offset());
+
+ for (const shared_ptr t : time_items)
+ t->paint_back(p, pp);
+ for (const shared_ptr r : row_items)
+ r->paint_back(p, pp);
+
+ for (const shared_ptr t : time_items)
+ t->paint_mid(p, pp);
+ for (const shared_ptr r : row_items)
+ r->paint_mid(p, pp);
+
+ for (const shared_ptr r : row_items)
+ r->paint_fore(p, pp);
+
+ p.setRenderHint(QPainter::Antialiasing, false);
+ for (const shared_ptr t : time_items)
+ t->paint_fore(p, pp);
+
+ p.end();
+}
+
+void Viewport::mouseDoubleClickEvent(QMouseEvent *event)
{
- update();
+ assert(event);
+
+ if (event->buttons() & Qt::LeftButton)
+ view_.zoom(2.0, event->x());
+ else if (event->buttons() & Qt::RightButton)
+ view_.zoom(-2.0, event->x());
+}
+
+void Viewport::wheelEvent(QWheelEvent *event)
+{
+ assert(event);
+
+ if (event->orientation() == Qt::Vertical) {
+ if (event->modifiers() & Qt::ControlModifier) {
+ // Vertical scrolling with the control key pressed
+ // is intrepretted as vertical scrolling
+ view_.set_v_offset(-view_.owner_visual_v_offset() -
+ (event->delta() * height()) / (8 * 120));
+ } else {
+ // 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());
+ }
}
-} // namespace view
+} // namespace TraceView
+} // namespace views
} // namespace pv