projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Modified Decode to only use LogicSignals
[pulseview.git]
/
pv
/
dialogs
/
decoder.h
diff --git
a/pv/dialogs/decoder.h
b/pv/dialogs/decoder.h
index 150d02c5cf8d4305fbd15e217cbb9cd17cbe480c..926d015b6a6f953448339a7d0f7d6556d7083518 100644
(file)
--- a/
pv/dialogs/decoder.h
+++ b/
pv/dialogs/decoder.h
@@
-33,12
+33,14
@@
#include <QLabel>
#include <QVBoxLayout>
#include <QLabel>
#include <QVBoxLayout>
+#include <pv/prop/binding/decoderoptions.h>
+
struct srd_decoder;
namespace pv {
namespace view {
struct srd_decoder;
namespace pv {
namespace view {
-class Signal;
+class
Logic
Signal;
}
namespace dialogs {
}
namespace dialogs {
@@
-47,18
+49,25
@@
class Decoder : public QDialog
{
public:
Decoder(QWidget *parent, const srd_decoder *decoder,
{
public:
Decoder(QWidget *parent, const srd_decoder *decoder,
- const std::vector< boost::shared_ptr<view::Signal> > &sigs);
+ const std::vector< boost::shared_ptr<view::LogicSignal> > &sigs,
+ GHashTable *options);
+
+ void accept();
+
+ std::map<const srd_probe*, boost::shared_ptr<view::LogicSignal> >
+ get_probes();
private:
QComboBox* create_probe_selector(
QWidget *parent, const char *name);
private:
private:
QComboBox* create_probe_selector(
QWidget *parent, const char *name);
private:
- const srd_decoder *const _decoder;
- const std::vector< boost::shared_ptr<view::Signal> > &_sigs;
+ const std::vector< boost::shared_ptr<view::LogicSignal> > &_sigs;
std::map<const srd_probe*, QComboBox*> _probe_selector_map;
std::map<const srd_probe*, QComboBox*> _probe_selector_map;
+ pv::prop::binding::DecoderOptions _binding;
+
QVBoxLayout _layout;
QWidget _form;
QVBoxLayout _layout;
QWidget _form;