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 2277f987c23e4b0250ec715b1882949d4f4a43fd..926d015b6a6f953448339a7d0f7d6556d7083518 100644
(file)
--- a/
pv/dialogs/decoder.h
+++ b/
pv/dialogs/decoder.h
@@
-40,7
+40,7
@@
struct srd_decoder;
namespace pv {
namespace view {
namespace pv {
namespace view {
-class Signal;
+class
Logic
Signal;
}
namespace dialogs {
}
namespace dialogs {
@@
-49,12
+49,12
@@
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::
Logic
Signal> > &sigs,
GHashTable *options);
void accept();
GHashTable *options);
void accept();
- std::map<const srd_probe*, boost::shared_ptr<view::Signal> >
+ std::map<const srd_probe*, boost::shared_ptr<view::
Logic
Signal> >
get_probes();
private:
get_probes();
private:
@@
-62,12
+62,10
@@
private:
QWidget *parent, const char *name);
private:
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;
- GHashTable *const _options;
pv::prop::binding::DecoderOptions _binding;
QVBoxLayout _layout;
pv::prop::binding::DecoderOptions _binding;
QVBoxLayout _layout;