Embedded/DSView
1
0
Fork 0
mirror of https://github.com/DreamSourceLab/DSView.git synced 2025-01-23 13:42:55 +08:00
Code Issues Projects Releases Wiki Activity

fix: Because the operator function of Row class is error, so DSView run crash

Browse Source
This commit is contained in:
dreamsourcelabTAI 2023-07-03 10:45:41 +08:00
parent 232ba405e9
commit c7b7c1bdff
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
DSView/pv/data/decode/row.cpp
View File

@ -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

2
DSView/pv/data/decode/row.h
View File

@ -45,7 +45,7 @@ public:
Row(const Row &o);
bool operator=(const Row &o);
Row& operator=(const Row &o);
public:

4
DSView/pv/dialogs/protocolexp.cpp
View File

@ -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<QRadioButton *>::const_iterator i = _row_sel_list.begin();
for (std::list<QCheckBox *>::const_iterator i = _row_sel_list.begin();
i != _row_sel_list.end(); i++)
{
if ((*i)->isChecked())

4
DSView/pv/dialogs/protocolexp.h
View File

@ -27,7 +27,7 @@
#include <QFormLayout>
#include <QVBoxLayout>
#include <QLabel>
#include <QRadioButton>
#include <QCheckBox>
#include <QString>
#include "../prop/binding/deviceoptions.h"
@ -70,7 +70,7 @@ private:
toolbars::TitleBar *_titlebar;
DsComboBox *_format_combobox;
std::list<QRadioButton *> _row_sel_list;
std::list<QCheckBox *> _row_sel_list;
std::list<QLabel *> _row_label_list;
QFormLayout *_flayout;
QVBoxLayout *_layout;