projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
View: Move assertion after assignment
[pulseview.git]
/
pv
/
view
/
marginwidget.hpp
diff --git
a/pv/view/marginwidget.hpp
b/pv/view/marginwidget.hpp
index 5b6631af724f3177e5c643bda1f0674e0ad5ccad..455aaf970aed35c734269ebd08ba03f8d6edf74a 100644
(file)
--- a/
pv/view/marginwidget.hpp
+++ b/
pv/view/marginwidget.hpp
@@
-18,21
+18,21
@@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef PULSEVIEW_PV_MARGINWIDGET_H
-#define PULSEVIEW_PV_MARGINWIDGET_H
+#ifndef PULSEVIEW_PV_MARGINWIDGET_H
PP
+#define PULSEVIEW_PV_MARGINWIDGET_H
PP
#include <memory>
#include <QPoint>
#include <memory>
#include <QPoint>
-#include <QWidget>
+
+#include "viewwidget.hpp"
namespace pv {
namespace view {
namespace pv {
namespace view {
-class View;
class ViewItem;
class ViewItem;
-class MarginWidget : public
Q
Widget
+class MarginWidget : public
View
Widget
{
Q_OBJECT
{
Q_OBJECT
@@
-47,26
+47,26
@@
public:
virtual QSize extended_size_hint() const = 0;
protected:
virtual QSize extended_size_hint() const = 0;
protected:
+ /**
+ * Indicates the event an a view item has been clicked.
+ * @param item the view item that has been clicked.
+ */
+ virtual void item_clicked(
+ const std::shared_ptr<pv::view::ViewItem> &item);
+
/**
* Shows the popup of a the specified @c ViewItem .
* @param item The item to show the popup for.
*/
void show_popup(const std::shared_ptr<ViewItem> &item);
/**
* Shows the popup of a the specified @c ViewItem .
* @param item The item to show the popup for.
*/
void show_popup(const std::shared_ptr<ViewItem> &item);
-public Q_SLOTS:
- virtual void clear_selection();
-
-Q_SIGNALS:
- void selection_changed();
-
protected:
protected:
- pv::view::View &view_;
- QPoint mouse_point_;
- QPoint mouse_down_point_;
- bool dragging_;
+ virtual void contextMenuEvent(QContextMenuEvent *event);
+
+ virtual void keyPressEvent(QKeyEvent *event);
};
} // namespace view
} // namespace pv
};
} // namespace view
} // namespace pv
-#endif // PULSEVIEW_PV_MARGINWIDGET_H
+#endif // PULSEVIEW_PV_MARGINWIDGET_H
PP