projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
MainWindow, View::View: Fix two memory errors reported by valgrind
[pulseview.git]
/
pv
/
view
/
logicsignal.cpp
diff --git
a/pv/view/logicsignal.cpp
b/pv/view/logicsignal.cpp
index 6eb68db381357835fe8fc3feb1d0ff2fb95697a3..bc0961f6a685afa15ffd7b1bd95732682d9fa0b9 100644
(file)
--- a/
pv/view/logicsignal.cpp
+++ b/
pv/view/logicsignal.cpp
@@
-37,6
+37,7
@@
#include <pv/devices/device.hpp>
#include <pv/data/logic.hpp>
#include <pv/data/logicsegment.hpp>
#include <pv/devices/device.hpp>
#include <pv/data/logic.hpp>
#include <pv/data/logicsegment.hpp>
+#include <pv/data/signalbase.hpp>
#include <pv/view/view.hpp>
#include <libsigrokcxx/libsigrokcxx.hpp>
#include <pv/view/view.hpp>
#include <libsigrokcxx/libsigrokcxx.hpp>
@@
-49,7
+50,6
@@
using std::pair;
using std::shared_ptr;
using std::vector;
using std::shared_ptr;
using std::vector;
-using sigrok::Channel;
using sigrok::ConfigKey;
using sigrok::Capability;
using sigrok::Error;
using sigrok::ConfigKey;
using sigrok::Capability;
using sigrok::Error;
@@
-59,7
+59,8
@@
using sigrok::TriggerMatch;
using sigrok::TriggerMatchType;
namespace pv {
using sigrok::TriggerMatchType;
namespace pv {
-namespace view {
+namespace views {
+namespace TraceView {
const float LogicSignal::Oversampling = 2.0f;
const float LogicSignal::Oversampling = 2.0f;
@@
-99,12
+100,10
@@
QCache<QString, const QPixmap> LogicSignal::pixmap_cache_;
LogicSignal::LogicSignal(
pv::Session &session,
shared_ptr<devices::Device> device,
LogicSignal::LogicSignal(
pv::Session &session,
shared_ptr<devices::Device> device,
- shared_ptr<Channel> channel,
- shared_ptr<data::Logic> data) :
- Signal(session, channel),
+ shared_ptr<data::SignalBase> base) :
+ Signal(session, base),
signal_height_(QFontMetrics(QApplication::font()).height() * 2),
device_(device),
signal_height_(QFontMetrics(QApplication::font()).height() * 2),
device_(device),
- data_(data),
trigger_none_(nullptr),
trigger_rising_(nullptr),
trigger_high_(nullptr),
trigger_none_(nullptr),
trigger_rising_(nullptr),
trigger_high_(nullptr),
@@
-114,7
+113,7
@@
LogicSignal::LogicSignal(
{
shared_ptr<Trigger> trigger;
{
shared_ptr<Trigger> trigger;
-
set_colour(SignalColours[channel
->index() % countof(SignalColours)]);
+
base_->set_colour(SignalColours[base
->index() % countof(SignalColours)]);
/* Populate this channel's trigger setting with whatever we
* find in the current session trigger, if anything. */
/* Populate this channel's trigger setting with whatever we
* find in the current session trigger, if anything. */
@@
-122,23
+121,18
@@
LogicSignal::LogicSignal(
if ((trigger = session_.session()->trigger()))
for (auto stage : trigger->stages())
for (auto match : stage->matches())
if ((trigger = session_.session()->trigger()))
for (auto stage : trigger->stages())
for (auto match : stage->matches())
- if (match->channel() ==
channel_
)
+ if (match->channel() ==
base_->channel()
)
trigger_match_ = match->type();
}
shared_ptr<pv::data::SignalData> LogicSignal::data() const
{
trigger_match_ = match->type();
}
shared_ptr<pv::data::SignalData> LogicSignal::data() const
{
- return
data_
;
+ return
base_->logic_data()
;
}
shared_ptr<pv::data::Logic> LogicSignal::logic_data() const
{
}
shared_ptr<pv::data::Logic> LogicSignal::logic_data() const
{
- return data_;
-}
-
-void LogicSignal::set_logic_data(std::shared_ptr<pv::data::Logic> data)
-{
- data_ = data;
+ return base_->logic_data();
}
std::pair<int, int> LogicSignal::v_extents() const
}
std::pair<int, int> LogicSignal::v_extents() const
@@
-166,20
+160,19
@@
void LogicSignal::paint_mid(QPainter &p, const ViewItemPaintParams &pp)
vector< pair<int64_t, bool> > edges;
vector< pair<int64_t, bool> > edges;
- assert(channel_);
- assert(data_);
+ assert(base_);
assert(owner_);
const int y = get_visual_y();
assert(owner_);
const int y = get_visual_y();
- if (!
channel
_->enabled())
+ if (!
base
_->enabled())
return;
const float high_offset = y - signal_height_ + 0.5f;
const float low_offset = y + 0.5f;
const deque< shared_ptr<pv::data::LogicSegment> > &segments =
return;
const float high_offset = y - signal_height_ + 0.5f;
const float low_offset = y + 0.5f;
const deque< shared_ptr<pv::data::LogicSegment> > &segments =
-
data_
->logic_segments();
+
base_->logic_data()
->logic_segments();
if (segments.empty())
return;
if (segments.empty())
return;
@@
-205,7
+198,7
@@
void LogicSignal::paint_mid(QPainter &p, const ViewItemPaintParams &pp)
(int64_t)0), last_sample);
segment->get_subsampled_edges(edges, start_sample, end_sample,
(int64_t)0), last_sample);
segment->get_subsampled_edges(edges, start_sample, end_sample,
- samples_per_pixel / Oversampling,
channel
_->index());
+ samples_per_pixel / Oversampling,
base
_->index());
assert(edges.size() >= 2);
// Paint the edges
assert(edges.size() >= 2);
// Paint the edges
@@
-240,7
+233,7
@@
void LogicSignal::paint_mid(QPainter &p, const ViewItemPaintParams &pp)
void LogicSignal::paint_fore(QPainter &p, const ViewItemPaintParams &pp)
{
// Draw the trigger marker
void LogicSignal::paint_fore(QPainter &p, const ViewItemPaintParams &pp)
{
// Draw the trigger marker
- if (!trigger_match_ || !
channel
_->enabled())
+ if (!trigger_match_ || !
base
_->enabled())
return;
const int y = get_visual_y();
return;
const int y = get_visual_y();
@@
-430,12
+423,12
@@
void LogicSignal::modify_trigger()
const auto &matches = stage->matches();
if (std::none_of(matches.begin(), matches.end(),
[&](shared_ptr<TriggerMatch> match) {
const auto &matches = stage->matches();
if (std::none_of(matches.begin(), matches.end(),
[&](shared_ptr<TriggerMatch> match) {
- return match->channel() !=
channel_
; }))
+ return match->channel() !=
base_->channel()
; }))
continue;
auto new_stage = new_trigger->add_stage();
for (auto match : stage->matches()) {
continue;
auto new_stage = new_trigger->add_stage();
for (auto match : stage->matches()) {
- if (match->channel() ==
channel_
)
+ if (match->channel() ==
base_->channel()
)
continue;
new_stage->add_match(match->channel(), match->type());
}
continue;
new_stage->add_match(match->channel(), match->type());
}
@@
-449,7
+442,8
@@
void LogicSignal::modify_trigger()
if (new_trigger->stages().empty())
new_trigger->add_stage();
if (new_trigger->stages().empty())
new_trigger->add_stage();
- new_trigger->stages().back()->add_match(channel_, trigger_match_);
+ new_trigger->stages().back()->add_match(base_->channel(),
+ trigger_match_);
}
session_.session()->set_trigger(
}
session_.session()->set_trigger(
@@
-492,5
+486,6
@@
void LogicSignal::on_trigger()
modify_trigger();
}
modify_trigger();
}
-} // namespace view
+} // namespace TraceView
+} // namespace views
} // namespace pv
} // namespace pv