projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add a pointer to the current View inside Trace
[pulseview.git]
/
pv
/
view
/
analogsignal.cpp
diff --git
a/pv/view/analogsignal.cpp
b/pv/view/analogsignal.cpp
index 6aeef98a57aa14f474e7b7d0fdcacbae8158a07a..681386ff6b91f9c69e4f1a84f350b08675551b43 100644
(file)
--- a/
pv/view/analogsignal.cpp
+++ b/
pv/view/analogsignal.cpp
@@
-25,6
+25,7
@@
#include "analogsignal.h"
#include "pv/data/analog.h"
#include "pv/data/analogsnapshot.h"
#include "analogsignal.h"
#include "pv/data/analog.h"
#include "pv/data/analogsnapshot.h"
+#include "pv/view/view.h"
using namespace boost;
using namespace std;
using namespace boost;
using namespace std;
@@
-66,13
+67,19
@@
void AnalogSignal::set_scale(float scale)
_scale = scale;
}
_scale = scale;
}
-void AnalogSignal::paint(QPainter &p, int y, int left, int right, double scale,
- double offset)
+void AnalogSignal::paint(QPainter &p, int left, int right)
{
{
- assert(scale > 0);
assert(_data);
assert(right >= left);
assert(_data);
assert(right >= left);
+ assert(_view);
+ const int y = _v_offset - _view->v_offset();
+
+ const double scale = _view->scale();
+ assert(scale > 0);
+
+ const double offset = _view->offset();
+
if (!_probe->enabled)
return;
if (!_probe->enabled)
return;