projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
MainWindow: Don't try to close a session when there is none
[pulseview.git]
/
pv
/
view
/
decodetrace.hpp
diff --git
a/pv/view/decodetrace.hpp
b/pv/view/decodetrace.hpp
index 3103a3c02ce4910556a68c1d28c96b976d797b47..619c7327b7ba838663340e270f5e61dbb7012234 100644
(file)
--- a/
pv/view/decodetrace.hpp
+++ b/
pv/view/decodetrace.hpp
@@
-30,8
+30,8
@@
#include <QSignalMapper>
#include <pv/binding/decoder.hpp>
#include <QSignalMapper>
#include <pv/binding/decoder.hpp>
-#include <pv/data/signalbase.hpp>
#include <pv/data/decode/row.hpp>
#include <pv/data/decode/row.hpp>
+#include <pv/data/signalbase.hpp>
using std::list;
using std::map;
using std::list;
using std::map;
@@
-74,6
+74,7
@@
private:
struct ChannelSelector
{
const QComboBox *combo_;
struct ChannelSelector
{
const QComboBox *combo_;
+ const QComboBox *combo_initial_pin_;
const shared_ptr<pv::data::decode::Decoder> decoder_;
const srd_channel *pdch_;
};
const shared_ptr<pv::data::decode::Decoder> decoder_;
const srd_channel *pdch_;
};
@@
-112,21
+113,21
@@
public:
* @param p the QPainter to paint into.
* @param pp the painting parameters object to paint with..
*/
* @param p the QPainter to paint into.
* @param pp the painting parameters object to paint with..
*/
- void paint_back(QPainter &p,
const
ViewItemPaintParams &pp);
+ void paint_back(QPainter &p, ViewItemPaintParams &pp);
/**
* Paints the mid-layer of the trace with a QPainter
* @param p the QPainter to paint into.
* @param pp the painting parameters object to paint with.
*/
/**
* Paints the mid-layer of the trace with a QPainter
* @param p the QPainter to paint into.
* @param pp the painting parameters object to paint with.
*/
- void paint_mid(QPainter &p,
const
ViewItemPaintParams &pp);
+ void paint_mid(QPainter &p, ViewItemPaintParams &pp);
/**
* Paints the foreground layer of the trace with a QPainter
* @param p the QPainter to paint into.
* @param pp the painting parameters object to paint with.
*/
/**
* Paints the foreground layer of the trace with a QPainter
* @param p the QPainter to paint into.
* @param pp the painting parameters object to paint with.
*/
- void paint_fore(QPainter &p,
const
ViewItemPaintParams &pp);
+ void paint_fore(QPainter &p, ViewItemPaintParams &pp);
void populate_popup_form(QWidget *parent, QFormLayout *form);
void populate_popup_form(QWidget *parent, QFormLayout *form);
@@
-182,8
+183,11
@@
private:
const shared_ptr<pv::data::decode::Decoder> &dec,
const srd_channel *const pdch);
const shared_ptr<pv::data::decode::Decoder> &dec,
const srd_channel *const pdch);
- void commit_decoder_channels(
- shared_ptr<data::decode::Decoder> &dec);
+ QComboBox* create_channel_selector_initial_pin(QWidget *parent,
+ const shared_ptr<pv::data::decode::Decoder> &dec,
+ const srd_channel *const pdch);
+
+ void commit_decoder_channels(shared_ptr<data::decode::Decoder> &dec);
void commit_channels();
void commit_channels();
@@
-197,6
+201,8
@@
private Q_SLOTS:
void on_channel_selected(int);
void on_channel_selected(int);
+ void on_initial_pin_selected(int);
+
void on_stack_decoder(srd_decoder *decoder);
void on_delete_decoder(int index);
void on_stack_decoder(srd_decoder *decoder);
void on_delete_decoder(int index);