X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fdecodetrace.cpp;h=164c7e5a6075fc719a9cc3e9c117e309ecf37ff8;hb=87a97d8aa169936ec2dcd229df88b8c5b4a1411c;hp=e582d1a8e2042d1ba4d4f2dd1046940bd8067990;hpb=db62bbfda512aeddca5b9d7b5960e9cf24b8859c;p=pulseview.git
diff --git a/pv/view/decodetrace.cpp b/pv/view/decodetrace.cpp
index e582d1a..164c7e5 100644
--- a/pv/view/decodetrace.cpp
+++ b/pv/view/decodetrace.cpp
@@ -14,17 +14,22 @@
* 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 .
*/
extern "C" {
#include
}
+#include
+
#include
-#include
+#include
+
+#include
+#include
+#include
#include
#include
@@ -33,25 +38,42 @@ extern "C" {
#include
#include
#include
-
-#include "decodetrace.h"
-
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-
-using namespace boost;
-using namespace std;
+#include
+
+#include "decodetrace.hpp"
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+using boost::shared_lock;
+using boost::shared_mutex;
+using std::dynamic_pointer_cast;
+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::pair;
+using std::shared_ptr;
+using std::make_shared;
+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
@@ -63,20 +85,74 @@ const QColor DecodeTrace::DecodeColours[4] = {
const QColor DecodeTrace::ErrorBgColour = QColor(0xEF, 0x29, 0x29);
const QColor DecodeTrace::NoDecodeColour = QColor(0x88, 0x8A, 0x85);
-DecodeTrace::DecodeTrace(pv::SigSession &session,
- boost::shared_ptr decoder_stack, int index) :
- Trace(session, QString(decoder_stack->stack().front()->decoder()->name)),
- _decoder_stack(decoder_stack),
- _delete_mapper(this)
+const int DecodeTrace::ArrowSize = 4;
+const double DecodeTrace::EndCapWidth = 5;
+const int DecodeTrace::RowTitleMargin = 10;
+const int DecodeTrace::DrawPadding = 100;
+
+const QColor DecodeTrace::Colours[16] = {
+ QColor(0xEF, 0x29, 0x29),
+ QColor(0xF6, 0x6A, 0x32),
+ QColor(0xFC, 0xAE, 0x3E),
+ QColor(0xFB, 0xCA, 0x47),
+ QColor(0xFC, 0xE9, 0x4F),
+ QColor(0xCD, 0xF0, 0x40),
+ QColor(0x8A, 0xE2, 0x34),
+ QColor(0x4E, 0xDC, 0x44),
+ QColor(0x55, 0xD7, 0x95),
+ QColor(0x64, 0xD1, 0xD2),
+ QColor(0x72, 0x9F, 0xCF),
+ QColor(0xD4, 0x76, 0xC4),
+ QColor(0x9D, 0x79, 0xB9),
+ QColor(0xAD, 0x7F, 0xA8),
+ QColor(0xC2, 0x62, 0x9B),
+ QColor(0xD7, 0x47, 0x6F)
+};
+
+const QColor DecodeTrace::OutlineColours[16] = {
+ QColor(0x77, 0x14, 0x14),
+ QColor(0x7B, 0x35, 0x19),
+ QColor(0x7E, 0x57, 0x1F),
+ QColor(0x7D, 0x65, 0x23),
+ QColor(0x7E, 0x74, 0x27),
+ QColor(0x66, 0x78, 0x20),
+ QColor(0x45, 0x71, 0x1A),
+ QColor(0x27, 0x6E, 0x22),
+ QColor(0x2A, 0x6B, 0x4A),
+ QColor(0x32, 0x68, 0x69),
+ QColor(0x39, 0x4F, 0x67),
+ QColor(0x6A, 0x3B, 0x62),
+ QColor(0x4E, 0x3C, 0x5C),
+ QColor(0x56, 0x3F, 0x54),
+ QColor(0x61, 0x31, 0x4D),
+ QColor(0x6B, 0x23, 0x37)
+};
+
+DecodeTrace::DecodeTrace(pv::Session &session,
+ shared_ptr signalbase, int index) :
+ Trace(signalbase),
+ session_(session),
+ row_height_(0),
+ max_visible_rows_(0),
+ delete_mapper_(this),
+ show_hide_mapper_(this)
{
- assert(_decoder_stack);
+ std::shared_ptr decoder_stack =
+ base_->decoder_stack();
- _colour = DecodeColours[index % countof(DecodeColours)];
+ // 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
+
+ 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)),
+ connect(&delete_mapper_, SIGNAL(mapped(int)),
this, SLOT(on_delete_decoder(int)));
+ connect(&show_hide_mapper_, SIGNAL(mapped(int)),
+ this, SLOT(on_show_hide_decoder(int)));
}
bool DecodeTrace::enabled() const
@@ -84,101 +160,175 @@ bool DecodeTrace::enabled() const
return true;
}
-const boost::shared_ptr& DecodeTrace::decoder() const
+std::shared_ptr DecodeTrace::base() const
{
- return _decoder_stack;
+ return base_;
}
-void DecodeTrace::set_view(pv::view::View *view)
+pair DecodeTrace::v_extents() const
{
- assert(view);
- Trace::set_view(view);
+ const int row_height = (ViewItemPaintParams::text_height() * 6) / 4;
+
+ // Make an empty decode trace appear symmetrical
+ const int row_count = max(1, max_visible_rows_);
+
+ return make_pair(-row_height, row_height * row_count);
}
-void DecodeTrace::paint_back(QPainter &p, int left, int right)
+void DecodeTrace::paint_back(QPainter &p, const ViewItemPaintParams &pp)
{
- Trace::paint_back(p, left, right);
- paint_axis(p, get_y(), left, right);
+ Trace::paint_back(p, pp);
+ paint_axis(p, pp, get_visual_y());
}
-void DecodeTrace::paint_mid(QPainter &p, int left, int right)
+void DecodeTrace::paint_mid(QPainter &p, const ViewItemPaintParams &pp)
{
- using namespace pv::view::decode;
+ using namespace pv::data::decode;
- const double scale = _view->scale();
- assert(scale > 0);
+ std::shared_ptr decoder_stack =
+ base_->decoder_stack();
- double samplerate = _decoder_stack->samplerate();
+ const int text_height = ViewItemPaintParams::text_height();
+ row_height_ = (text_height * 6) / 4;
+ const int annotation_height = (text_height * 5) / 4;
- // Show sample rate as 1Hz when it is unknown
- if (samplerate == 0.0)
- samplerate = 1.0;
+ assert(decoder_stack);
+ const QString err = decoder_stack->error_message();
+ if (!err.isEmpty()) {
+ draw_unresolved_period(
+ p, annotation_height, pp.left(), pp.right());
+ draw_error(p, err, pp);
+ return;
+ }
- const double pixels_offset = (_view->offset() -
- _decoder_stack->get_start_time()) / scale;
- const double samples_per_pixel = samplerate * scale;
+ // Set default pen to allow for text width calculation
+ p.setPen(Qt::black);
+
+ // Iterate through the rows
+ int y = get_visual_y();
+ pair sample_range = get_sample_range(
+ pp.left(), pp.right());
+
+ const vector rows(decoder_stack->get_visible_rows());
+
+ visible_rows_.clear();
+ for (const Row& row : rows) {
+ // Cache the row title widths
+ int row_title_width;
+ try {
+ row_title_width = row_title_widths_.at(row);
+ } catch (std::out_of_range) {
+ const int w = p.boundingRect(QRectF(), 0, row.title()).width() +
+ RowTitleMargin;
+ row_title_widths_[row] = w;
+ row_title_width = w;
+ }
- QFontMetrics m(QApplication::font());
- const int h = (m.boundingRect(QRect(), 0, "Tg").height() * 5) / 4;
-
- assert(_decoder_stack);
- const QString err = _decoder_stack->error_message();
- if (!err.isEmpty())
- {
- draw_error(p, err, left, right);
- draw_unresolved_period(p, h, left, right, samples_per_pixel,
- pixels_offset);
- return;
+ // Determine the row's color
+ size_t base_colour = 0x13579BDF;
+ boost::hash_combine(base_colour, this);
+ boost::hash_combine(base_colour, row.decoder());
+ boost::hash_combine(base_colour, row.row());
+ base_colour >>= 16;
+
+ vector annotations;
+ decoder_stack->get_annotation_subset(annotations, row,
+ sample_range.first, sample_range.second);
+ if (!annotations.empty()) {
+ draw_annotations(annotations, p, annotation_height, pp, y,
+ base_colour, row_title_width);
+
+ y += row_height_;
+
+ visible_rows_.push_back(row);
+ }
}
- assert(_view);
- const int y = get_y();
+ // Draw the hatching
+ draw_unresolved_period(p, annotation_height, pp.left(), pp.right());
- assert(_decoder_stack);
- vector annotations(_decoder_stack->annotations());
- BOOST_FOREACH(const Annotation &a, annotations)
- a.paint(p, get_text_colour(), h, left, right,
- samples_per_pixel, pixels_offset, y);
+ if ((int)visible_rows_.size() > max_visible_rows_)
+ owner_->extents_changed(false, true);
- draw_unresolved_period(p, h, left, right,
- samples_per_pixel, pixels_offset);
+ // Update the maximum row count if needed
+ max_visible_rows_ = std::max(max_visible_rows_, (int)visible_rows_.size());
+}
+
+void DecodeTrace::paint_fore(QPainter &p, const ViewItemPaintParams &pp)
+{
+ using namespace pv::data::decode;
+
+ assert(row_height_);
+
+ for (size_t i = 0; i < visible_rows_.size(); i++) {
+ const int y = i * row_height_ + get_visual_y();
+
+ p.setPen(QPen(Qt::NoPen));
+ p.setBrush(QApplication::palette().brush(QPalette::WindowText));
+
+ if (i != 0) {
+ const QPointF points[] = {
+ QPointF(pp.left(), y - ArrowSize),
+ QPointF(pp.left() + ArrowSize, y),
+ QPointF(pp.left(), y + ArrowSize)
+ };
+ p.drawPolygon(points, countof(points));
+ }
+
+ const QRect r(pp.left() + ArrowSize * 2, y - row_height_ / 2,
+ pp.right() - pp.left(), row_height_);
+ const QString h(visible_rows_[i].title());
+ const int f = Qt::AlignLeft | Qt::AlignVCenter |
+ Qt::TextDontClip;
+
+ // Draw the outline
+ p.setPen(QApplication::palette().color(QPalette::Base));
+ for (int dx = -1; dx <= 1; dx++)
+ for (int dy = -1; dy <= 1; dy++)
+ if (dx != 0 && dy != 0)
+ p.drawText(r.translated(dx, dy), f, h);
+
+ // Draw the text
+ p.setPen(QApplication::palette().color(QPalette::WindowText));
+ p.drawText(r, f, h);
+ }
}
void DecodeTrace::populate_popup_form(QWidget *parent, QFormLayout *form)
{
using pv::data::decode::Decoder;
+ std::shared_ptr decoder_stack =
+ base_->decoder_stack();
+
assert(form);
assert(parent);
- assert(_decoder_stack);
+ assert(decoder_stack);
// Add the standard options
Trace::populate_popup_form(parent, form);
// Add the decoder options
- _bindings.clear();
- _probe_selectors.clear();
+ bindings_.clear();
+ channel_selectors_.clear();
+ decoder_forms_.clear();
- const list< shared_ptr >& stack = _decoder_stack->stack();
+ const list< shared_ptr >& stack = decoder_stack->stack();
- if (stack.empty())
- {
+ if (stack.empty()) {
QLabel *const l = new QLabel(
tr("No decoders in the stack
"));
l->setAlignment(Qt::AlignCenter);
form->addRow(l);
- }
- else
- {
- list< shared_ptr >::const_iterator iter =
- stack.begin();
+ } else {
+ auto iter = stack.cbegin();
for (int i = 0; i < (int)stack.size(); i++, iter++) {
shared_ptr dec(*iter);
create_decoder_form(i, dec, parent, form);
}
form->addRow(new QLabel(
- tr("* Required Probes"), parent));
+ tr("* Required channels"), parent));
}
// Add stacking button
@@ -210,16 +360,231 @@ QMenu* DecodeTrace::create_context_menu(QWidget *parent)
return menu;
}
+void DecodeTrace::draw_annotations(vector annotations,
+ QPainter &p, int h, const ViewItemPaintParams &pp, int y,
+ size_t base_colour, int row_title_width)
+{
+ using namespace pv::data::decode;
+
+ vector a_block;
+ int p_end = INT_MIN;
+
+ double samples_per_pixel, pixels_offset;
+ tie(pixels_offset, samples_per_pixel) =
+ get_pixels_offset_samples_per_pixel();
+
+ // Sort the annotations by start sample so that decoders
+ // can't confuse us by creating annotations out of order
+ stable_sort(annotations.begin(), annotations.end(),
+ [](const Annotation &a, const Annotation &b) {
+ return a.start_sample() < b.start_sample(); });
+
+ // Gather all annotations that form a visual "block" and draw them as such
+ for (const Annotation &a : annotations) {
+
+ const int a_start = a.start_sample() / samples_per_pixel - pixels_offset;
+ const int a_end = a.end_sample() / samples_per_pixel - pixels_offset;
+ const int a_width = a_end - a_start;
+
+ const int delta = a_end - p_end;
+
+ bool a_is_separate = false;
+
+ // Annotation wider than the threshold for a useful label width?
+ if (a_width >= min_useful_label_width_) {
+ for (const QString &ann_text : a.annotations()) {
+ const int w = p.boundingRect(QRectF(), 0, ann_text).width();
+ // Annotation wide enough to fit a label? Don't put it in a block then
+ if (w <= a_width) {
+ a_is_separate = true;
+ break;
+ }
+ }
+ }
+
+ // Were the previous and this annotation more than a pixel apart?
+ if ((abs(delta) > 1) || a_is_separate) {
+ // Block was broken, draw annotations that form the current block
+ if (a_block.size() == 1) {
+ draw_annotation(a_block.front(), p, h, pp, y, base_colour,
+ row_title_width);
+ }
+ else
+ draw_annotation_block(a_block, p, h, y, base_colour);
+
+ a_block.clear();
+ }
+
+ if (a_is_separate) {
+ draw_annotation(a, p, h, pp, y, base_colour, row_title_width);
+ // Next annotation must start a new block. delta will be > 1
+ // because we set p_end to INT_MIN but that's okay since
+ // a_block will be empty, so nothing will be drawn
+ p_end = INT_MIN;
+ } else {
+ a_block.push_back(a);
+ p_end = a_end;
+ }
+ }
+
+ if (a_block.size() == 1)
+ draw_annotation(a_block.front(), p, h, pp, y, base_colour,
+ row_title_width);
+ else
+ draw_annotation_block(a_block, p, h, y, base_colour);
+}
+
+void DecodeTrace::draw_annotation(const pv::data::decode::Annotation &a,
+ QPainter &p, int h, const ViewItemPaintParams &pp, int y,
+ size_t base_colour, int row_title_width) const
+{
+ double samples_per_pixel, pixels_offset;
+ tie(pixels_offset, samples_per_pixel) =
+ get_pixels_offset_samples_per_pixel();
+
+ const double start = a.start_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]);
+ p.setBrush(Colours[colour]);
+
+ if (start > pp.right() + DrawPadding || end < pp.left() - DrawPadding)
+ return;
+
+ 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);
+}
+
+void DecodeTrace::draw_annotation_block(
+ vector annotations, QPainter &p, int h,
+ int y, size_t base_colour) const
+{
+ using namespace pv::data::decode;
+
+ if (annotations.empty())
+ return;
+
+ double samples_per_pixel, pixels_offset;
+ tie(pixels_offset, samples_per_pixel) =
+ get_pixels_offset_samples_per_pixel();
+
+ const double start = annotations.front().start_sample() /
+ samples_per_pixel - pixels_offset;
+ const double end = annotations.back().end_sample() /
+ samples_per_pixel - pixels_offset;
+
+ const double top = y + .5 - h / 2;
+ const double bottom = y + .5 + h / 2;
+
+ const size_t colour = (base_colour + annotations.front().format()) %
+ countof(Colours);
+
+ // 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(
+ annotations.begin(), annotations.end(),
+ [&](const Annotation &a) { return a.format() == format; });
+
+ 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);
+}
+
+void DecodeTrace::draw_instant(const pv::data::decode::Annotation &a, QPainter &p,
+ int h, double x, int y) const
+{
+ const QString text = a.annotations().empty() ?
+ QString() : a.annotations().back();
+ const double w = min((double)p.boundingRect(QRectF(), 0, text).width(),
+ 0.0) + h;
+ const QRectF rect(x - w / 2, y - h / 2, w, h);
+
+ p.drawRoundedRect(rect, h / 2, h / 2);
+
+ p.setPen(Qt::black);
+ p.drawText(rect, Qt::AlignCenter | Qt::AlignVCenter, text);
+}
+
+void DecodeTrace::draw_range(const pv::data::decode::Annotation &a, QPainter &p,
+ int h, double start, double end, int y, const ViewItemPaintParams &pp,
+ int row_title_width) const
+{
+ const double top = y + .5 - h / 2;
+ const double bottom = y + .5 + h / 2;
+ const vector annotations = a.annotations();
+
+ // If the two ends are within 1 pixel, draw a vertical line
+ if (start + 1.0 > end) {
+ p.drawLine(QPointF(start, top), QPointF(start, bottom));
+ return;
+ }
+
+ const double cap_width = min((end - start) / 4, EndCapWidth);
+
+ QPointF pts[] = {
+ QPointF(start, y + .5f),
+ QPointF(start + cap_width, top),
+ QPointF(end - cap_width, top),
+ QPointF(end, y + .5f),
+ QPointF(end - cap_width, bottom),
+ QPointF(start + cap_width, bottom)
+ };
+
+ p.drawConvexPolygon(pts, countof(pts));
+
+ if (annotations.empty())
+ return;
+
+ 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_width = real_end - real_start;
+
+ QRectF rect(real_start, y - h / 2, real_width, h);
+ if (rect.width() <= 4)
+ return;
+
+ p.setPen(Qt::black);
+
+ // Try to find an annotation that will fit
+ QString best_annotation;
+ int best_width = 0;
+
+ for (const QString &a : annotations) {
+ const int w = p.boundingRect(QRectF(), 0, a).width();
+ if (w <= rect.width() && w > best_width)
+ best_annotation = a, best_width = w;
+ }
+
+ if (best_annotation.isEmpty())
+ best_annotation = annotations.back();
+
+ // If not ellide the last in the list
+ p.drawText(rect, Qt::AlignCenter, p.fontMetrics().elidedText(
+ best_annotation, Qt::ElideRight, rect.width()));
+}
+
void DecodeTrace::draw_error(QPainter &p, const QString &message,
- int left, int right)
+ const ViewItemPaintParams &pp)
{
- const int y = get_y();
+ const int y = get_visual_y();
p.setPen(ErrorBgColour.darker());
p.setBrush(ErrorBgColour);
const QRectF bounding_rect =
- QRectF(left, INT_MIN / 2 + y, right - left, INT_MAX);
+ QRectF(pp.width(), INT_MIN / 2 + y, pp.width(), INT_MAX);
const QRectF text_rect = p.boundingRect(bounding_rect,
Qt::AlignCenter, message);
const float r = text_rect.height() / 4;
@@ -227,47 +592,56 @@ void DecodeTrace::draw_error(QPainter &p, const QString &message,
p.drawRoundedRect(text_rect.adjusted(-r, -r, r, r), r, r,
Qt::AbsoluteSize);
- p.setPen(get_text_colour());
+ p.setPen(Qt::black);
p.drawText(text_rect, message);
}
void DecodeTrace::draw_unresolved_period(QPainter &p, int h, int left,
- int right, double samples_per_pixel, double pixels_offset)
+ int right) const
{
using namespace pv::data;
using pv::data::decode::Decoder;
- assert(_decoder_stack);
+ double samples_per_pixel, pixels_offset;
+
+ std::shared_ptr decoder_stack =
+ base_->decoder_stack();
+
+ assert(decoder_stack);
shared_ptr data;
- shared_ptr logic_signal;
+ shared_ptr signalbase;
- const list< shared_ptr > &stack = _decoder_stack->stack();
+ const list< shared_ptr > &stack = decoder_stack->stack();
- // We get the logic data of the first probe in the list.
+ // We get the logic data of the first channel in the list.
// This works because we are currently assuming all
- // LogicSignals have the same data/snapshot
- BOOST_FOREACH (const shared_ptr &dec, stack)
- if (dec && !dec->probes().empty() &&
- ((logic_signal = (*dec->probes().begin()).second)) &&
- ((data = logic_signal->logic_data())))
+ // LogicSignals have the same data/segment
+ for (const shared_ptr &dec : stack)
+ if (dec && !dec->channels().empty() &&
+ ((signalbase = (*dec->channels().begin()).second)) &&
+ ((data = signalbase->logic_data())))
break;
- if (!data || data->get_snapshots().empty())
+ if (!data || data->logic_segments().empty())
return;
- const shared_ptr snapshot =
- data->get_snapshots().front();
- assert(snapshot);
- const int64_t sample_count = (int64_t)snapshot->get_sample_count();
+ const shared_ptr segment =
+ data->logic_segments().front();
+ 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;
- const int y = get_y();
+ const int y = get_visual_y();
+
+ tie(pixels_offset, samples_per_pixel) =
+ get_pixels_offset_samples_per_pixel();
+
const double start = max(samples_decoded /
samples_per_pixel - pixels_offset, left - 1.0);
const double end = min(sample_count / samples_per_pixel -
@@ -283,140 +657,287 @@ void DecodeTrace::draw_unresolved_period(QPainter &p, int h, int left,
p.drawRect(no_decode_rect);
}
+pair DecodeTrace::get_pixels_offset_samples_per_pixel() const
+{
+ std::shared_ptr decoder_stack =
+ base_->decoder_stack();
+
+ assert(owner_);
+ assert(decoder_stack);
+
+ const View *view = owner_->view();
+ assert(view);
+
+ const double scale = view->scale();
+ assert(scale > 0);
+
+ const double pixels_offset =
+ ((view->offset() - decoder_stack->start_time()) / scale).convert_to();
+
+ double samplerate = decoder_stack->samplerate();
+
+ // Show sample rate as 1Hz when it is unknown
+ if (samplerate == 0.0)
+ samplerate = 1.0;
+
+ return make_pair(pixels_offset, samplerate * scale);
+}
+
+pair DecodeTrace::get_sample_range(
+ int x_start, int x_end) const
+{
+ double samples_per_pixel, pixels_offset;
+ tie(pixels_offset, samples_per_pixel) =
+ get_pixels_offset_samples_per_pixel();
+
+ const uint64_t start = (uint64_t)max(
+ (x_start + pixels_offset) * samples_per_pixel, 0.0);
+ const uint64_t end = (uint64_t)max(
+ (x_end + pixels_offset) * samples_per_pixel, 0.0);
+
+ return make_pair(start, end);
+}
+
+int DecodeTrace::get_row_at_point(const QPoint &point)
+{
+ if (!row_height_)
+ return -1;
+
+ const int y = (point.y() - get_visual_y() + row_height_ / 2);
+
+ /* Integer divison of (x-1)/x would yield 0, so we check for this. */
+ if (y < 0)
+ return -1;
+
+ const int row = y / row_height_;
+
+ if (row >= (int)visible_rows_.size())
+ return -1;
+
+ return row;
+}
+
+const QString DecodeTrace::get_annotation_at_point(const QPoint &point)
+{
+ using namespace pv::data::decode;
+
+ if (!enabled())
+ return QString();
+
+ const pair sample_range =
+ get_sample_range(point.x(), point.x() + 1);
+ const int row = get_row_at_point(point);
+ if (row < 0)
+ return QString();
+
+ vector annotations;
+
+ std::shared_ptr 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()) ?
+ QString() : annotations[0].annotations().front();
+}
+
+void DecodeTrace::hover_point_changed()
+{
+ assert(owner_);
+
+ const View *const view = owner_->view();
+ assert(view);
+
+ QPoint hp = view->hover_point();
+ QString ann = get_annotation_at_point(hp);
+
+ assert(view);
+
+ if (!row_height_ || ann.isEmpty()) {
+ QToolTip::hideText();
+ return;
+ }
+
+ const int hover_row = get_row_at_point(hp);
+
+ QFontMetrics m(QToolTip::font());
+ const QRect text_size = m.boundingRect(QRect(), 0, ann);
+
+ // This is OS-specific and unfortunately we can't query it, so
+ // use an approximation to at least try to minimize the error.
+ const int padding = 8;
+
+ // Make sure the tool tip doesn't overlap with the mouse cursor.
+ // If it did, the tool tip would constantly hide and re-appear.
+ // We also push it up by one row so that it appears above the
+ // decode trace, not below.
+ hp.setX(hp.x() - (text_size.width() / 2) - padding);
+
+ hp.setY(get_visual_y() - (row_height_ / 2) +
+ (hover_row * row_height_) -
+ row_height_ - text_size.height() - padding);
+
+ QToolTip::showText(view->viewport()->mapToGlobal(hp), ann);
+}
+
void DecodeTrace::create_decoder_form(int index,
shared_ptr &dec, QWidget *parent,
QFormLayout *form)
{
- const GSList *probe;
+ const GSList *l;
assert(dec);
const srd_decoder *const decoder = dec->decoder();
assert(decoder);
+ const bool decoder_deletable = index > 0;
+
pv::widgets::DecoderGroupBox *const group =
- new pv::widgets::DecoderGroupBox(decoder->name);
+ new pv::widgets::DecoderGroupBox(
+ QString::fromUtf8(decoder->name), nullptr, decoder_deletable);
+ group->set_decoder_visible(dec->shown());
+
+ if (decoder_deletable) {
+ delete_mapper_.setMapping(group, index);
+ connect(group, SIGNAL(delete_decoder()), &delete_mapper_, SLOT(map()));
+ }
- _delete_mapper.setMapping(group, index);
- connect(group, SIGNAL(delete_decoder()), &_delete_mapper, SLOT(map()));
+ show_hide_mapper_.setMapping(group, index);
+ connect(group, SIGNAL(show_hide_decoder()),
+ &show_hide_mapper_, SLOT(map()));
QFormLayout *const decoder_form = new QFormLayout;
group->add_layout(decoder_form);
- // Add the mandatory probes
- for(probe = decoder->probes; probe; probe = probe->next) {
- const struct srd_probe *const p =
- (struct srd_probe *)probe->data;
- QComboBox *const combo = create_probe_selector(parent, dec, p);
+ // Add the mandatory channels
+ for (l = decoder->channels; l; l = l->next) {
+ const struct srd_channel *const pdch =
+ (struct srd_channel *)l->data;
+ QComboBox *const combo = create_channel_selector(parent, dec, pdch);
connect(combo, SIGNAL(currentIndexChanged(int)),
- this, SLOT(on_probe_selected(int)));
+ this, SLOT(on_channel_selected(int)));
decoder_form->addRow(tr("%1 (%2) *")
- .arg(p->name).arg(p->desc), combo);
+ .arg(QString::fromUtf8(pdch->name),
+ QString::fromUtf8(pdch->desc)), combo);
- const ProbeSelector s = {combo, dec, p};
- _probe_selectors.push_back(s);
+ const ChannelSelector s = {combo, dec, pdch};
+ channel_selectors_.push_back(s);
}
- // Add the optional probes
- for(probe = decoder->opt_probes; probe; probe = probe->next) {
- const struct srd_probe *const p =
- (struct srd_probe *)probe->data;
- QComboBox *const combo = create_probe_selector(parent, dec, p);
+ // Add the optional channels
+ for (l = decoder->opt_channels; l; l = l->next) {
+ const struct srd_channel *const pdch =
+ (struct srd_channel *)l->data;
+ QComboBox *const combo = create_channel_selector(parent, dec, pdch);
connect(combo, SIGNAL(currentIndexChanged(int)),
- this, SLOT(on_probe_selected(int)));
+ this, SLOT(on_channel_selected(int)));
decoder_form->addRow(tr("%1 (%2)")
- .arg(p->name).arg(p->desc), combo);
+ .arg(QString::fromUtf8(pdch->name),
+ QString::fromUtf8(pdch->desc)), combo);
- const ProbeSelector s = {combo, dec, p};
- _probe_selectors.push_back(s);
+ const ChannelSelector s = {combo, dec, pdch};
+ channel_selectors_.push_back(s);
}
+ std::shared_ptr decoder_stack =
+ base_->decoder_stack();
+
// Add the options
- shared_ptr binding(
- new prop::binding::DecoderOptions(_decoder_stack, dec));
+ shared_ptr binding(
+ new binding::Decoder(decoder_stack, dec));
binding->add_properties_to_form(decoder_form, true);
- _bindings.push_back(binding);
+ bindings_.push_back(binding);
form->addRow(group);
+ decoder_forms_.push_back(group);
}
-QComboBox* DecodeTrace::create_probe_selector(
+QComboBox* DecodeTrace::create_channel_selector(
QWidget *parent, const shared_ptr &dec,
- const srd_probe *const probe)
+ const srd_channel *const pdch)
{
assert(dec);
- const vector< shared_ptr > sigs = _session.get_signals();
+ const auto sigs(session_.signalbases());
+
+ vector< shared_ptr > sig_list(sigs.begin(), sigs.end());
+ std::sort(sig_list.begin(), sig_list.end(),
+ [](const shared_ptr &a,
+ const shared_ptr &b) {
+ return strnatcasecmp(a->name().toStdString(),
+ b->name().toStdString()) < 0; });
- assert(_decoder_stack);
- const map >::const_iterator probe_iter =
- dec->probes().find(probe);
+ const auto channel_iter = dec->channels().find(pdch);
QComboBox *selector = new QComboBox(parent);
- selector->addItem("-", qVariantFromValue((void*)NULL));
+ selector->addItem("-", qVariantFromValue((void*)nullptr));
- if (probe_iter == dec->probes().end())
+ if (channel_iter == dec->channels().end())
selector->setCurrentIndex(0);
- for(size_t i = 0; i < sigs.size(); i++) {
- const shared_ptr s(sigs[i]);
- assert(s);
+ for (const shared_ptr &b : sig_list) {
+ assert(b);
+ if (b->type() == sigrok::ChannelType::LOGIC && b->enabled()) {
+ selector->addItem(b->name(),
+ qVariantFromValue((void*)b.get()));
- if (dynamic_pointer_cast(s) && s->enabled())
- {
- selector->addItem(s->get_name(),
- qVariantFromValue((void*)s.get()));
- if ((*probe_iter).second == s)
- selector->setCurrentIndex(i + 1);
+ if (channel_iter != dec->channels().end() &&
+ (*channel_iter).second == b)
+ selector->setCurrentIndex(
+ selector->count() - 1);
}
}
return selector;
}
-void DecodeTrace::commit_decoder_probes(shared_ptr &dec)
+void DecodeTrace::commit_decoder_channels(shared_ptr &dec)
{
assert(dec);
- map > probe_map;
- const vector< shared_ptr > sigs = _session.get_signals();
+ map > channel_map;
- BOOST_FOREACH(const ProbeSelector &s, _probe_selectors)
- {
- if(s._decoder != dec)
+ const unordered_set< shared_ptr >
+ sigs(session_.signalbases());
+
+ for (const ChannelSelector &s : channel_selectors_) {
+ if (s.decoder_ != dec)
break;
- const LogicSignal *const selection =
- (LogicSignal*)s._combo->itemData(
- s._combo->currentIndex()).value();
+ const data::SignalBase *const selection =
+ (data::SignalBase*)s.combo_->itemData(
+ s.combo_->currentIndex()).value();
- BOOST_FOREACH(shared_ptr sig, sigs)
- if(sig.get() == selection) {
- probe_map[s._probe] =
- dynamic_pointer_cast(sig);
+ for (shared_ptr sig : sigs)
+ if (sig.get() == selection) {
+ channel_map[s.pdch_] = sig;
break;
}
}
- dec->set_probes(probe_map);
+ dec->set_channels(channel_map);
}
-void DecodeTrace::commit_probes()
+void DecodeTrace::commit_channels()
{
- assert(_decoder_stack);
- BOOST_FOREACH(shared_ptr dec,
- _decoder_stack->stack())
- commit_decoder_probes(dec);
+ std::shared_ptr decoder_stack =
+ base_->decoder_stack();
+
+ assert(decoder_stack);
+ for (shared_ptr dec : decoder_stack->stack())
+ commit_decoder_channels(dec);
- _decoder_stack->begin_decode();
+ decoder_stack->begin_decode();
}
void DecodeTrace::on_new_decode_data()
{
- if (_view)
- _view->update_viewport();
+ if (owner_)
+ owner_->row_item_appearance_changed(false, true);
}
void DecodeTrace::delete_pressed()
@@ -426,34 +947,67 @@ void DecodeTrace::delete_pressed()
void DecodeTrace::on_delete()
{
- _session.remove_decode_signal(this);
+ session_.remove_decode_signal(base_);
}
-void DecodeTrace::on_probe_selected(int)
+void DecodeTrace::on_channel_selected(int)
{
- commit_probes();
+ commit_channels();
}
void DecodeTrace::on_stack_decoder(srd_decoder *decoder)
{
+ std::shared_ptr decoder_stack =
+ base_->decoder_stack();
+
assert(decoder);
- assert(_decoder_stack);
- _decoder_stack->push(shared_ptr(
- new data::decode::Decoder(decoder)));
- _decoder_stack->begin_decode();
+ assert(decoder_stack);
+ decoder_stack->push(make_shared(decoder));
+ decoder_stack->begin_decode();
create_popup_form();
}
void DecodeTrace::on_delete_decoder(int index)
{
- _decoder_stack->remove(index);
+ std::shared_ptr decoder_stack =
+ base_->decoder_stack();
+
+ decoder_stack->remove(index);
// Update the popup
create_popup_form();
- _decoder_stack->begin_decode();
+ decoder_stack->begin_decode();
+}
+
+void DecodeTrace::on_show_hide_decoder(int index)
+{
+ using pv::data::decode::Decoder;
+
+ std::shared_ptr decoder_stack =
+ base_->decoder_stack();
+
+ const list< shared_ptr > stack(decoder_stack->stack());
+
+ // Find the decoder in the stack
+ auto iter = stack.cbegin();
+ for (int i = 0; i < index; i++, iter++)
+ assert(iter != stack.end());
+
+ shared_ptr dec = *iter;
+ assert(dec);
+
+ const bool show = !dec->shown();
+ dec->show(show);
+
+ assert(index < (int)decoder_forms_.size());
+ decoder_forms_[index]->set_decoder_visible(show);
+
+ if (owner_)
+ owner_->row_item_appearance_changed(false, true);
}
-} // namespace view
+} // namespace TraceView
+} // namespace views
} // namespace pv