projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Moved decoder config into the popup
[pulseview.git]
/
pv
/
view
/
decodesignal.h
diff --git
a/pv/view/decodesignal.h
b/pv/view/decodesignal.h
index c1b53d5711fc87a9abefe8fcd5bd85db5c8896aa..7977c1c3ab40cd25497a548888d8958bc1b80de5 100644
(file)
--- a/
pv/view/decodesignal.h
+++ b/
pv/view/decodesignal.h
@@
-23,8
+23,16
@@
#include "trace.h"
#include "trace.h"
+#include <map>
+
#include <boost/shared_ptr.hpp>
#include <boost/shared_ptr.hpp>
+#include <pv/prop/binding/decoderoptions.h>
+
+struct srd_probe;
+
+class QComboBox;
+
namespace pv {
namespace data {
namespace pv {
namespace data {
@@
-39,6
+47,7
@@
class DecodeSignal : public Trace
private:
static const QColor DecodeColours[4];
private:
static const QColor DecodeColours[4];
+ static const QColor ErrorBgColour;
public:
DecodeSignal(pv::SigSession &session,
public:
DecodeSignal(pv::SigSession &session,
@@
-66,19
+75,36
@@
public:
**/
void paint_mid(QPainter &p, int left, int right);
**/
void paint_mid(QPainter &p, int left, int right);
+ void populate_popup_form(QWidget *parent, QFormLayout *form);
+
QMenu* create_context_menu(QWidget *parent);
void delete_pressed();
QMenu* create_context_menu(QWidget *parent);
void delete_pressed();
+private:
+ void draw_error(QPainter &p, const QString &message,
+ int left, int right);
+
+ QComboBox* create_probe_selector(
+ QWidget *parent, const srd_probe *const probe);
+
+ void commit_probes();
+
private slots:
void on_new_decode_data();
void on_delete();
private slots:
void on_new_decode_data();
void on_delete();
+ void on_probe_selected(int);
+
private:
boost::shared_ptr<pv::data::Decoder> _decoder;
uint64_t _decode_start, _decode_end;
private:
boost::shared_ptr<pv::data::Decoder> _decoder;
uint64_t _decode_start, _decode_end;
+
+ pv::prop::binding::DecoderOptions _binding;
+
+ std::map<const srd_probe*, QComboBox*> _probe_selector_map;
};
} // namespace view
};
} // namespace view