projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
TraceGroup: Implemented label_rect
[pulseview.git]
/
pv
/
view
/
header.h
diff --git
a/pv/view/header.h
b/pv/view/header.h
index 5474f10eb48bcac2461f8d58546605e86d409173..319f234e255e532f4f3a016c1c78bb6c40d1c821 100644
(file)
--- a/
pv/view/header.h
+++ b/
pv/view/header.h
@@
-21,10
+21,8
@@
#ifndef PULSEVIEW_PV_VIEW_HEADER_H
#define PULSEVIEW_PV_VIEW_HEADER_H
#ifndef PULSEVIEW_PV_VIEW_HEADER_H
#define PULSEVIEW_PV_VIEW_HEADER_H
-#include <boost/shared_ptr.hpp>
-#include <boost/weak_ptr.hpp>
-
#include <list>
#include <list>
+#include <memory>
#include <utility>
#include "marginwidget.h"
#include <utility>
#include "marginwidget.h"
@@
-32,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
@@
-47,12
+45,20
@@
public:
QSize sizeHint() const;
QSize sizeHint() const;
+ /**
+ * The horizontal offset, relative to the left edge of the widget,
+ * where the arrows of the trace labels end.
+ */
+ static const int BaselineOffset;
+
private:
private:
-
boost::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:
void paintEvent(QPaintEvent *event);
@@
-69,14
+75,14
@@
private:
void keyPressEvent(QKeyEvent *e);
void keyPressEvent(QKeyEvent *e);
-private
slots
:
+private
Q_SLOTS
:
void on_signals_changed();
void on_signals_moved();
void on_signals_changed();
void on_signals_moved();
- void on_trace_
text_
changed();
+ void on_trace_changed();
-
signals
:
+
Q_SIGNALS
:
void signals_moved();
private:
void signals_moved();
private:
@@
-84,8
+90,8
@@
private:
QPoint _mouse_down_point;
bool _dragging;
QPoint _mouse_down_point;
bool _dragging;
- std::list<std::pair<
boost::weak_ptr<Trace
>, int> >
- _drag_
trace
s;
+ std::list<std::pair<
std::weak_ptr<RowItem
>, int> >
+ _drag_
row_item
s;
};
} // namespace view
};
} // namespace view