X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;ds=sidebyside;f=pv%2Fview%2Fviewport.hpp;h=555d8f5505d5cb485d829bd245928578c4708e15;hb=ddaded8bccdb05d700b4242b7b3ef59a55b39ac0;hp=c2c42d155d79bf9ecbe28ed54b2741f37271b554;hpb=60d9b99a32e551cffd2b537d3e157d578a761c9b;p=pulseview.git
diff --git a/pv/view/viewport.hpp b/pv/view/viewport.hpp
index c2c42d1..555d8f5 100644
--- a/pv/view/viewport.hpp
+++ b/pv/view/viewport.hpp
@@ -14,12 +14,11 @@
* 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_HPP
-#define PULSEVIEW_PV_VIEW_VIEWPORT_HPP
+#ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_VIEWPORT_HPP
+#define PULSEVIEW_PV_VIEWS_TRACEVIEW_VIEWPORT_HPP
#include
@@ -34,7 +33,8 @@ class QPaintEvent;
class Session;
namespace pv {
-namespace view {
+namespace views {
+namespace TraceView {
class View;
@@ -51,7 +51,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 std::shared_ptr &item);
/**
* Gets the first view item which has a hit-box that contains @c pt .
@@ -59,8 +59,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);
+ std::shared_ptr get_mouse_over_item(const QPoint &pt);
/**
* Sets this item into the dragged state.
@@ -81,29 +80,31 @@ private:
/**
* Gets the items in the view widget.
*/
- std::vector< std::shared_ptr > items();
+ std::vector< std::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:
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_HPP
+#endif // PULSEVIEW_PV_VIEWS_TRACEVIEW_VIEWPORT_HPP