X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fviewport.cpp;h=d81befae9cb69522ea3a52f82f6b85540bfa6d19;hb=379f6ccf486b331a809dde730695af26ec85991d;hp=a4b6680a7fe57bd02ed6b5b2e59888266a4d2552;hpb=32c589f0f6a2218e81d4ee984335c4a88c79b35f;p=pulseview.git
diff --git a/pv/view/viewport.cpp b/pv/view/viewport.cpp
index a4b6680..d81befa 100644
--- a/pv/view/viewport.cpp
+++ b/pv/view/viewport.cpp
@@ -14,13 +14,12 @@
* 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 "signal.hpp"
@@ -32,20 +31,20 @@
#include
+#include
+
using std::abs;
using std::back_inserter;
using std::copy;
using std::dynamic_pointer_cast;
-using std::max;
-using std::min;
-using std::none_of;
-using std::numeric_limits;
+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) :
ViewWidget(parent),
@@ -57,17 +56,17 @@ Viewport::Viewport(View &parent) :
shared_ptr Viewport::get_mouse_over_item(const QPoint &pt)
{
+ 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(rect()).contains(pt))
+ if ((*i)->enabled() && (*i)->hit_box_rect(pp).contains(pt))
return *i;
return nullptr;
}
void Viewport::item_hover(const shared_ptr &item)
{
- if (item)
+ if (item && item->is_draggable())
setCursor(dynamic_pointer_cast(item) ?
Qt::SizeVerCursor : Qt::SizeHorCursor);
else
@@ -77,6 +76,7 @@ void Viewport::item_hover(const shared_ptr &item)
void Viewport::drag()
{
drag_offset_ = view_.offset();
+ drag_v_offset_ = view_.owner_visual_v_offset();
}
void Viewport::drag_by(const QPoint &delta)
@@ -86,6 +86,8 @@ void Viewport::drag_by(const QPoint &delta)
view_.set_scale_offset(view_.scale(),
(*drag_offset_ - delta.x() * view_.scale()));
+
+ view_.set_v_offset(-drag_v_offset_ - delta.y());
}
void Viewport::drag_release()
@@ -95,7 +97,10 @@ void Viewport::drag_release()
vector< shared_ptr > Viewport::items()
{
- vector< shared_ptr > items(view_.begin(), view_.end());
+ 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;
@@ -148,13 +153,13 @@ bool Viewport::touch_event(QTouchEvent *event)
void Viewport::paintEvent(QPaintEvent*)
{
- vector< shared_ptr > row_items(view_.begin(), view_.end());
+ 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->visual_v_offset() < b->visual_v_offset(); });
+ 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(),
@@ -175,10 +180,10 @@ void Viewport::paintEvent(QPaintEvent*)
for (const shared_ptr r : row_items)
r->paint_mid(p, pp);
- p.setRenderHint(QPainter::Antialiasing, false);
-
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);
@@ -195,29 +200,27 @@ void Viewport::mouseDoubleClickEvent(QMouseEvent *event)
view_.zoom(-2.0, event->x());
}
-void Viewport::wheelEvent(QWheelEvent *e)
+void Viewport::wheelEvent(QWheelEvent *event)
{
- assert(e);
+ assert(event);
- if (e->orientation() == Qt::Vertical)
- {
- if (e->modifiers() & Qt::ControlModifier) {
+ 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() -
- (e->delta() * height()) / (8 * 120));
+ (event->delta() * height()) / (8 * 120));
} else {
// Vertical scrolling is interpreted as zooming in/out
- view_.zoom(e->delta() / 120, e->x());
+ view_.zoom(event->delta() / 120, event->x());
}
- }
- else if (e->orientation() == Qt::Horizontal)
- {
+ } else if (event->orientation() == Qt::Horizontal) {
// Horizontal scrolling is interpreted as moving left/right
view_.set_scale_offset(view_.scale(),
- e->delta() * view_.scale() + view_.offset());
+ event->delta() * view_.scale() + view_.offset());
}
}
-} // namespace view
+} // namespace TraceView
+} // namespace views
} // namespace pv