projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Trace: Renamed get_name() to name()
[pulseview.git]
/
pv
/
view
/
decodetrace.cpp
diff --git
a/pv/view/decodetrace.cpp
b/pv/view/decodetrace.cpp
index 700b221b3b9d12c94bc1f9b64cc4877743cc69c4..ae2ec16287b561e775b595e35a622ab17e105fbd 100644
(file)
--- a/
pv/view/decodetrace.cpp
+++ b/
pv/view/decodetrace.cpp
@@
-150,12
+150,6
@@
const std::shared_ptr<pv::data::DecoderStack>& DecodeTrace::decoder() const
return _decoder_stack;
}
return _decoder_stack;
}
-void DecodeTrace::set_view(pv::view::View *view)
-{
- assert(view);
- Trace::set_view(view);
-}
-
void DecodeTrace::paint_back(QPainter &p, int left, int right)
{
Trace::paint_back(p, left, right);
void DecodeTrace::paint_back(QPainter &p, int left, int right)
{
Trace::paint_back(p, left, right);
@@
-181,7
+175,6
@@
void DecodeTrace::paint_mid(QPainter &p, int left, int right)
}
// Iterate through the rows
}
// Iterate through the rows
- assert(_view);
int y = get_y();
pair<uint64_t, uint64_t> sample_range = get_sample_range(left, right);
int y = get_y();
pair<uint64_t, uint64_t> sample_range = get_sample_range(left, right);
@@
-709,7
+702,7
@@
QComboBox* DecodeTrace::create_channel_selector(
if (dynamic_pointer_cast<LogicSignal>(s) && s->enabled())
{
if (dynamic_pointer_cast<LogicSignal>(s) && s->enabled())
{
- selector->addItem(s->
get_
name(),
+ selector->addItem(s->name(),
qVariantFromValue((void*)s.get()));
if ((*channel_iter).second == s)
selector->setCurrentIndex(i + 1);
qVariantFromValue((void*)s.get()));
if ((*channel_iter).second == s)
selector->setCurrentIndex(i + 1);