projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move run/stop button from the menu bar to the tab widget
[pulseview.git]
/
pv
/
view
/
viewwidget.hpp
diff --git
a/pv/view/viewwidget.hpp
b/pv/view/viewwidget.hpp
index e2c04f297a0c9b81a084ec1886a9d86cd35dd66d..cfcbda43ff3b68db0679d6f4a44fd5e50017adf5 100644
(file)
--- a/
pv/view/viewwidget.hpp
+++ b/
pv/view/viewwidget.hpp
@@
-28,7
+28,8
@@
class QTouchEvent;
namespace pv {
class QTouchEvent;
namespace pv {
-namespace view {
+namespace views {
+namespace TraceView {
class View;
class ViewItem;
class View;
class ViewItem;
@@
-47,7
+48,7
@@
protected:
* @remarks the default implementation does nothing.
*/
virtual void item_hover(
* @remarks the default implementation does nothing.
*/
virtual void item_hover(
- const std::shared_ptr<
pv::view::
ViewItem> &item);
+ const std::shared_ptr<ViewItem> &item);
/**
* Indicates the event an a view item has been clicked.
/**
* Indicates the event an a view item has been clicked.
@@
-55,7
+56,7
@@
protected:
* @remarks the default implementation does nothing.
*/
virtual void item_clicked(
* @remarks the default implementation does nothing.
*/
virtual void item_clicked(
- const std::shared_ptr<
pv::view::
ViewItem> &item);
+ const std::shared_ptr<ViewItem> &item);
/**
* Returns true if the selection of row items allows dragging.
/**
* Returns true if the selection of row items allows dragging.
@@
-94,7
+95,7
@@
protected:
/**
* Gets the items in the view widget.
*/
/**
* Gets the items in the view widget.
*/
- virtual std::vector< std::shared_ptr<
pv::view::
ViewItem> > items() = 0;
+ virtual std::vector< std::shared_ptr<ViewItem> > items() = 0;
/**
* Gets the first view item which has a hit-box that contains @c pt .
/**
* Gets the first view item which has a hit-box that contains @c pt .
@@
-102,7
+103,7
@@
protected:
* @return the view item that has been found, or and empty
* @c shared_ptr if no item was found.
*/
* @return the view item that has been found, or and empty
* @c shared_ptr if no item was found.
*/
- virtual std::shared_ptr<
pv::view::
ViewItem> get_mouse_over_item(
+ virtual std::shared_ptr<ViewItem> get_mouse_over_item(
const QPoint &pt) = 0;
/**
const QPoint &pt) = 0;
/**
@@
-121,12
+122,12
@@
protected:
* 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.
*/
- virtual bool touch_event(QTouchEvent *e);
+ virtual bool touch_event(QTouchEvent *e
vent
);
protected:
bool event(QEvent *event);
protected:
bool event(QEvent *event);
- void mousePressEvent(QMouseEvent *
event);
+ void mousePressEvent(QMouseEvent *event);
void mouseReleaseEvent(QMouseEvent *event);
void mouseMoveEvent(QMouseEvent *event);
void mouseReleaseEvent(QMouseEvent *event);
void mouseMoveEvent(QMouseEvent *event);
@@
-139,14
+140,15
@@
Q_SIGNALS:
void selection_changed();
protected:
void selection_changed();
protected:
- pv::view::View &view_;
+ pv::view
s::TraceView
::View &view_;
QPoint mouse_point_;
QPoint mouse_down_point_;
std::shared_ptr<ViewItem> mouse_down_item_;
bool item_dragging_;
};
QPoint mouse_point_;
QPoint mouse_down_point_;
std::shared_ptr<ViewItem> mouse_down_item_;
bool item_dragging_;
};
-} // namespace view
+} // namespace TraceView
+} // namespace views
} // namespace pv
#endif // PULSEVIEW_PV_VIEWWIDGET_HPP
} // namespace pv
#endif // PULSEVIEW_PV_VIEWWIDGET_HPP