projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added header time hover arrow
[pulseview.git]
/
pv
/
view
/
view.h
diff --git
a/pv/view/view.h
b/pv/view/view.h
index b7769899b7a09bf9d52988b4c469ed473be9fcca..6e5710fede733d2aa926236048d94247984dbd99 100644
(file)
--- a/
pv/view/view.h
+++ b/
pv/view/view.h
@@
-1,5
+1,5
@@
/*
/*
- * This file is part of the
sigrok
project.
+ * This file is part of the
PulseView
project.
*
* Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
*
*
* Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
*
@@
-18,18
+18,21
@@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef PV_VIEW_VIEW_H
-#define PV_VIEW_VIEW_H
+#ifndef P
ULSEVIEW_P
V_VIEW_VIEW_H
+#define P
ULSEVIEW_P
V_VIEW_VIEW_H
#include <stdint.h>
#include <QAbstractScrollArea>
#include <stdint.h>
#include <QAbstractScrollArea>
+namespace pv {
+
class SigSession;
class SigSession;
-namespace pv {
namespace view {
namespace view {
+class Header;
+class Ruler;
class Viewport;
class View : public QAbstractScrollArea {
class Viewport;
class View : public QAbstractScrollArea {
@@
-42,6
+45,11
@@
private:
static const int LabelMarginWidth;
static const int RulerHeight;
static const int LabelMarginWidth;
static const int RulerHeight;
+ static const int MaxScrollValue;
+
+public:
+ static const int SignalHeight;
+
public:
explicit View(SigSession &session, QWidget *parent = 0);
public:
explicit View(SigSession &session, QWidget *parent = 0);
@@
-52,20
+60,29
@@
public:
int v_offset() const;
void zoom(double steps);
int v_offset() const;
void zoom(double steps);
+ void zoom(double steps, int offset);
void set_scale_offset(double scale, double offset);
void set_scale_offset(double scale, double offset);
+ const QPoint& hover_point() const;
+
+signals:
+ void hover_point_changed();
+
private:
private:
+ void get_scroll_layout(double &length, double &offset) const;
+
void update_scroll();
void update_scroll();
- void zoom(double steps, int offset);
-
private:
private:
+ bool eventFilter(QObject *object, QEvent *event);
+
bool viewportEvent(QEvent *e);
void resizeEvent(QResizeEvent *e);
private slots:
bool viewportEvent(QEvent *e);
void resizeEvent(QResizeEvent *e);
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);
@@
-75,6
+92,8
@@
private:
SigSession &_session;
Viewport *_viewport;
SigSession &_session;
Viewport *_viewport;
+ Ruler *_ruler;
+ Header *_header;
uint64_t _data_length;
uint64_t _data_length;
@@
-83,10
+102,10
@@
private:
int _v_offset;
int _v_offset;
-
friend class Viewpor
t;
+
QPoint _hover_poin
t;
};
} // namespace view
} // namespace pv
};
} // namespace view
} // namespace pv
-#endif // PV_VIEW_VIEW_H
+#endif // P
ULSEVIEW_P
V_VIEW_VIEW_H