X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fviewport.cpp;h=2d10f2a054fadb31dc47783d3395460c54fb2c0a;hb=12ea3616767553ee0a615f14bbcb8ec614589e34;hp=ac494272de8705522a6c1ca43e073dbd3f9d23d0;hpb=34ec096859764f71c210ec7c271fcac2b96374cc;p=pulseview.git
diff --git a/pv/view/viewport.cpp b/pv/view/viewport.cpp
index ac49427..2d10f2a 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,6 +31,8 @@
#include
+#include
+
using std::abs;
using std::back_inserter;
using std::copy;
@@ -45,7 +46,8 @@ using std::stable_sort;
using std::vector;
namespace pv {
-namespace view {
+namespace views {
+namespace TraceView {
Viewport::Viewport(View &parent) :
ViewWidget(parent),
@@ -68,7 +70,7 @@ shared_ptr Viewport::get_mouse_over_item(const QPoint &pt)
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
@@ -78,6 +80,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)
@@ -87,6 +90,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()
@@ -97,7 +102,7 @@ void Viewport::drag_release()
vector< shared_ptr > Viewport::items()
{
vector< shared_ptr > items;
- const std::vector< shared_ptr > view_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());
@@ -199,29 +204,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