X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fviewport.cpp;h=a179cef1c6ca572609e12ad10ad3ad2de2eef59e;hb=8ce8ebb9796488bd2211591806ed00854ad64bb3;hp=2150182f543dd4a52eb974f3352198e8b2b24b66;hpb=8e21a82cac5eb399dc7158da4b34c664cb4958cd;p=pulseview.git
diff --git a/pv/view/viewport.cpp b/pv/view/viewport.cpp
index 2150182..a179cef 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,25 +31,23 @@
#include
+#include
+
using std::abs;
using std::back_inserter;
using std::copy;
using std::dynamic_pointer_cast;
-using std::isnan;
-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),
- drag_offset_(numeric_limits::signaling_NaN()),
pinch_zoom_active_(false)
{
setAutoFillBackground(true);
@@ -59,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
@@ -79,25 +76,31 @@ 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)
{
- if (isnan(drag_offset_))
+ if (drag_offset_ == boost::none)
return;
- view_.set_scale_offset(view_.scale(), drag_offset_ -
- delta.x() * view_.scale());
+ 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()
{
- drag_offset_ = numeric_limits::signaling_NaN();
+ drag_offset_ = boost::none;
}
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;
@@ -117,8 +120,8 @@ bool Viewport::touch_event(QTouchEvent *event)
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_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;
}
@@ -150,13 +153,19 @@ bool Viewport::touch_event(QTouchEvent *event)
void Viewport::paintEvent(QPaintEvent*)
{
- vector< shared_ptr > row_items(view_.begin(), view_.end());
+ typedef void (ViewItem::*LayerPaintFunc)(
+ QPainter &p, ViewItemPaintParams &pp);
+ LayerPaintFunc layer_paint_funcs[] = {
+ &ViewItem::paint_back, &ViewItem::paint_mid,
+ &ViewItem::paint_fore, nullptr};
+
+ 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(),
@@ -165,22 +174,16 @@ void Viewport::paintEvent(QPaintEvent*)
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 (LayerPaintFunc *paint_func = layer_paint_funcs;
+ *paint_func; paint_func++) {
+ ViewItemPaintParams time_pp(rect(), view_.scale(), view_.offset());
+ for (const shared_ptr t : time_items)
+ (t.get()->*(*paint_func))(p, time_pp);
- for (const shared_ptr r : row_items)
- r->paint_fore(p, pp);
- for (const shared_ptr t : time_items)
- t->paint_fore(p, pp);
+ ViewItemPaintParams row_pp(rect(), view_.scale(), view_.offset());
+ for (const shared_ptr r : row_items)
+ (r.get()->*(*paint_func))(p, row_pp);
+ }
p.end();
}
@@ -200,15 +203,22 @@ void Viewport::wheelEvent(QWheelEvent *event)
assert(event);
if (event->orientation() == Qt::Vertical) {
- // Vertical scrolling is interpreted as zooming in/out
- view_.zoom(event->delta() / 120, event->x());
+ 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());
+ event->delta() * view_.scale() + view_.offset());
}
}
-} // namespace view
+} // namespace TraceView
+} // namespace views
} // namespace pv