projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
MainWindow, View::View: Fix two memory errors reported by valgrind
[pulseview.git]
/
pv
/
view
/
marginwidget.hpp
diff --git
a/pv/view/marginwidget.hpp
b/pv/view/marginwidget.hpp
index bd74801bf4d04a7f71e6a3875e2b8ed5acf652e9..b785877299cd49ff508354cb04f6d337d6725a4b 100644
(file)
--- a/
pv/view/marginwidget.hpp
+++ b/
pv/view/marginwidget.hpp
@@
-18,26
+18,27
@@
* 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 pv {
-namespace view {
+namespace views {
+namespace TraceView {
-class View;
class ViewItem;
class ViewItem;
-class MarginWidget : public
Q
Widget
+class MarginWidget : public
View
Widget
{
Q_OBJECT
public:
{
Q_OBJECT
public:
- MarginWidget(
pv::view::
View &parent);
+ MarginWidget(View &parent);
/**
* The extended area that the margin widget would like to be sized to.
/**
* The extended area that the margin widget would like to be sized to.
@@
-48,9
+49,11
@@
public:
protected:
/**
protected:
/**
- * Gets the items in the margin widget.
+ * Indicates the event an a view item has been clicked.
+ * @param item the view item that has been clicked.
*/
*/
- virtual std::vector< std::shared_ptr<pv::view::ViewItem> > items() = 0;
+ virtual void item_clicked(
+ const std::shared_ptr<ViewItem> &item);
/**
* Shows the popup of a the specified @c ViewItem .
/**
* Shows the popup of a the specified @c ViewItem .
@@
-58,24
+61,14
@@
protected:
*/
void show_popup(const std::shared_ptr<ViewItem> &item);
*/
void show_popup(const std::shared_ptr<ViewItem> &item);
-private:
- void leaveEvent(QEvent *event);
-
-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_;
- std::shared_ptr<ViewItem> mouse_down_item_;
- bool dragging_;
+ virtual void contextMenuEvent(QContextMenuEvent *event);
+
+ virtual void keyPressEvent(QKeyEvent *event);
};
};
-} // namespace view
+} // namespace TraceView
+} // namespace views
} // namespace pv
} // namespace pv
-#endif // PULSEVIEW_PV_MARGINWIDGET_H
+#endif // PULSEVIEW_PV_MARGINWIDGET_H
PP