projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use libsigrok C++ bindings (patch version 7).
[pulseview.git]
/
pv
/
view
/
analogsignal.cpp
diff --git
a/pv/view/analogsignal.cpp
b/pv/view/analogsignal.cpp
index bcd0f20020a2d326b7b1be314fe97838909acbcc..7b49bbd2b7d454606d2ac5d51e482a331ca1b01c 100644
(file)
--- a/
pv/view/analogsignal.cpp
+++ b/
pv/view/analogsignal.cpp
@@
-20,15
+20,22
@@
#include <extdef.h>
#include <extdef.h>
-#include <math.h>
+#include <cassert>
+#include <cmath>
#include "analogsignal.h"
#include "pv/data/analog.h"
#include "pv/data/analogsnapshot.h"
#include "pv/view/view.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;
+#include <libsigrok/libsigrok.hpp>
+
+using std::max;
+using std::min;
+using std::shared_ptr;
+using std::deque;
+
+using sigrok::Channel;
namespace pv {
namespace view {
namespace pv {
namespace view {
@@
-42,20
+49,25
@@
const QColor AnalogSignal::SignalColours[4] = {
const float AnalogSignal::EnvelopeThreshold = 256.0f;
const float AnalogSignal::EnvelopeThreshold = 256.0f;
-AnalogSignal::AnalogSignal(
pv::SigSession &session, sr_probe *const probe
,
+AnalogSignal::AnalogSignal(
shared_ptr<Channel> channel
,
shared_ptr<data::Analog> data) :
shared_ptr<data::Analog> data) :
- Signal(
session, probe
),
+ Signal(
channel
),
_data(data),
_scale(1.0f)
{
_data(data),
_scale(1.0f)
{
- _colour = SignalColours[
probe->index
% countof(SignalColours)];
+ _colour = SignalColours[
_channel->index()
% countof(SignalColours)];
}
AnalogSignal::~AnalogSignal()
{
}
}
AnalogSignal::~AnalogSignal()
{
}
-boost::shared_ptr<pv::data::SignalData> AnalogSignal::data() const
+shared_ptr<pv::data::SignalData> AnalogSignal::data() const
+{
+ return _data;
+}
+
+shared_ptr<pv::data::Analog> AnalogSignal::analog_data() const
{
return _data;
}
{
return _data;
}
@@
-67,7
+79,7
@@
void AnalogSignal::set_scale(float scale)
void AnalogSignal::paint_back(QPainter &p, int left, int right)
{
void AnalogSignal::paint_back(QPainter &p, int left, int right)
{
- if (_
probe->enabled
)
+ if (_
channel->enabled()
)
paint_axis(p, get_y(), left, right);
}
paint_axis(p, get_y(), left, right);
}
@@
-84,7
+96,7
@@
void AnalogSignal::paint_mid(QPainter &p, int left, int right)
const double offset = _view->offset();
const double offset = _view->offset();
- if (!_
probe->enabled
)
+ if (!_
channel->enabled()
)
return;
const deque< shared_ptr<pv::data::AnalogSnapshot> > &snapshots =
return;
const deque< shared_ptr<pv::data::AnalogSnapshot> > &snapshots =
@@
-96,7
+108,7
@@
void AnalogSignal::paint_mid(QPainter &p, int left, int right)
snapshots.front();
const double pixels_offset = offset / scale;
snapshots.front();
const double pixels_offset = offset / scale;
- const double samplerate = _data->
get_
samplerate();
+ const double samplerate = _data->samplerate();
const double start_time = _data->get_start_time();
const int64_t last_sample = snapshot->get_sample_count() - 1;
const double samples_per_pixel = samplerate * scale;
const double start_time = _data->get_start_time();
const int64_t last_sample = snapshot->get_sample_count() - 1;
const double samples_per_pixel = samplerate * scale;
@@
-151,7
+163,6
@@
void AnalogSignal::paint_envelope(QPainter &p,
int y, int left, const int64_t start, const int64_t end,
const double pixels_offset, const double samples_per_pixel)
{
int y, int left, const int64_t start, const int64_t end,
const double pixels_offset, const double samples_per_pixel)
{
- using namespace Qt;
using pv::data::AnalogSnapshot;
AnalogSnapshot::EnvelopeSection e;
using pv::data::AnalogSnapshot;
AnalogSnapshot::EnvelopeSection e;
@@
-160,7
+171,7
@@
void AnalogSignal::paint_envelope(QPainter &p,
if (e.length < 2)
return;
if (e.length < 2)
return;
- p.setPen(QPen(NoPen));
+ p.setPen(QPen(
Qt::
NoPen));
p.setBrush(_colour);
QRectF *const rects = new QRectF[e.length];
p.setBrush(_colour);
QRectF *const rects = new QRectF[e.length];