projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added support for auto-apply in Binding
[pulseview.git]
/
pv
/
view
/
analogsignal.cpp
diff --git
a/pv/view/analogsignal.cpp
b/pv/view/analogsignal.cpp
index fff11f12eacfc368d914a145b52940b4ea501598..53af2643132ee895c65e5bd8df10e4bc655a3061 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;
@@
-41,9
+42,9
@@
const QColor AnalogSignal::SignalColours[4] = {
const float AnalogSignal::EnvelopeThreshold = 256.0f;
const float AnalogSignal::EnvelopeThreshold = 256.0f;
-AnalogSignal::AnalogSignal(const sr_probe *const probe,
+AnalogSignal::AnalogSignal(
pv::SigSession &session,
const sr_probe *const probe,
shared_ptr<data::Analog> data) :
shared_ptr<data::Analog> data) :
- Signal(probe),
+ Signal(
session,
probe),
_data(data),
_scale(1.0f)
{
_data(data),
_scale(1.0f)
{
@@
-54,29
+55,33
@@
AnalogSignal::~AnalogSignal()
{
}
{
}
-
const list<QAction*> AnalogSignal::get_context_bar_actions(
)
+
void AnalogSignal::set_scale(float scale
)
{
{
- list<QAction*> actions;
- return actions;
+ _scale = scale;
}
}
-void AnalogSignal::
set_scale(float scale
)
+void AnalogSignal::
paint_back(QPainter &p, int left, int right
)
{
{
- _scale = scale;
+ if (_probe->enabled)
+ paint_axis(p, get_y(), left, right);
}
}
-void AnalogSignal::paint(QPainter &p, int y, int left, int right, double scale,
- double offset)
+void AnalogSignal::paint_mid(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;
- paint_axis(p, y, left, right);
-
const deque< shared_ptr<pv::data::AnalogSnapshot> > &snapshots =
_data->get_snapshots();
if (snapshots.empty())
const deque< shared_ptr<pv::data::AnalogSnapshot> > &snapshots =
_data->get_snapshots();
if (snapshots.empty())