projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Replace View ownership of traces with RowItemOwner
[pulseview.git]
/
pv
/
view
/
analogsignal.cpp
diff --git
a/pv/view/analogsignal.cpp
b/pv/view/analogsignal.cpp
index 681386ff6b91f9c69e4f1a84f350b08675551b43..eaa25bccc947dac826d5bddf2eff50ec2fcdd325 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,24
+49,29
@@
const QColor AnalogSignal::SignalColours[4] = {
const float AnalogSignal::EnvelopeThreshold = 256.0f;
const float AnalogSignal::EnvelopeThreshold = 256.0f;
-AnalogSignal::AnalogSignal(pv::SigSession &session, const sr_probe *const probe,
+AnalogSignal::AnalogSignal(
+ pv::SigSession &session,
+ shared_ptr<Channel> channel,
shared_ptr<data::Analog> data) :
shared_ptr<data::Analog> data) :
- Signal(session,
probe
),
+ Signal(session,
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()
{
}
-const list<QAction*> AnalogSignal::get_context_bar_actions()
+shared_ptr<pv::data::SignalData> AnalogSignal::data() const
+{
+ return _data;
+}
+
+shared_ptr<pv::data::Analog> AnalogSignal::analog_data() const
{
{
- list<QAction*> actions;
- actions.push_back(_name_action);
- return actions;
+ return _data;
}
void AnalogSignal::set_scale(float scale)
}
void AnalogSignal::set_scale(float scale)
@@
-67,24
+79,31
@@
void AnalogSignal::set_scale(float scale)
_scale = scale;
}
_scale = scale;
}
-void AnalogSignal::paint(QPainter &p, int left, int right)
+void AnalogSignal::paint_back(QPainter &p, int left, int right)
+{
+ if (_channel->enabled())
+ paint_axis(p, get_y(), left, right);
+}
+
+void AnalogSignal::paint_mid(QPainter &p, int left, int right)
{
assert(_data);
assert(right >= left);
{
assert(_data);
assert(right >= left);
+ assert(_owner);
- assert(_view);
- const int y = _v_offset - _view->v_offset();
+ const int y = get_y();
- const double scale = _view->scale();
+ const View *const view = _owner->view();
+ assert(view);
+
+ const double scale = view->scale();
assert(scale > 0);
assert(scale > 0);
- const double offset =
_
view->offset();
+ const double offset = view->offset();
- if (!_
probe->enabled
)
+ if (!_
channel->enabled()
)
return;
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())
@@
-94,7
+113,7
@@
void AnalogSignal::paint(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;
@@
-149,7
+168,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;
@@
-158,7
+176,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];