projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Setup environment for SRD on Android
[pulseview.git]
/
pv
/
view
/
header.h
diff --git
a/pv/view/header.h
b/pv/view/header.h
index cb1d36246c3d76abb40b21ef89c7905f3f7062cf..eed1d1e17b0e49d2d71908f29fae7f576b1afee9 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,18
+30,29
@@
namespace pv {
namespace view {
namespace pv {
namespace view {
-class
Signal
;
+class
Trace
;
class View;
class Header : public MarginWidget
{
Q_OBJECT
class View;
class Header : public MarginWidget
{
Q_OBJECT
+private:
+ static const int Padding;
+
public:
Header(View &parent);
public:
Header(View &parent);
+ 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::Signal> get_mouse_over_signal
(
+
std::shared_ptr<pv::view::Trace> get_mouse_over_trace
(
const QPoint &pt);
void clear_selection();
const QPoint &pt);
void clear_selection();
@@
-62,26
+71,25
@@
private:
void contextMenuEvent(QContextMenuEvent *event);
void contextMenuEvent(QContextMenuEvent *event);
-private slots:
- void on_action_set_name_triggered();
+ void keyPressEvent(QKeyEvent *e);
- void on_action_set_colour_triggered();
+private slots:
+ void on_signals_changed();
void on_signals_moved();
void on_signals_moved();
+ void on_trace_changed();
+
signals:
void signals_moved();
private:
QPoint _mouse_point;
QPoint _mouse_down_point;
signals:
void signals_moved();
private:
QPoint _mouse_point;
QPoint _mouse_down_point;
+ bool _dragging;
- std::list<std::pair<boost::weak_ptr<Signal>, int> >
- _drag_sigs;
-
- boost::shared_ptr<Signal> _context_signal;
- QAction *_action_set_name;
- QAction *_action_set_colour;
+ std::list<std::pair<std::weak_ptr<Trace>, int> >
+ _drag_traces;
};
} // namespace view
};
} // namespace view