projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add selection to Ruler items
[pulseview.git]
/
pv
/
view
/
header.h
diff --git
a/pv/view/header.h
b/pv/view/header.h
index ff058863c2d536a598b5b83a199801bd2ba9b1e5..cb1d36246c3d76abb40b21ef89c7905f3f7062cf 100644
(file)
--- a/
pv/view/header.h
+++ b/
pv/view/header.h
@@
-22,10
+22,12
@@
#define PULSEVIEW_PV_VIEW_HEADER_H
#include <boost/shared_ptr.hpp>
#define PULSEVIEW_PV_VIEW_HEADER_H
#include <boost/shared_ptr.hpp>
+#include <boost/weak_ptr.hpp>
-#include <map>
+#include <list>
+#include <utility>
-#include
<QWidget>
+#include
"marginwidget.h"
namespace pv {
namespace view {
namespace pv {
namespace view {
@@
-33,7
+35,7
@@
namespace view {
class Signal;
class View;
class Signal;
class View;
-class Header : public
Q
Widget
+class Header : public
Margin
Widget
{
Q_OBJECT
{
Q_OBJECT
@@
-44,6
+46,8
@@
private:
boost::shared_ptr<pv::view::Signal> get_mouse_over_signal(
const QPoint &pt);
boost::shared_ptr<pv::view::Signal> get_mouse_over_signal(
const QPoint &pt);
+ void clear_selection();
+
private:
void paintEvent(QPaintEvent *event);
private:
void paintEvent(QPaintEvent *event);
@@
-63,16
+67,17
@@
private slots:
void on_action_set_colour_triggered();
void on_action_set_colour_triggered();
+ void on_signals_moved();
+
signals:
void signals_moved();
private:
signals:
void signals_moved();
private:
- View &_view;
-
QPoint _mouse_point;
QPoint _mouse_down_point;
QPoint _mouse_point;
QPoint _mouse_down_point;
- std::map<const Signal*, int> _mouse_down_signal_offsets;
+ std::list<std::pair<boost::weak_ptr<Signal>, int> >
+ _drag_sigs;
boost::shared_ptr<Signal> _context_signal;
QAction *_action_set_name;
boost::shared_ptr<Signal> _context_signal;
QAction *_action_set_name;