X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;ds=inline;f=pv%2Fview%2Fviewport.cpp;h=1504f482ca3915d605ff9a09d66e6c1584ab7362;hb=53bb2e1de75f5cca9244efc83c4e77a222e322f4;hp=2772c7764ead3a45b2c76733be6b0fe98d252c05;hpb=282905348863fe871a48c680bd12bc1dee364a43;p=pulseview.git
diff --git a/pv/view/viewport.cpp b/pv/view/viewport.cpp
index 2772c77..1504f48 100644
--- a/pv/view/viewport.cpp
+++ b/pv/view/viewport.cpp
@@ -14,8 +14,7 @@
* 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
@@ -32,9 +31,12 @@
#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;
@@ -44,11 +46,11 @@ 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);
@@ -57,36 +59,52 @@ 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))
+ (*i)->hit_box_rect(pp).contains(pt))
return *i;
return nullptr;
}
+void Viewport::item_hover(const shared_ptr &item)
+{
+ if (item && item->is_draggable())
+ setCursor(dynamic_pointer_cast(item) ?
+ Qt::SizeVerCursor : Qt::SizeHorCursor);
+ else
+ unsetCursor();
+}
+
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 std::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;
@@ -106,8 +124,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;
}
@@ -139,13 +157,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(),
@@ -168,6 +186,8 @@ void Viewport::paintEvent(QPaintEvent*)
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);
@@ -189,15 +209,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