projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
TraceGroup: Implemented stacking
[pulseview.git]
/
pv
/
view
/
header.h
diff --git
a/pv/view/header.h
b/pv/view/header.h
index eed1d1e17b0e49d2d71908f29fae7f576b1afee9..909c04ae353b55c6825d3e9b6d0735e67e516392 100644
(file)
--- a/
pv/view/header.h
+++ b/
pv/view/header.h
@@
-30,7
+30,7
@@
namespace pv {
namespace view {
namespace pv {
namespace view {
-class
Trace
;
+class
RowItem
;
class View;
class Header : public MarginWidget
class View;
class Header : public MarginWidget
@@
-52,17
+52,21
@@
public:
static const int BaselineOffset;
private:
static const int BaselineOffset;
private:
- std::shared_ptr<pv::view::
Trace> get_mouse_over_trace
(
+ std::shared_ptr<pv::view::
RowItem> get_mouse_over_row_item
(
const QPoint &pt);
void clear_selection();
const QPoint &pt);
void clear_selection();
+ void show_popup(const std::shared_ptr<RowItem> &item);
+
private:
void paintEvent(QPaintEvent *event);
private:
private:
void paintEvent(QPaintEvent *event);
private:
+ void mouseLeftPressEvent(QMouseEvent *event);
void mousePressEvent(QMouseEvent * event);
void mousePressEvent(QMouseEvent * event);
+ void mouseLeftReleaseEvent(QMouseEvent *event);
void mouseReleaseEvent(QMouseEvent *event);
void mouseMoveEvent(QMouseEvent *event);
void mouseReleaseEvent(QMouseEvent *event);
void mouseMoveEvent(QMouseEvent *event);
@@
-73,23
+77,17
@@
private:
void keyPressEvent(QKeyEvent *e);
void keyPressEvent(QKeyEvent *e);
-private slots:
- void on_signals_changed();
-
+private Q_SLOTS:
void on_signals_moved();
void on_signals_moved();
- void on_trace_changed();
-
-signals:
+Q_SIGNALS:
void signals_moved();
private:
QPoint _mouse_point;
QPoint _mouse_down_point;
void signals_moved();
private:
QPoint _mouse_point;
QPoint _mouse_down_point;
+ std::shared_ptr<RowItem> _mouse_down_item;
bool _dragging;
bool _dragging;
-
- std::list<std::pair<std::weak_ptr<Trace>, int> >
- _drag_traces;
};
} // namespace view
};
} // namespace view