projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added missing virtual destructors
[pulseview.git]
/
pv
/
view
/
view.h
diff --git
a/pv/view/view.h
b/pv/view/view.h
index f196cfe07d9c3bea5d97e7bf972d6aef9008baa0..0f5e254da4f12681dfff1f10621c91c0af1b9422 100644
(file)
--- a/
pv/view/view.h
+++ b/
pv/view/view.h
@@
-23,11
+23,10
@@
#include <stdint.h>
#include <stdint.h>
-#include <utility>
-
#include <QAbstractScrollArea>
#include <QAbstractScrollArea>
+#include <QSizeF>
-#include "cursor.h"
+#include "cursor
pair
.h"
namespace pv {
namespace pv {
@@
-53,9
+52,13
@@
private:
public:
static const int SignalHeight;
public:
static const int SignalHeight;
+ static const int SignalMargin;
+ static const int SignalSnapGridSize;
static const QColor CursorAreaColour;
static const QColor CursorAreaColour;
+ static const QSizeF LabelPadding;
+
public:
explicit View(SigSession &session, QWidget *parent = 0);
public:
explicit View(SigSession &session, QWidget *parent = 0);
@@
-93,21
+96,32
@@
public:
*/
void show_cursors(bool show = true);
*/
void show_cursors(bool show = true);
+ /**
+ * Moves the cursors to a convenient position in the view.
+ */
+ void centre_cursors();
+
/**
* Returns a reference to the pair of cursors.
*/
/**
* Returns a reference to the pair of cursors.
*/
-
std::pair<Cursor, Cursor>
& cursors();
+
CursorPair
& cursors();
const QPoint& hover_point() const;
const QPoint& hover_point() const;
+ void normalize_layout();
+
signals:
void hover_point_changed();
signals:
void hover_point_changed();
+ void signals_moved();
+
private:
void get_scroll_layout(double &length, double &offset) const;
void update_scroll();
private:
void get_scroll_layout(double &length, double &offset) const;
void update_scroll();
+ void reset_signal_layout();
+
private:
bool eventFilter(QObject *object, QEvent *event);
private:
bool eventFilter(QObject *object, QEvent *event);
@@
-120,10
+134,13
@@
private slots:
void h_scroll_value_changed(int value);
void v_scroll_value_changed(int value);
void h_scroll_value_changed(int value);
void v_scroll_value_changed(int value);
+ void signals_changed();
void data_updated();
void marker_time_changed();
void data_updated();
void marker_time_changed();
+ void on_signals_moved();
+
private:
SigSession &_session;
private:
SigSession &_session;
@@
-140,9
+157,10
@@
private:
double _offset;
int _v_offset;
double _offset;
int _v_offset;
+ bool _updating_scroll;
bool _show_cursors;
bool _show_cursors;
-
std::pair<Cursor, Cursor>
_cursors;
+
CursorPair
_cursors;
QPoint _hover_point;
};
QPoint _hover_point;
};