projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
MainBar: Fix notification message
[pulseview.git]
/
pv
/
view
/
decodetrace.cpp
diff --git
a/pv/view/decodetrace.cpp
b/pv/view/decodetrace.cpp
index 1f21b024fb4f79000d2bee510833a17950a54dcf..74d0dd6511b623a4c41aba5b66bd6cf13194f830 100644
(file)
--- a/
pv/view/decodetrace.cpp
+++ b/
pv/view/decodetrace.cpp
@@
-14,8
+14,7
@@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
extern "C" {
*/
extern "C" {
@@
-29,8
+28,6
@@
extern "C" {
#include <tuple>
#include <boost/functional/hash.hpp>
#include <tuple>
#include <boost/functional/hash.hpp>
-#include <boost/thread/locks.hpp>
-#include <boost/thread/shared_mutex.hpp>
#include <QAction>
#include <QApplication>
#include <QAction>
#include <QApplication>
@@
-43,36
+40,36
@@
extern "C" {
#include "decodetrace.hpp"
#include "decodetrace.hpp"
-#include <pv/session.hpp>
-#include <pv/strnatcmp.hpp>
-#include <pv/data/decoderstack.hpp>
+#include <pv/data/decode/annotation.hpp>
#include <pv/data/decode/decoder.hpp>
#include <pv/data/decode/decoder.hpp>
+#include <pv/data/decoderstack.hpp>
#include <pv/data/logic.hpp>
#include <pv/data/logicsegment.hpp>
#include <pv/data/logic.hpp>
#include <pv/data/logicsegment.hpp>
-#include <pv/data/decode/annotation.hpp>
+#include <pv/session.hpp>
+#include <pv/strnatcmp.hpp>
#include <pv/view/view.hpp>
#include <pv/view/viewport.hpp>
#include <pv/widgets/decodergroupbox.hpp>
#include <pv/widgets/decodermenu.hpp>
#include <pv/view/view.hpp>
#include <pv/view/viewport.hpp>
#include <pv/widgets/decodergroupbox.hpp>
#include <pv/widgets/decodermenu.hpp>
-using boost::shared_lock;
-using boost::shared_mutex;
-using std::dynamic_pointer_cast;
+using std::all_of;
using std::list;
using std::list;
-using std::lock_guard;
using std::make_pair;
using std::max;
using std::make_pair;
using std::map;
using std::min;
using std::make_pair;
using std::max;
using std::make_pair;
using std::map;
using std::min;
+using std::out_of_range;
using std::pair;
using std::shared_ptr;
using std::pair;
using std::shared_ptr;
+using std::make_shared;
using std::tie;
using std::unordered_set;
using std::vector;
namespace pv {
using std::tie;
using std::unordered_set;
using std::vector;
namespace pv {
-namespace view {
+namespace views {
+namespace TraceView {
const QColor DecodeTrace::DecodeColours[4] = {
QColor(0xEF, 0x29, 0x29), // Red
const QColor DecodeTrace::DecodeColours[4] = {
QColor(0xEF, 0x29, 0x29), // Red
@@
-128,27
+125,24
@@
const QColor DecodeTrace::OutlineColours[16] = {
};
DecodeTrace::DecodeTrace(pv::Session &session,
};
DecodeTrace::DecodeTrace(pv::Session &session,
- shared_ptr<data::SignalBase> signalbase,
- std::shared_ptr<pv::data::DecoderStack> decoder_stack, int index) :
+ shared_ptr<data::SignalBase> signalbase, int index) :
Trace(signalbase),
session_(session),
Trace(signalbase),
session_(session),
- signalbase_(signalbase),
- decoder_stack_(decoder_stack),
row_height_(0),
max_visible_rows_(0),
delete_mapper_(this),
show_hide_mapper_(this)
{
row_height_(0),
max_visible_rows_(0),
delete_mapper_(this),
show_hide_mapper_(this)
{
-
assert(decoder_stack_
);
+
shared_ptr<pv::data::DecoderStack> decoder_stack = base_->decoder_stack(
);
// Determine shortest string we want to see displayed in full
QFontMetrics m(QApplication::font());
min_useful_label_width_ = m.width("XX"); // e.g. two hex characters
// Determine shortest string we want to see displayed in full
QFontMetrics m(QApplication::font());
min_useful_label_width_ = m.width("XX"); // e.g. two hex characters
-
signal
base_->set_name(QString::fromUtf8(decoder_stack->stack().front()->decoder()->name));
-
signal
base_->set_colour(DecodeColours[index % countof(DecodeColours)]);
+ base_->set_name(QString::fromUtf8(decoder_stack->stack().front()->decoder()->name));
+ base_->set_colour(DecodeColours[index % countof(DecodeColours)]);
- connect(decoder_stack
_
.get(), SIGNAL(new_decode_data()),
+ connect(decoder_stack.get(), SIGNAL(new_decode_data()),
this, SLOT(on_new_decode_data()));
connect(&delete_mapper_, SIGNAL(mapped(int)),
this, SLOT(on_delete_decoder(int)));
this, SLOT(on_new_decode_data()));
connect(&delete_mapper_, SIGNAL(mapped(int)),
this, SLOT(on_delete_decoder(int)));
@@
-161,9
+155,9
@@
bool DecodeTrace::enabled() const
return true;
}
return true;
}
-
const std::shared_ptr<pv::data::DecoderStack>& DecodeTrace::decoder
() const
+
shared_ptr<data::SignalBase> DecodeTrace::base
() const
{
{
- return
decoder_stack
_;
+ return
base
_;
}
pair<int, int> DecodeTrace::v_extents() const
}
pair<int, int> DecodeTrace::v_extents() const
@@
-176,22
+170,24
@@
pair<int, int> DecodeTrace::v_extents() const
return make_pair(-row_height, row_height * row_count);
}
return make_pair(-row_height, row_height * row_count);
}
-void DecodeTrace::paint_back(QPainter &p,
const
ViewItemPaintParams &pp)
+void DecodeTrace::paint_back(QPainter &p, ViewItemPaintParams &pp)
{
Trace::paint_back(p, pp);
paint_axis(p, pp, get_visual_y());
}
{
Trace::paint_back(p, pp);
paint_axis(p, pp, get_visual_y());
}
-void DecodeTrace::paint_mid(QPainter &p,
const
ViewItemPaintParams &pp)
+void DecodeTrace::paint_mid(QPainter &p, ViewItemPaintParams &pp)
{
using namespace pv::data::decode;
{
using namespace pv::data::decode;
+ shared_ptr<pv::data::DecoderStack> decoder_stack = base_->decoder_stack();
+
const int text_height = ViewItemPaintParams::text_height();
row_height_ = (text_height * 6) / 4;
const int annotation_height = (text_height * 5) / 4;
const int text_height = ViewItemPaintParams::text_height();
row_height_ = (text_height * 6) / 4;
const int annotation_height = (text_height * 5) / 4;
- assert(decoder_stack
_
);
- const QString err = decoder_stack
_
->error_message();
+ assert(decoder_stack);
+ const QString err = decoder_stack->error_message();
if (!err.isEmpty()) {
draw_unresolved_period(
p, annotation_height, pp.left(), pp.right());
if (!err.isEmpty()) {
draw_unresolved_period(
p, annotation_height, pp.left(), pp.right());
@@
-207,8
+203,7
@@
void DecodeTrace::paint_mid(QPainter &p, const ViewItemPaintParams &pp)
pair<uint64_t, uint64_t> sample_range = get_sample_range(
pp.left(), pp.right());
pair<uint64_t, uint64_t> sample_range = get_sample_range(
pp.left(), pp.right());
- assert(decoder_stack_);
- const vector<Row> rows(decoder_stack_->get_visible_rows());
+ const vector<Row> rows(decoder_stack->get_visible_rows());
visible_rows_.clear();
for (const Row& row : rows) {
visible_rows_.clear();
for (const Row& row : rows) {
@@
-216,7
+211,7
@@
void DecodeTrace::paint_mid(QPainter &p, const ViewItemPaintParams &pp)
int row_title_width;
try {
row_title_width = row_title_widths_.at(row);
int row_title_width;
try {
row_title_width = row_title_widths_.at(row);
- } catch (
std::
out_of_range) {
+ } catch (out_of_range) {
const int w = p.boundingRect(QRectF(), 0, row.title()).width() +
RowTitleMargin;
row_title_widths_[row] = w;
const int w = p.boundingRect(QRectF(), 0, row.title()).width() +
RowTitleMargin;
row_title_widths_[row] = w;
@@
-231,7
+226,7
@@
void DecodeTrace::paint_mid(QPainter &p, const ViewItemPaintParams &pp)
base_colour >>= 16;
vector<Annotation> annotations;
base_colour >>= 16;
vector<Annotation> annotations;
- decoder_stack
_
->get_annotation_subset(annotations, row,
+ decoder_stack->get_annotation_subset(annotations, row,
sample_range.first, sample_range.second);
if (!annotations.empty()) {
draw_annotations(annotations, p, annotation_height, pp, y,
sample_range.first, sample_range.second);
if (!annotations.empty()) {
draw_annotations(annotations, p, annotation_height, pp, y,
@@
-250,10
+245,10
@@
void DecodeTrace::paint_mid(QPainter &p, const ViewItemPaintParams &pp)
owner_->extents_changed(false, true);
// Update the maximum row count if needed
owner_->extents_changed(false, true);
// Update the maximum row count if needed
- max_visible_rows_ =
std::
max(max_visible_rows_, (int)visible_rows_.size());
+ max_visible_rows_ = max(max_visible_rows_, (int)visible_rows_.size());
}
}
-void DecodeTrace::paint_fore(QPainter &p,
const
ViewItemPaintParams &pp)
+void DecodeTrace::paint_fore(QPainter &p, ViewItemPaintParams &pp)
{
using namespace pv::data::decode;
{
using namespace pv::data::decode;
@@
-297,9
+292,11
@@
void DecodeTrace::populate_popup_form(QWidget *parent, QFormLayout *form)
{
using pv::data::decode::Decoder;
{
using pv::data::decode::Decoder;
+ shared_ptr<pv::data::DecoderStack> decoder_stack = base_->decoder_stack();
+
assert(form);
assert(parent);
assert(form);
assert(parent);
- assert(decoder_stack
_
);
+ assert(decoder_stack);
// Add the standard options
Trace::populate_popup_form(parent, form);
// Add the standard options
Trace::populate_popup_form(parent, form);
@@
-309,7
+306,7
@@
void DecodeTrace::populate_popup_form(QWidget *parent, QFormLayout *form)
channel_selectors_.clear();
decoder_forms_.clear();
channel_selectors_.clear();
decoder_forms_.clear();
- const list< shared_ptr<Decoder> >& stack = decoder_stack
_
->stack();
+ const list< shared_ptr<Decoder> >& stack = decoder_stack->stack();
if (stack.empty()) {
QLabel *const l = new QLabel(
if (stack.empty()) {
QLabel *const l = new QLabel(
@@
-336,6
+333,7
@@
void DecodeTrace::populate_popup_form(QWidget *parent, QFormLayout *form)
QPushButton *const stack_button =
new QPushButton(tr("Stack Decoder"), parent);
stack_button->setMenu(decoder_menu);
QPushButton *const stack_button =
new QPushButton(tr("Stack Decoder"), parent);
stack_button->setMenu(decoder_menu);
+ stack_button->setToolTip(tr("Stack a higher-level decoder on top of this one"));
QHBoxLayout *stack_button_box = new QHBoxLayout;
stack_button_box->addWidget(stack_button, 0, Qt::AlignRight);
QHBoxLayout *stack_button_box = new QHBoxLayout;
stack_button_box->addWidget(stack_button, 0, Qt::AlignRight);
@@
-440,8
+438,7
@@
void DecodeTrace::draw_annotation(const pv::data::decode::Annotation &a,
const double start = a.start_sample() / samples_per_pixel -
pixels_offset;
const double start = a.start_sample() / samples_per_pixel -
pixels_offset;
- const double end = a.end_sample() / samples_per_pixel -
- pixels_offset;
+ const double end = a.end_sample() / samples_per_pixel - pixels_offset;
const size_t colour = (base_colour + a.format()) % countof(Colours);
p.setPen(OutlineColours[colour]);
const size_t colour = (base_colour + a.format()) % countof(Colours);
p.setPen(OutlineColours[colour]);
@@
-453,8
+450,7
@@
void DecodeTrace::draw_annotation(const pv::data::decode::Annotation &a,
if (a.start_sample() == a.end_sample())
draw_instant(a, p, h, start, y);
else
if (a.start_sample() == a.end_sample())
draw_instant(a, p, h, start, y);
else
- draw_range(a, p, h, start, end, y, pp,
- row_title_width);
+ draw_range(a, p, h, start, end, y, pp, row_title_width);
}
void DecodeTrace::draw_annotation_block(
}
void DecodeTrace::draw_annotation_block(
@@
-484,15
+480,21
@@
void DecodeTrace::draw_annotation_block(
// Check if all annotations are of the same type (i.e. we can use one color)
// or if we should use a neutral color (i.e. gray)
const int format = annotations.front().format();
// Check if all annotations are of the same type (i.e. we can use one color)
// or if we should use a neutral color (i.e. gray)
const int format = annotations.front().format();
- const bool single_format =
std::
all_of(
+ const bool single_format = all_of(
annotations.begin(), annotations.end(),
[&](const Annotation &a) { return a.format() == format; });
annotations.begin(), annotations.end(),
[&](const Annotation &a) { return a.format() == format; });
+ const QRectF rect(start, top, end - start, bottom - top);
+ const int r = h / 4;
+
+ p.setPen(QPen(Qt::NoPen));
+ p.setBrush(Qt::white);
+ p.drawRoundedRect(rect, r, r);
+
p.setPen((single_format ? OutlineColours[colour] : Qt::gray));
p.setBrush(QBrush((single_format ? Colours[colour] : Qt::gray),
Qt::Dense4Pattern));
p.setPen((single_format ? OutlineColours[colour] : Qt::gray));
p.setBrush(QBrush((single_format ? Colours[colour] : Qt::gray),
Qt::Dense4Pattern));
- p.drawRoundedRect(
- QRectF(start, top, end - start, bottom - top), h/4, h/4);
+ p.drawRoundedRect(rect, r, r);
}
void DecodeTrace::draw_instant(const pv::data::decode::Annotation &a, QPainter &p,
}
void DecodeTrace::draw_instant(const pv::data::decode::Annotation &a, QPainter &p,
@@
-543,8
+545,8
@@
void DecodeTrace::draw_range(const pv::data::decode::Annotation &a, QPainter &p,
const int ann_start = start + cap_width;
const int ann_end = end - cap_width;
const int ann_start = start + cap_width;
const int ann_end = end - cap_width;
- const int real_start =
std::
max(ann_start, pp.left() + row_title_width);
- const int real_end =
std::
min(ann_end, pp.right());
+ const int real_start = max(ann_start, pp.left() + row_title_width);
+ const int real_end = min(ann_end, pp.right());
const int real_width = real_end - real_start;
QRectF rect(real_start, y - h / 2, real_width, h);
const int real_width = real_end - real_start;
QRectF rect(real_start, y - h / 2, real_width, h);
@@
-600,12
+602,14
@@
void DecodeTrace::draw_unresolved_period(QPainter &p, int h, int left,
double samples_per_pixel, pixels_offset;
double samples_per_pixel, pixels_offset;
- assert(decoder_stack_);
+ shared_ptr<pv::data::DecoderStack> decoder_stack = base_->decoder_stack();
+
+ assert(decoder_stack);
shared_ptr<Logic> data;
shared_ptr<data::SignalBase> signalbase;
shared_ptr<Logic> data;
shared_ptr<data::SignalBase> signalbase;
- const list< shared_ptr<Decoder> > &stack = decoder_stack
_
->stack();
+ const list< shared_ptr<Decoder> > &stack = decoder_stack->stack();
// We get the logic data of the first channel in the list.
// This works because we are currently assuming all
// We get the logic data of the first channel in the list.
// This works because we are currently assuming all
@@
-619,14
+623,13
@@
void DecodeTrace::draw_unresolved_period(QPainter &p, int h, int left,
if (!data || data->logic_segments().empty())
return;
if (!data || data->logic_segments().empty())
return;
- const shared_ptr<LogicSegment> segment =
- data->logic_segments().front();
+ const shared_ptr<LogicSegment> segment = data->logic_segments().front();
assert(segment);
const int64_t sample_count = (int64_t)segment->get_sample_count();
if (sample_count == 0)
return;
assert(segment);
const int64_t sample_count = (int64_t)segment->get_sample_count();
if (sample_count == 0)
return;
- const int64_t samples_decoded = decoder_stack
_
->samples_decoded();
+ const int64_t samples_decoded = decoder_stack->samples_decoded();
if (sample_count == samples_decoded)
return;
if (sample_count == samples_decoded)
return;
@@
-639,7
+642,7
@@
void DecodeTrace::draw_unresolved_period(QPainter &p, int h, int left,
samples_per_pixel - pixels_offset, left - 1.0);
const double end = min(sample_count / samples_per_pixel -
pixels_offset, right + 1.0);
samples_per_pixel - pixels_offset, left - 1.0);
const double end = min(sample_count / samples_per_pixel -
pixels_offset, right + 1.0);
- const QRectF no_decode_rect(start, y -
h/2
+ 0.5, end - start, h);
+ const QRectF no_decode_rect(start, y -
(h / 2)
+ 0.5, end - start, h);
p.setPen(QPen(Qt::NoPen));
p.setBrush(Qt::white);
p.setPen(QPen(Qt::NoPen));
p.setBrush(Qt::white);
@@
-652,8
+655,10
@@
void DecodeTrace::draw_unresolved_period(QPainter &p, int h, int left,
pair<double, double> DecodeTrace::get_pixels_offset_samples_per_pixel() const
{
pair<double, double> DecodeTrace::get_pixels_offset_samples_per_pixel() const
{
+ shared_ptr<pv::data::DecoderStack> decoder_stack = base_->decoder_stack();
+
assert(owner_);
assert(owner_);
- assert(decoder_stack
_
);
+ assert(decoder_stack);
const View *view = owner_->view();
assert(view);
const View *view = owner_->view();
assert(view);
@@
-662,9
+667,9
@@
pair<double, double> DecodeTrace::get_pixels_offset_samples_per_pixel() const
assert(scale > 0);
const double pixels_offset =
assert(scale > 0);
const double pixels_offset =
- ((view->offset() - decoder_stack
_
->start_time()) / scale).convert_to<double>();
+ ((view->offset() - decoder_stack->start_time()) / scale).convert_to<double>();
- double samplerate = decoder_stack
_
->samplerate();
+ double samplerate = decoder_stack->samplerate();
// Show sample rate as 1Hz when it is unknown
if (samplerate == 0.0)
// Show sample rate as 1Hz when it is unknown
if (samplerate == 0.0)
@@
-722,8
+727,10
@@
const QString DecodeTrace::get_annotation_at_point(const QPoint &point)
vector<pv::data::decode::Annotation> annotations;
vector<pv::data::decode::Annotation> annotations;
- assert(decoder_stack_);
- decoder_stack_->get_annotation_subset(annotations, visible_rows_[row],
+ shared_ptr<pv::data::DecoderStack> decoder_stack = base_->decoder_stack();
+
+ assert(decoder_stack);
+ decoder_stack->get_annotation_subset(annotations, visible_rows_[row],
sample_range.first, sample_range.second);
return (annotations.empty()) ?
sample_range.first, sample_range.second);
return (annotations.empty()) ?
@@
-783,7
+790,10
@@
void DecodeTrace::create_decoder_form(int index,
pv::widgets::DecoderGroupBox *const group =
new pv::widgets::DecoderGroupBox(
pv::widgets::DecoderGroupBox *const group =
new pv::widgets::DecoderGroupBox(
- QString::fromUtf8(decoder->name), nullptr, decoder_deletable);
+ QString::fromUtf8(decoder->name),
+ tr("%1:\n%2").arg(QString::fromUtf8(decoder->longname),
+ QString::fromUtf8(decoder->desc)),
+ nullptr, decoder_deletable);
group->set_decoder_visible(dec->shown());
if (decoder_deletable) {
group->set_decoder_visible(dec->shown());
if (decoder_deletable) {
@@
-828,9
+838,11
@@
void DecodeTrace::create_decoder_form(int index,
channel_selectors_.push_back(s);
}
channel_selectors_.push_back(s);
}
+ shared_ptr<pv::data::DecoderStack> decoder_stack = base_->decoder_stack();
+
// Add the options
shared_ptr<binding::Decoder> binding(
// Add the options
shared_ptr<binding::Decoder> binding(
- new binding::Decoder(decoder_stack
_
, dec));
+ new binding::Decoder(decoder_stack, dec));
binding->add_properties_to_form(decoder_form, true);
bindings_.push_back(binding);
binding->add_properties_to_form(decoder_form, true);
bindings_.push_back(binding);
@@
-848,7
+860,7
@@
QComboBox* DecodeTrace::create_channel_selector(
const auto sigs(session_.signalbases());
vector< shared_ptr<data::SignalBase> > sig_list(sigs.begin(), sigs.end());
const auto sigs(session_.signalbases());
vector< shared_ptr<data::SignalBase> > sig_list(sigs.begin(), sigs.end());
- s
td::s
ort(sig_list.begin(), sig_list.end(),
+ sort(sig_list.begin(), sig_list.end(),
[](const shared_ptr<data::SignalBase> &a,
const shared_ptr<data::SignalBase> &b) {
return strnatcasecmp(a->name().toStdString(),
[](const shared_ptr<data::SignalBase> &a,
const shared_ptr<data::SignalBase> &b) {
return strnatcasecmp(a->name().toStdString(),
@@
-865,7
+877,7
@@
QComboBox* DecodeTrace::create_channel_selector(
for (const shared_ptr<data::SignalBase> &b : sig_list) {
assert(b);
for (const shared_ptr<data::SignalBase> &b : sig_list) {
assert(b);
- if (b->
type() == sigrok::ChannelType::LOGIC
&& b->enabled()) {
+ if (b->
logic_data()
&& b->enabled()) {
selector->addItem(b->name(),
qVariantFromValue((void*)b.get()));
selector->addItem(b->name(),
qVariantFromValue((void*)b.get()));
@@
-908,11
+920,13
@@
void DecodeTrace::commit_decoder_channels(shared_ptr<data::decode::Decoder> &dec
void DecodeTrace::commit_channels()
{
void DecodeTrace::commit_channels()
{
- assert(decoder_stack_);
- for (shared_ptr<data::decode::Decoder> dec : decoder_stack_->stack())
+ shared_ptr<pv::data::DecoderStack> decoder_stack = base_->decoder_stack();
+
+ assert(decoder_stack);
+ for (shared_ptr<data::decode::Decoder> dec : decoder_stack->stack())
commit_decoder_channels(dec);
commit_decoder_channels(dec);
- decoder_stack
_
->begin_decode();
+ decoder_stack->begin_decode();
}
void DecodeTrace::on_new_decode_data()
}
void DecodeTrace::on_new_decode_data()
@@
-928,7
+942,7
@@
void DecodeTrace::delete_pressed()
void DecodeTrace::on_delete()
{
void DecodeTrace::on_delete()
{
- session_.remove_decode_signal(
this
);
+ session_.remove_decode_signal(
base_
);
}
void DecodeTrace::on_channel_selected(int)
}
void DecodeTrace::on_channel_selected(int)
@@
-938,30
+952,35
@@
void DecodeTrace::on_channel_selected(int)
void DecodeTrace::on_stack_decoder(srd_decoder *decoder)
{
void DecodeTrace::on_stack_decoder(srd_decoder *decoder)
{
+ shared_ptr<pv::data::DecoderStack> decoder_stack = base_->decoder_stack();
+
assert(decoder);
assert(decoder);
- assert(decoder_stack_);
- decoder_stack_->push(shared_ptr<data::decode::Decoder>(
- new data::decode::Decoder(decoder)));
- decoder_stack_->begin_decode();
+ assert(decoder_stack);
+ decoder_stack->push(make_shared<data::decode::Decoder>(decoder));
+ decoder_stack->begin_decode();
create_popup_form();
}
void DecodeTrace::on_delete_decoder(int index)
{
create_popup_form();
}
void DecodeTrace::on_delete_decoder(int index)
{
- decoder_stack_->remove(index);
+ shared_ptr<pv::data::DecoderStack> decoder_stack = base_->decoder_stack();
+
+ decoder_stack->remove(index);
// Update the popup
// Update the popup
- create_popup_form();
+ create_popup_form();
- decoder_stack
_
->begin_decode();
+ decoder_stack->begin_decode();
}
void DecodeTrace::on_show_hide_decoder(int index)
{
using pv::data::decode::Decoder;
}
void DecodeTrace::on_show_hide_decoder(int index)
{
using pv::data::decode::Decoder;
- const list< shared_ptr<Decoder> > stack(decoder_stack_->stack());
+ shared_ptr<pv::data::DecoderStack> decoder_stack = base_->decoder_stack();
+
+ const list< shared_ptr<Decoder> > stack(decoder_stack->stack());
// Find the decoder in the stack
auto iter = stack.cbegin();
// Find the decoder in the stack
auto iter = stack.cbegin();
@@
-981,5
+1000,6
@@
void DecodeTrace::on_show_hide_decoder(int index)
owner_->row_item_appearance_changed(false, true);
}
owner_->row_item_appearance_changed(false, true);
}
-} // namespace view
+} // namespace TraceView
+} // namespace views
} // namespace pv
} // namespace pv