projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Segment: Rework append_samples() so it can handle large input
[pulseview.git]
/
pv
/
view
/
viewport.hpp
diff --git
a/pv/view/viewport.hpp
b/pv/view/viewport.hpp
index f43177d2d3f611d9ea00abe87b6eadfbe02ce92e..de3e681dcf60a38cfa9e22a070e31e5e6a9e9f32 100644
(file)
--- 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
* 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 <http://www.gnu.org/licenses/>.
*/
*/
-#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 <boost/optional.hpp>
#include <QTimer>
#include <QTouchEvent>
#include <QTimer>
#include <QTouchEvent>
+#include "pv/util.hpp"
#include "viewwidget.hpp"
#include "viewwidget.hpp"
+using std::shared_ptr;
+using std::vector;
+
class QPainter;
class QPaintEvent;
class Session;
namespace pv {
class QPainter;
class QPaintEvent;
class Session;
namespace pv {
-namespace view {
+namespace views {
+namespace TraceView {
class View;
class View;
@@
-43,14
+49,20
@@
public:
explicit Viewport(View &parent);
private:
explicit Viewport(View &parent);
private:
+ /**
+ * Indicates when a view item is being hovered over.
+ * @param item The item that is being hovered over, or @c nullptr
+ * if no view item is being hovered over.
+ */
+ void item_hover(const shared_ptr<ViewItem> &item);
+
/**
* Gets the first view item which has a hit-box that contains @c pt .
* @param pt the point to search with.
* @return the view item that has been found, or and empty
* @c shared_ptr if no item was found.
*/
/**
* Gets the first view item which has a hit-box that contains @c pt .
* @param pt the point to search with.
* @return the view item that has been found, or and empty
* @c shared_ptr if no item was found.
*/
- std::shared_ptr<pv::view::ViewItem> get_mouse_over_item(
- const QPoint &pt);
+ shared_ptr<ViewItem> get_mouse_over_item(const QPoint &pt);
/**
* Sets this item into the dragged state.
/**
* Sets this item into the dragged state.
@@
-71,29
+83,31
@@
private:
/**
* Gets the items in the view widget.
*/
/**
* Gets the items in the view widget.
*/
-
std::vector< std::shared_ptr<pv::view::
ViewItem> > items();
+
vector< shared_ptr<
ViewItem> > items();
/**
* Handles touch begin update and end events.
* @param e the event that triggered this handler.
*/
/**
* Handles touch begin update and end events.
* @param e the event that triggered this handler.
*/
- bool touch_event(QTouchEvent *e);
+ bool touch_event(QTouchEvent *e
vent
);
private:
void paintEvent(QPaintEvent *event);
private:
void paintEvent(QPaintEvent *event);
- void mouseDoubleClickEvent(QMouseEvent *
event);
+ void mouseDoubleClickEvent(QMouseEvent *event);
void wheelEvent(QWheelEvent *event);
private:
void wheelEvent(QWheelEvent *event);
private:
- double drag_offset_;
+ boost::optional<pv::util::Timestamp> drag_offset_;
+ int drag_v_offset_;
double pinch_offset0_;
double pinch_offset1_;
bool pinch_zoom_active_;
};
double pinch_offset0_;
double pinch_offset1_;
bool pinch_zoom_active_;
};
-} // namespace view
+} // namespace TraceView
+} // namespace views
} // namespace pv
} // namespace pv
-#endif // PULSEVIEW_PV_VIEW
_VIEWPORT_H
+#endif // PULSEVIEW_PV_VIEW
S_TRACEVIEW_VIEWPORT_HPP