projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use Qt namespace to simplify Ruler::paintEvent
[pulseview.git]
/
pv
/
view
/
view.h
diff --git
a/pv/view/view.h
b/pv/view/view.h
index 13dd766ce788d1aa5a536a837654bb7066f081c8..dd0ad6ca9a2c0c9e2b3b66fb4867e9f55c028d30 100644
(file)
--- a/
pv/view/view.h
+++ b/
pv/view/view.h
@@
-26,6
+26,7
@@
#include <utility>
#include <QAbstractScrollArea>
#include <utility>
#include <QAbstractScrollArea>
+#include <QSizeF>
#include "cursor.h"
#include "cursor.h"
@@
-53,9
+54,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);
@@
-100,14
+105,20
@@
public:
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);
@@
-117,11
+128,16
@@
private:
private slots:
private slots:
- void h_scroll_
value_chang
ed(int value);
+ void h_scroll_
mov
ed(int value);
void v_scroll_value_changed(int value);
void v_scroll_value_changed(int value);
+ void signals_changed();
void data_updated();
void data_updated();
+ void marker_time_changed();
+
+ void on_signals_moved();
+
private:
SigSession &_session;
private:
SigSession &_session;