projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix #include guards.
[pulseview.git]
/
pv
/
view
/
view.h
diff --git
a/pv/view/view.h
b/pv/view/view.h
index 484245931c0839adad693344bdbe81e3183363ef..c87be36913e368c68bbd334a8d304b99c93a9849 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,16
+18,17
@@
* 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 {
class Header;
namespace view {
class Header;
@@
-44,6
+45,8
@@
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:
static const int SignalHeight;
@@
-62,6
+65,8
@@
public:
void set_scale_offset(double scale, double offset);
private:
void set_scale_offset(double scale, double offset);
private:
+ void get_scroll_layout(double &length, double &offset) const;
+
void update_scroll();
private:
void update_scroll();
private:
@@
-93,4
+98,4
@@
private:
} // namespace view
} // namespace pv
} // namespace view
} // namespace pv
-#endif // PV_VIEW_VIEW_H
+#endif // P
ULSEVIEW_P
V_VIEW_VIEW_H