projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix #942 by making sure we always have at least one positive div
[pulseview.git]
/
pv
/
view
/
decodetrace.cpp
diff --git
a/pv/view/decodetrace.cpp
b/pv/view/decodetrace.cpp
index 0d8a0edbb993ab5982c901dca4c7f4fdfbf6f408..74d0dd6511b623a4c41aba5b66bd6cf13194f830 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,25
+40,20
@@
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::all_of;
using std::all_of;
-using std::dynamic_pointer_cast;
using std::list;
using std::list;
-using std::lock_guard;
using std::make_pair;
using std::max;
using std::make_pair;
using std::make_pair;
using std::max;
using std::make_pair;
@@
-177,13
+170,13
@@
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;
@@
-255,7
+248,7
@@
void DecodeTrace::paint_mid(QPainter &p, const ViewItemPaintParams &pp)
max_visible_rows_ = 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;
@@
-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(
@@
-492,11
+484,17
@@
void DecodeTrace::draw_annotation_block(
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,
@@
-625,8
+623,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)
@@
-645,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);
@@
-793,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) {
@@
-969,7
+969,7
@@
void DecodeTrace::on_delete_decoder(int index)
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();
}