projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added DevInst pointer to Signal
[pulseview.git]
/
pv
/
view
/
analogsignal.cpp
diff --git
a/pv/view/analogsignal.cpp
b/pv/view/analogsignal.cpp
index 4304fd1e5a9bfd7ec61fcf3e3a9c24594086fed0..84e55cc3b6e0a2f9c48b1554395f69d8c9490606 100644
(file)
--- a/
pv/view/analogsignal.cpp
+++ b/
pv/view/analogsignal.cpp
@@
-27,8
+27,10
@@
#include "pv/data/analogsnapshot.h"
#include "pv/view/view.h"
#include "pv/data/analogsnapshot.h"
#include "pv/view/view.h"
-using namespace boost;
-using namespace std;
+using boost::shared_ptr;
+using std::max;
+using std::min;
+using std::deque;
namespace pv {
namespace view {
namespace pv {
namespace view {
@@
-42,9
+44,10
@@
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(pv::SigSession &session,
+ shared_ptr<pv::DevInst> dev_inst, sr_probe *const probe,
shared_ptr<data::Analog> data) :
shared_ptr<data::Analog> data) :
- Signal(session, probe),
+ Signal(session,
dev_inst,
probe),
_data(data),
_scale(1.0f)
{
_data(data),
_scale(1.0f)
{
@@
-55,6
+58,16
@@
AnalogSignal::~AnalogSignal()
{
}
{
}
+shared_ptr<pv::data::SignalData> AnalogSignal::data() const
+{
+ return _data;
+}
+
+shared_ptr<pv::data::Analog> AnalogSignal::analog_data() const
+{
+ return _data;
+}
+
void AnalogSignal::set_scale(float scale)
{
_scale = scale;
void AnalogSignal::set_scale(float scale)
{
_scale = scale;
@@
-91,7
+104,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;
@@
-146,7
+159,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;
@@
-155,7
+167,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];