X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fpopups%2Fchannels.cpp;h=49784bd7ae40630f3f5b3ccc4e125a9f228053e4;hb=HEAD;hp=8aca2921566ffef531cf29739dc8f3914813d2e4;hpb=8d49811c6da39b75e3f421fb5f507f45f3543a9a;p=pulseview.git diff --git a/pv/popups/channels.cpp b/pv/popups/channels.cpp index 8aca2921..ce2e8e98 100644 --- a/pv/popups/channels.cpp +++ b/pv/popups/channels.cpp @@ -42,6 +42,7 @@ using std::out_of_range; using std::shared_ptr; using std::unordered_set; using std::vector; +using std::weak_ptr; using pv::data::SignalBase; using pv::data::Logic; @@ -80,18 +81,18 @@ Channels::Channels(Session &session, QWidget *parent) : map, shared_ptr > signal_map; unordered_set< shared_ptr > sigs; - for (const shared_ptr b : session_.signalbases()) + for (const shared_ptr& b : session_.signalbases()) sigs.insert(b); for (const shared_ptr &sig : sigs) signal_map[sig->channel()] = sig; // Populate channel groups - for (auto entry : device->channel_groups()) { + for (auto& entry : device->channel_groups()) { const shared_ptr group = entry.second; // Make a set of signals and remove these signals from the signal map vector< shared_ptr > group_sigs; - for (auto channel : group->channels()) { + for (auto& channel : group->channels()) { const auto iter = signal_map.find(channel); if (iter == signal_map.end()) @@ -106,7 +107,7 @@ Channels::Channels(Session &session, QWidget *parent) : // Make a vector of the remaining channels vector< shared_ptr > global_analog_sigs, global_logic_sigs; - for (auto channel : device->channels()) { + for (auto& channel : device->channels()) { const map, shared_ptr >:: const_iterator iter = signal_map.find(channel); @@ -157,15 +158,20 @@ Channels::Channels(Session &session, QWidget *parent) : layout_.addRow(&filter_buttons_bar_); // Connect the check-box signal mapper +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) + connect(&check_box_mapper_, SIGNAL(mappedObject(QObject*)), + this, SLOT(on_channel_checked(QObject*))); +#else connect(&check_box_mapper_, SIGNAL(mapped(QWidget*)), this, SLOT(on_channel_checked(QWidget*))); +#endif } void Channels::set_all_channels(bool set) { updating_channels_ = true; - for (auto entry : check_box_signal_map_) { + for (auto& entry : check_box_signal_map_) { QCheckBox *cb = entry.first; const shared_ptr sig = entry.second; assert(sig); @@ -182,7 +188,7 @@ void Channels::enable_channels_conditionally( { updating_channels_ = true; - for (auto entry : check_box_signal_map_) { + for (auto& entry : check_box_signal_map_) { QCheckBox *cb = entry.first; const shared_ptr sig = entry.second; assert(sig); @@ -201,7 +207,7 @@ void Channels::disable_channels_conditionally( { updating_channels_ = true; - for (auto entry : check_box_signal_map_) { + for (auto& entry : check_box_signal_map_) { QCheckBox *cb = entry.first; const shared_ptr sig = entry.second; assert(sig); @@ -227,49 +233,98 @@ void Channels::populate_group(shared_ptr group, if (group) binding = make_shared(group); + QHBoxLayout* group_layout = new QHBoxLayout(); + layout_.addRow(group_layout); + // Create a title if the group is going to have any content if ((!sigs.empty() || (binding && !binding->properties().empty())) && group) { QLabel *label = new QLabel( QString("

%1

").arg(group->name().c_str())); - layout_.addRow(label); + group_layout->addWidget(label); group_label_map_[group] = label; } // Create the channel group grid - QGridLayout *const channel_grid = create_channel_group_grid(sigs); - layout_.addRow(channel_grid); - - // Create the channel group options - if (binding) { - binding->add_properties_to_form(&layout_, true); - group_bindings_.push_back(binding); - } -} - -QGridLayout* Channels::create_channel_group_grid( - const vector< shared_ptr > sigs) -{ int row = 0, col = 0; QGridLayout *const grid = new QGridLayout(); + vector group_checkboxes, this_row; for (const shared_ptr& sig : sigs) { assert(sig); QCheckBox *const checkbox = new QCheckBox(sig->display_name()); check_box_mapper_.setMapping(checkbox, checkbox); - connect(checkbox, SIGNAL(toggled(bool)), - &check_box_mapper_, SLOT(map())); + connect(checkbox, SIGNAL(toggled(bool)), &check_box_mapper_, SLOT(map())); grid->addWidget(checkbox, row, col); + group_checkboxes.push_back(checkbox); + this_row.push_back(checkbox); + check_box_signal_map_[checkbox] = sig; - if (++col >= 8) + weak_ptr weak_sig(sig); + connect(checkbox, &QCheckBox::toggled, + [weak_sig](bool state) { + auto sig = weak_sig.lock(); + assert(sig); + sig->set_enabled(state); + }); + + if ((++col >= 8 || &sig == &sigs.back())) { + // Show buttons if there's more than one row + if (sigs.size() > 8) { + QPushButton *row_enable_button = new QPushButton(tr("All"), this); + grid->addWidget(row_enable_button, row, 8); + connect(row_enable_button, &QPushButton::clicked, row_enable_button, + [this_row]() { + for (QCheckBox *box : this_row) + box->setChecked(true); + }); + + QPushButton *row_disable_button = new QPushButton(tr("None"), this); + connect(row_disable_button, &QPushButton::clicked, row_disable_button, + [this_row]() { + for (QCheckBox *box : this_row) + box->setChecked(false); + }); + grid->addWidget(row_disable_button, row, 9); + } + + this_row.clear(); col = 0, row++; + } + } + layout_.addRow(grid); + + if (sigs.size() > 1) { + // Create enable all/none buttons + QPushButton *btn_enable_all, *btn_disable_all; + + btn_enable_all = new QPushButton(tr("All")); + btn_disable_all = new QPushButton(tr("None")); + group_layout->addWidget(btn_enable_all); + group_layout->addWidget(btn_disable_all); + + connect(btn_enable_all, &QPushButton::clicked, btn_enable_all, + [group_checkboxes](){ + for (QCheckBox *box: group_checkboxes) + box->setChecked(true); + }); + + connect(btn_disable_all, &QPushButton::clicked, btn_disable_all, + [group_checkboxes](){ + for (QCheckBox *box: group_checkboxes) + box->setChecked(false); + }); } - return grid; + // Create the channel group options + if (binding) { + binding->add_properties_to_form(&layout_, true); + group_bindings_.push_back(binding); + } } void Channels::showEvent(QShowEvent *event) @@ -280,20 +335,18 @@ void Channels::showEvent(QShowEvent *event) assert(device); // Update group labels - for (auto entry : device->channel_groups()) { + for (auto& entry : device->channel_groups()) { const shared_ptr group = entry.second; - try { - QLabel* label = group_label_map_.at(group); + if (group_label_map_.count(group) > 0) { + QLabel* label = group_label_map_[group]; label->setText(QString("

%1

").arg(group->name().c_str())); - } catch (out_of_range&) { - // Do nothing } } updating_channels_ = true; - for (auto entry : check_box_signal_map_) { + for (auto& entry : check_box_signal_map_) { QCheckBox *cb = entry.first; const shared_ptr sig = entry.second; assert(sig); @@ -306,7 +359,11 @@ void Channels::showEvent(QShowEvent *event) updating_channels_ = false; } +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) +void Channels::on_channel_checked(QObject *widget) +#else void Channels::on_channel_checked(QWidget *widget) +#endif { if (updating_channels_) return;