projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixes for clang build on OS X
[pulseview.git]
/
pv
/
view
/
header.h
diff --git
a/pv/view/header.h
b/pv/view/header.h
index efc126e9aa36d305bba37a39dd11b10cd5ad10a3..806cc985c3d482877539cc07d6f90ee77c22cea5 100644
(file)
--- a/
pv/view/header.h
+++ b/
pv/view/header.h
@@
-22,45
+22,63
@@
#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 <QWidget>
+#include <list>
+#include <utility>
+
+#include "marginwidget.h"
namespace pv {
namespace view {
namespace pv {
namespace view {
-class
Signal
;
+class
Trace
;
class View;
class View;
-class Header : public
Q
Widget
+class Header : public
Margin
Widget
{
Q_OBJECT
public:
Header(View &parent);
{
Q_OBJECT
public:
Header(View &parent);
+private:
+ boost::shared_ptr<pv::view::Trace> get_mouse_over_trace(
+ const QPoint &pt);
+
+ void clear_selection();
+
private:
void paintEvent(QPaintEvent *event);
private:
private:
void paintEvent(QPaintEvent *event);
private:
+ void mousePressEvent(QMouseEvent * event);
+
+ void mouseReleaseEvent(QMouseEvent *event);
+
void mouseMoveEvent(QMouseEvent *event);
void leaveEvent(QEvent *event);
void contextMenuEvent(QContextMenuEvent *event);
void mouseMoveEvent(QMouseEvent *event);
void leaveEvent(QEvent *event);
void contextMenuEvent(QContextMenuEvent *event);
+ void keyPressEvent(QKeyEvent *e);
+
private slots:
private slots:
- void on_
action_set_name_trigger
ed();
+ void on_
signals_chang
ed();
- void on_
action_set_colour_trigger
ed();
+ void on_
signals_mov
ed();
-
private
:
-
View &_view
;
+
signals
:
+
void signals_moved()
;
+private:
QPoint _mouse_point;
QPoint _mouse_point;
+ QPoint _mouse_down_point;
+ bool _dragging;
- boost::shared_ptr<Signal> _context_signal;
- QAction *_action_set_name;
- QAction *_action_set_colour;
+ std::list<std::pair<boost::weak_ptr<Trace>, int> >
+ _drag_traces;
};
} // namespace view
};
} // namespace view