projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make member variable underscores a suffix instead of a prefix
[pulseview.git]
/
pv
/
view
/
header.h
diff --git
a/pv/view/header.h
b/pv/view/header.h
index 024227820b6635008216b38b290ec230fce528d8..49a95bb7ce05069f1c209ca74ae69fcc61c93ef8 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,28
+30,43
@@
namespace pv {
namespace view {
namespace pv {
namespace view {
-class
Trace
;
+class
RowItem
;
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::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);
@@
-62,21
+75,23
@@
private:
void contextMenuEvent(QContextMenuEvent *event);
void contextMenuEvent(QContextMenuEvent *event);
-private slots:
- void on_signals_changed();
+ void keyPressEvent(QKeyEvent *e);
+private Q_SLOTS:
void on_signals_moved();
void on_signals_moved();
-signals:
+ void on_group();
+
+ void on_ungroup();
+
+Q_SIGNALS:
void signals_moved();
private:
void signals_moved();
private:
- QPoint _mouse_point;
- QPoint _mouse_down_point;
- bool _dragging;
-
- std::list<std::pair<boost::weak_ptr<Trace>, int> >
- _drag_traces;
+ QPoint mouse_point_;
+ QPoint mouse_down_point_;
+ std::shared_ptr<RowItem> mouse_down_item_;
+ bool dragging_;
};
} // namespace view
};
} // namespace view