projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Replaced std::pair<Cursor, Cursor> with CursorPair
[pulseview.git]
/
pv
/
view
/
view.h
diff --git
a/pv/view/view.h
b/pv/view/view.h
index 45ccd3459700a65c897fb9ab4a06efd8ba0f0083..4eb255a2da7a0ec131df8daf6ea6286df8442074 100644
(file)
--- a/
pv/view/view.h
+++ b/
pv/view/view.h
@@
-23,12
+23,10
@@
#include <stdint.h>
#include <stdint.h>
-#include <utility>
-
#include <QAbstractScrollArea>
#include <QSizeF>
#include <QAbstractScrollArea>
#include <QSizeF>
-#include "cursor.h"
+#include "cursor
pair
.h"
namespace pv {
namespace pv {
@@
-54,6
+52,8
@@
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;
@@
-99,13
+99,17
@@
public:
/**
* 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;
private:
void get_scroll_layout(double &length, double &offset) const;
@@
-125,10
+129,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;
@@
-145,9
+152,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;
};