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

The disabled analog channel can't reset when user enabled the default map

Browse Source
This commit is contained in:
dreamsourcelabTAI 2024-04-24 16:50:20 +08:00
parent 2acf419245
commit fbd4f00022
2 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
DSView/pv/dialogs/deviceoptions.cpp
View File

@ -100,7 +100,6 @@ DeviceOptions::DeviceOptions(QWidget *parent) :
_container_lay = NULL; _container_lay = NULL;
_isBuilding = false; _isBuilding = false;
_cur_analog_tag_index = 0; _cur_analog_tag_index = 0;
_have_no_channel = false;
SigSession *session = AppControl::Instance()->GetSession(); SigSession *session = AppControl::Instance()->GetSession();
_device_agent = session->get_device(); _device_agent = session->get_device();
@ -226,12 +225,9 @@ void DeviceOptions::accept()
it++; it++;
} }
_have_no_channel = false;
QDialog::accept(); QDialog::accept();
} }
else { else {
_have_no_channel = true;
QString strMsg(L_S(STR_PAGE_MSG, S_ID(IDS_MSG_ALL_CHANNEL_DISABLE), "All channel disabled! Please enable at least one channel.")); QString strMsg(L_S(STR_PAGE_MSG, S_ID(IDS_MSG_ALL_CHANNEL_DISABLE), "All channel disabled! Please enable at least one channel."));
MsgBox::Show(strMsg); MsgBox::Show(strMsg);
} }
@ -572,6 +568,11 @@ void DeviceOptions::analog_channel_check()
} }
} }
_lst_probe_enabled_status.clear();
for (auto ck : _probes_checkBox_list){
_lst_probe_enabled_status.push_back(ck->isChecked());
}
build_dynamic_panel(); build_dynamic_panel();
try_resize_scroll(); try_resize_scroll();
} }
@ -673,6 +674,8 @@ void DeviceOptions::analog_probes(QGridLayout &layout)
QFont font = this->font(); QFont font = this->font();
font.setPointSizeF(AppConfig::Instance().appOptions.fontSize); font.setPointSizeF(AppConfig::Instance().appOptions.fontSize);
int ch_dex = 0;
for (const GSList *l = _device_agent->get_channels(); l; l = l->next) { for (const GSList *l = _device_agent->get_channels(); l; l = l->next) {
sr_channel *const probe = (sr_channel*)l->data; sr_channel *const probe = (sr_channel*)l->data;
@ -684,11 +687,19 @@ void DeviceOptions::analog_probes(QGridLayout &layout)
QGridLayout *probe_layout = new QGridLayout(probe_widget); QGridLayout *probe_layout = new QGridLayout(probe_widget);
probe_widget->setLayout(probe_layout); probe_widget->setLayout(probe_layout);
bool ch_enabled = probe->enabled;
if (ch_dex < _lst_probe_enabled_status.size()){
ch_enabled = _lst_probe_enabled_status[ch_dex];
}
ch_dex++;
QCheckBox *probe_checkBox = new QCheckBox(this); QCheckBox *probe_checkBox = new QCheckBox(this);
QVariant vlayout = QVariant::fromValue((void *)probe_layout); QVariant vlayout = QVariant::fromValue((void *)probe_layout);
probe_checkBox->setProperty("Layout", vlayout); probe_checkBox->setProperty("Layout", vlayout);
probe_checkBox->setProperty("Enable", true); probe_checkBox->setProperty("Enable", true);
probe_checkBox->setCheckState(probe->enabled ? Qt::Checked : Qt::Unchecked); probe_checkBox->setChecked(ch_enabled);
// probe_checkBox->setCheckState(probe->enabled ? Qt::Checked : Qt::Unchecked);
_probes_checkBox_list.push_back(probe_checkBox); _probes_checkBox_list.push_back(probe_checkBox);
QLabel *en_label = new QLabel(L_S(STR_PAGE_DLG, S_ID(IDS_DLG_ENABLE), "Enable: "), this); QLabel *en_label = new QLabel(L_S(STR_PAGE_DLG, S_ID(IDS_DLG_ENABLE), "Enable: "), this);

7
DSView/pv/dialogs/deviceoptions.h
View File

@ -138,7 +138,6 @@ private:
QWidget *_container_panel; QWidget *_container_panel;
QVBoxLayout *_container_lay; QVBoxLayout *_container_lay;
QWidget *_dynamic_panel; QWidget *_dynamic_panel;
// QWidget *_dynamic_panel;
int _width; int _width;
int _groupHeight1; int _groupHeight1;
int _groupHeight2; int _groupHeight2;
@ -149,9 +148,9 @@ private:
pv::prop::binding::DeviceOptions _device_options_binding; pv::prop::binding::DeviceOptions _device_options_binding;
std::vector<pv::prop::binding::ProbeOptions *> _probe_options_binding_list; std::vector<pv::prop::binding::ProbeOptions *> _probe_options_binding_list;
std::vector<ChannelModePair> _channel_mode_indexs; std::vector<ChannelModePair> _channel_mode_indexs;
std::vector<struct sr_channel*> _dso_channel_list; std::vector<struct sr_channel*> _dso_channel_list;
bool _have_no_channel; std::vector<bool> _lst_probe_enabled_status;
}; };
} // namespace dialogs } // namespace dialogs