projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Removed unused return value from LogicSignal::paint_caps
[pulseview.git]
/
pv
/
view
/
view.h
diff --git
a/pv/view/view.h
b/pv/view/view.h
index 0413b3d79820c6174aa421d4d89c57d80c58c4cb..d2abbf002c2f69a958df0cefef3465d098cb05e5 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>
*
@@
-25,9
+25,10
@@
#include <QAbstractScrollArea>
#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:
@@
-88,8
+93,6
@@
private:
double _offset;
int _v_offset;
double _offset;
int _v_offset;
-
- friend class Viewport;
};
} // namespace view
};
} // namespace view