projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add a tooltip for the "Show/hide decoder trace" icon.
[pulseview.git]
/
pv
/
view
/
decodetrace.cpp
diff --git
a/pv/view/decodetrace.cpp
b/pv/view/decodetrace.cpp
index 164c7e5a6075fc719a9cc3e9c117e309ecf37ff8..9132ea97c7850e910bc19b04dd38eb009f04d036 100644
(file)
--- a/
pv/view/decodetrace.cpp
+++ b/
pv/view/decodetrace.cpp
@@
-28,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>
@@
-42,28
+40,26
@@
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::make_shared;
using std::pair;
using std::shared_ptr;
using std::make_shared;
@@
-137,8
+133,7
@@
DecodeTrace::DecodeTrace(pv::Session &session,
delete_mapper_(this),
show_hide_mapper_(this)
{
delete_mapper_(this),
show_hide_mapper_(this)
{
- std::shared_ptr<pv::data::DecoderStack> decoder_stack =
- base_->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());
// Determine shortest string we want to see displayed in full
QFontMetrics m(QApplication::font());
@@
-160,7
+155,7
@@
bool DecodeTrace::enabled() const
return true;
}
return true;
}
-s
td::s
hared_ptr<data::SignalBase> DecodeTrace::base() const
+shared_ptr<data::SignalBase> DecodeTrace::base() const
{
return base_;
}
{
return base_;
}
@@
-185,8
+180,7
@@
void DecodeTrace::paint_mid(QPainter &p, const ViewItemPaintParams &pp)
{
using namespace pv::data::decode;
{
using namespace pv::data::decode;
- std::shared_ptr<pv::data::DecoderStack> decoder_stack =
- base_->decoder_stack();
+ 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 text_height = ViewItemPaintParams::text_height();
row_height_ = (text_height * 6) / 4;
@@
-217,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;
@@
-251,7
+245,7
@@
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, const ViewItemPaintParams &pp)
@@
-298,8
+292,7
@@
void DecodeTrace::populate_popup_form(QWidget *parent, QFormLayout *form)
{
using pv::data::decode::Decoder;
{
using pv::data::decode::Decoder;
- std::shared_ptr<pv::data::DecoderStack> decoder_stack =
- base_->decoder_stack();
+ shared_ptr<pv::data::DecoderStack> decoder_stack = base_->decoder_stack();
assert(form);
assert(parent);
assert(form);
assert(parent);
@@
-340,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);
@@
-444,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]);
@@
-457,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(
@@
-488,7
+480,7
@@
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; });
@@
-496,7
+488,7
@@
void DecodeTrace::draw_annotation_block(
p.setBrush(QBrush((single_format ? Colours[colour] : Qt::gray),
Qt::Dense4Pattern));
p.drawRoundedRect(
p.setBrush(QBrush((single_format ? Colours[colour] : Qt::gray),
Qt::Dense4Pattern));
p.drawRoundedRect(
- QRectF(start, top, end - start, bottom - top), h
/4, h/
4);
+ QRectF(start, top, end - start, bottom - top), h
/ 4, h /
4);
}
void DecodeTrace::draw_instant(const pv::data::decode::Annotation &a, QPainter &p,
}
void DecodeTrace::draw_instant(const pv::data::decode::Annotation &a, QPainter &p,
@@
-547,8
+539,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);
@@
-604,8
+596,7
@@
void DecodeTrace::draw_unresolved_period(QPainter &p, int h, int left,
double samples_per_pixel, pixels_offset;
double samples_per_pixel, pixels_offset;
- std::shared_ptr<pv::data::DecoderStack> decoder_stack =
- base_->decoder_stack();
+ shared_ptr<pv::data::DecoderStack> decoder_stack = base_->decoder_stack();
assert(decoder_stack);
assert(decoder_stack);
@@
-626,8
+617,7
@@
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)
assert(segment);
const int64_t sample_count = (int64_t)segment->get_sample_count();
if (sample_count == 0)
@@
-646,7
+636,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);
@@
-659,8
+649,7
@@
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
{
- std::shared_ptr<pv::data::DecoderStack> decoder_stack =
- base_->decoder_stack();
+ shared_ptr<pv::data::DecoderStack> decoder_stack = base_->decoder_stack();
assert(owner_);
assert(decoder_stack);
assert(owner_);
assert(decoder_stack);
@@
-732,8
+721,7
@@
const QString DecodeTrace::get_annotation_at_point(const QPoint &point)
vector<pv::data::decode::Annotation> annotations;
vector<pv::data::decode::Annotation> annotations;
- std::shared_ptr<pv::data::DecoderStack> decoder_stack =
- base_->decoder_stack();
+ shared_ptr<pv::data::DecoderStack> decoder_stack = base_->decoder_stack();
assert(decoder_stack);
decoder_stack->get_annotation_subset(annotations, visible_rows_[row],
assert(decoder_stack);
decoder_stack->get_annotation_subset(annotations, visible_rows_[row],
@@
-796,7
+784,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) {
@@
-841,8
+832,7
@@
void DecodeTrace::create_decoder_form(int index,
channel_selectors_.push_back(s);
}
channel_selectors_.push_back(s);
}
- std::shared_ptr<pv::data::DecoderStack> decoder_stack =
- base_->decoder_stack();
+ 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(
@@
-864,7
+854,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(),
@@
-881,7
+871,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()));
@@
-924,8
+914,7
@@
void DecodeTrace::commit_decoder_channels(shared_ptr<data::decode::Decoder> &dec
void DecodeTrace::commit_channels()
{
void DecodeTrace::commit_channels()
{
- std::shared_ptr<pv::data::DecoderStack> decoder_stack =
- base_->decoder_stack();
+ shared_ptr<pv::data::DecoderStack> decoder_stack = base_->decoder_stack();
assert(decoder_stack);
for (shared_ptr<data::decode::Decoder> dec : decoder_stack->stack())
assert(decoder_stack);
for (shared_ptr<data::decode::Decoder> dec : decoder_stack->stack())
@@
-957,8
+946,7
@@
void DecodeTrace::on_channel_selected(int)
void DecodeTrace::on_stack_decoder(srd_decoder *decoder)
{
void DecodeTrace::on_stack_decoder(srd_decoder *decoder)
{
- std::shared_ptr<pv::data::DecoderStack> decoder_stack =
- base_->decoder_stack();
+ shared_ptr<pv::data::DecoderStack> decoder_stack = base_->decoder_stack();
assert(decoder);
assert(decoder_stack);
assert(decoder);
assert(decoder_stack);
@@
-970,13
+958,12
@@
void DecodeTrace::on_stack_decoder(srd_decoder *decoder)
void DecodeTrace::on_delete_decoder(int index)
{
void DecodeTrace::on_delete_decoder(int index)
{
- std::shared_ptr<pv::data::DecoderStack> decoder_stack =
- base_->decoder_stack();
+ shared_ptr<pv::data::DecoderStack> decoder_stack = base_->decoder_stack();
decoder_stack->remove(index);
// Update the popup
decoder_stack->remove(index);
// Update the popup
- create_popup_form();
+ create_popup_form();
decoder_stack->begin_decode();
}
decoder_stack->begin_decode();
}
@@
-985,8
+972,7
@@
void DecodeTrace::on_show_hide_decoder(int index)
{
using pv::data::decode::Decoder;
{
using pv::data::decode::Decoder;
- std::shared_ptr<pv::data::DecoderStack> decoder_stack =
- base_->decoder_stack();
+ shared_ptr<pv::data::DecoderStack> decoder_stack = base_->decoder_stack();
const list< shared_ptr<Decoder> > stack(decoder_stack->stack());
const list< shared_ptr<Decoder> > stack(decoder_stack->stack());