* 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" {
#include <tuple>
#include <boost/functional/hash.hpp>
-#include <boost/thread/locks.hpp>
-#include <boost/thread/shared_mutex.hpp>
#include <QAction>
#include <QApplication>
#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 boost::shared_lock;
-using boost::shared_mutex;
-using std::dynamic_pointer_cast;
+using std::all_of;
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::out_of_range;
using std::pair;
using std::shared_ptr;
+using std::make_shared;
using std::tie;
using std::unordered_set;
using std::vector;
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());
return true;
}
-std::shared_ptr<data::SignalBase> DecodeTrace::base() const
+shared_ptr<data::SignalBase> DecodeTrace::base() const
{
return base_;
}
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;
- 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;
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;
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 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);
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(
// 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; });
+ 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,
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);
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);
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);
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);
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],
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);
}
- 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(
const auto sigs(session_.signalbases());
vector< shared_ptr<data::SignalBase> > sig_list(sigs.begin(), sigs.end());
- std::sort(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(),
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()));
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()
{
- 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())
commit_channels();
}
+void DecodeTrace::on_initial_pin_selected(int)
+{
+ commit_channels();
+}
+
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);
- decoder_stack->push(shared_ptr<data::decode::Decoder>(
- new data::decode::Decoder(decoder)));
+ decoder_stack->push(make_shared<data::decode::Decoder>(decoder));
decoder_stack->begin_decode();
create_popup_form();
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
- create_popup_form();
+ create_popup_form();
decoder_stack->begin_decode();
}
{
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());
projects / pulseview.git / blobdiff