#include "decodetrace.hpp"
-#include <pv/session.hpp>
-#include <pv/strnatcmp.hpp>
-#include <pv/data/decoderstack.hpp>
+#include <pv/globalsettings.hpp>
+#include <pv/data/decode/annotation.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/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>
-
using std::all_of;
using std::list;
using std::make_pair;
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());
}
-void DecodeTrace::paint_mid(QPainter &p, const ViewItemPaintParams &pp)
+void DecodeTrace::paint_mid(QPainter &p, ViewItemPaintParams &pp)
{
using namespace pv::data::decode;
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;
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);
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]);
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(
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.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,
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)
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);
QFormLayout *form)
{
const GSList *l;
+ GlobalSettings settings;
assert(dec);
const srd_decoder *const decoder = dec->decoder();
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) {
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);
+ QComboBox *const combo_initial_pin = create_channel_selector_initial_pin(parent, dec, pdch);
+
connect(combo, SIGNAL(currentIndexChanged(int)),
this, SLOT(on_channel_selected(int)));
+ connect(combo_initial_pin, SIGNAL(currentIndexChanged(int)),
+ this, SLOT(on_initial_pin_selected(int)));
+
+ QHBoxLayout *const hlayout = new QHBoxLayout;
+ hlayout->addWidget(combo);
+ hlayout->addWidget(combo_initial_pin);
+
+ if (!settings.value(GlobalSettings::Key_Dec_InitialStateConfigurable).toBool())
+ combo_initial_pin->hide();
+
decoder_form->addRow(tr("<b>%1</b> (%2) *")
.arg(QString::fromUtf8(pdch->name),
- QString::fromUtf8(pdch->desc)), combo);
+ QString::fromUtf8(pdch->desc)), hlayout);
- const ChannelSelector s = {combo, dec, pdch};
+ const ChannelSelector s = {combo, combo_initial_pin, dec, pdch};
channel_selectors_.push_back(s);
}
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);
+ QComboBox *const combo_initial_pin = create_channel_selector_initial_pin(parent, dec, pdch);
+
connect(combo, SIGNAL(currentIndexChanged(int)),
this, SLOT(on_channel_selected(int)));
+ connect(combo_initial_pin, SIGNAL(currentIndexChanged(int)),
+ this, SLOT(on_initial_pin_selected(int)));
+
+ QHBoxLayout *const hlayout = new QHBoxLayout;
+ hlayout->addWidget(combo);
+ hlayout->addWidget(combo_initial_pin);
+
+ if (!settings.value(GlobalSettings::Key_Dec_InitialStateConfigurable).toBool())
+ combo_initial_pin->hide();
+
decoder_form->addRow(tr("<b>%1</b> (%2)")
.arg(QString::fromUtf8(pdch->name),
- QString::fromUtf8(pdch->desc)), combo);
+ QString::fromUtf8(pdch->desc)), hlayout);
- const ChannelSelector s = {combo, dec, pdch};
+ const ChannelSelector s = {combo, combo_initial_pin, dec, pdch};
channel_selectors_.push_back(s);
}
return selector;
}
+QComboBox* DecodeTrace::create_channel_selector_initial_pin(QWidget *parent,
+ const shared_ptr<data::decode::Decoder> &dec, const srd_channel *const pdch)
+{
+ QComboBox *selector = new QComboBox(parent);
+
+ selector->addItem("0", qVariantFromValue((int)SRD_INITIAL_PIN_LOW));
+ selector->addItem("1", qVariantFromValue((int)SRD_INITIAL_PIN_HIGH));
+ selector->addItem("X", qVariantFromValue((int)SRD_INITIAL_PIN_SAME_AS_SAMPLE0));
+
+ // Default to index 2 (SRD_INITIAL_PIN_SAME_AS_SAMPLE0).
+ const int idx = (!dec->initial_pins()) ? 2 : dec->initial_pins()->data[pdch->order];
+ selector->setCurrentIndex(idx);
+
+ selector->setToolTip("Initial (assumed) pin value before the first sample");
+
+ return selector;
+}
+
void DecodeTrace::commit_decoder_channels(shared_ptr<data::decode::Decoder> &dec)
{
assert(dec);
const unordered_set< shared_ptr<data::SignalBase> >
sigs(session_.signalbases());
+ GArray *const initial_pins = g_array_sized_new(FALSE, TRUE,
+ sizeof(uint8_t), channel_selectors_.size());
+ g_array_set_size(initial_pins, channel_selectors_.size());
+
for (const ChannelSelector &s : channel_selectors_) {
if (s.decoder_ != dec)
break;
channel_map[s.pdch_] = sig;
break;
}
+
+ int selection_initial_pin = s.combo_initial_pin_->itemData(
+ s.combo_initial_pin_->currentIndex()).value<int>();
+
+ initial_pins->data[s.pdch_->order] = selection_initial_pin;
}
dec->set_channels(channel_map);
+ dec->set_initial_pins(initial_pins);
}
void DecodeTrace::commit_channels()
commit_channels();
}
+void DecodeTrace::on_initial_pin_selected(int)
+{
+ commit_channels();
+}
+
void DecodeTrace::on_stack_decoder(srd_decoder *decoder)
{
shared_ptr<pv::data::DecoderStack> decoder_stack = base_->decoder_stack();
decoder_stack->remove(index);
// Update the popup
- create_popup_form();
+ create_popup_form();
decoder_stack->begin_decode();
}
projects / pulseview.git / blobdiff