diff --git a/DSView/pv/data/decode/row.cpp b/DSView/pv/data/decode/row.cpp index 13f24191..b54b402d 100644 --- a/DSView/pv/data/decode/row.cpp +++ b/DSView/pv/data/decode/row.cpp @@ -49,11 +49,12 @@ Row::Row(const Row &o) _order = o._order; } -bool Row::operator=(const Row &o) +Row& Row::operator=(const Row &o) { _decoder = o._decoder; _row = o._row; _order = o._order; + return (*this); } QString Row::title() const diff --git a/DSView/pv/data/decode/row.h b/DSView/pv/data/decode/row.h index ce236908..81c1e5cd 100644 --- a/DSView/pv/data/decode/row.h +++ b/DSView/pv/data/decode/row.h @@ -45,7 +45,7 @@ public: Row(const Row &o); - bool operator=(const Row &o); + Row& operator=(const Row &o); public: diff --git a/DSView/pv/dialogs/protocolexp.cpp b/DSView/pv/dialogs/protocolexp.cpp index 80a9e784..3cbac70b 100644 --- a/DSView/pv/dialogs/protocolexp.cpp +++ b/DSView/pv/dialogs/protocolexp.cpp @@ -77,7 +77,7 @@ ProtocolExp::ProtocolExp(QWidget *parent, SigSession *session) : for (auto i = rows.begin();i != rows.end(); i++) { if ((*i).second) { QLabel *row_label = new QLabel((*i).first.title(), this); - QRadioButton *row_sel = new QRadioButton(this); + QCheckBox *row_sel = new QCheckBox(this); if (row_index == 0) { row_sel->setChecked(true); } @@ -193,7 +193,7 @@ void ProtocolExp::save_proc() QString title; int index = 0; - for (std::list::const_iterator i = _row_sel_list.begin(); + for (std::list::const_iterator i = _row_sel_list.begin(); i != _row_sel_list.end(); i++) { if ((*i)->isChecked()) diff --git a/DSView/pv/dialogs/protocolexp.h b/DSView/pv/dialogs/protocolexp.h index 781c2add..ee53ec31 100644 --- a/DSView/pv/dialogs/protocolexp.h +++ b/DSView/pv/dialogs/protocolexp.h @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include "../prop/binding/deviceoptions.h" @@ -70,7 +70,7 @@ private: toolbars::TitleBar *_titlebar; DsComboBox *_format_combobox; - std::list _row_sel_list; + std::list _row_sel_list; std::list _row_label_list; QFormLayout *_flayout; QVBoxLayout *_layout;