X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fviewport.hpp;h=de3e681dcf60a38cfa9e22a070e31e5e6a9e9f32;hb=00c2ad4c9530f3f8395b5ae6737965d7e87ea023;hp=78dfbb24bbfd485f7f12ae1f211145af06d8e933;hpb=e8b969a9ae4e0a683eabddc8ded7babaf03844fd;p=pulseview.git
diff --git a/pv/view/viewport.hpp b/pv/view/viewport.hpp
index 78dfbb2..de3e681 100644
--- a/pv/view/viewport.hpp
+++ b/pv/view/viewport.hpp
@@ -14,24 +14,30 @@
* 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 .
*/
-#ifndef PULSEVIEW_PV_VIEW_VIEWPORT_H
-#define PULSEVIEW_PV_VIEW_VIEWPORT_H
+#ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_VIEWPORT_HPP
+#define PULSEVIEW_PV_VIEWS_TRACEVIEW_VIEWPORT_HPP
+
+#include
#include
#include
+#include "pv/util.hpp"
#include "viewwidget.hpp"
+using std::shared_ptr;
+using std::vector;
+
class QPainter;
class QPaintEvent;
class Session;
namespace pv {
-namespace view {
+namespace views {
+namespace TraceView {
class View;
@@ -48,7 +54,7 @@ private:
* @param item The item that is being hovered over, or @c nullptr
* if no view item is being hovered over.
*/
- void item_hover(const std::shared_ptr &item);
+ void item_hover(const shared_ptr &item);
/**
* Gets the first view item which has a hit-box that contains @c pt .
@@ -56,8 +62,7 @@ private:
* @return the view item that has been found, or and empty
* @c shared_ptr if no item was found.
*/
- std::shared_ptr get_mouse_over_item(
- const QPoint &pt);
+ shared_ptr get_mouse_over_item(const QPoint &pt);
/**
* Sets this item into the dragged state.
@@ -78,29 +83,31 @@ private:
/**
* Gets the items in the view widget.
*/
- std::vector< std::shared_ptr > items();
+ vector< shared_ptr > items();
/**
* Handles touch begin update and end events.
* @param e the event that triggered this handler.
*/
- bool touch_event(QTouchEvent *e);
+ bool touch_event(QTouchEvent *event);
private:
void paintEvent(QPaintEvent *event);
- void mouseDoubleClickEvent(QMouseEvent * event);
+ void mouseDoubleClickEvent(QMouseEvent *event);
void wheelEvent(QWheelEvent *event);
private:
- double drag_offset_;
+ boost::optional drag_offset_;
+ int drag_v_offset_;
double pinch_offset0_;
double pinch_offset1_;
bool pinch_zoom_active_;
};
-} // namespace view
+} // namespace TraceView
+} // namespace views
} // namespace pv
-#endif // PULSEVIEW_PV_VIEW_VIEWPORT_H
+#endif // PULSEVIEW_PV_VIEWS_TRACEVIEW_VIEWPORT_HPP