X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fpopups%2Fchannels.cpp;h=fdb97728f59fe080506c81ecd9acbae0039f3d6d;hp=9775998f0422127b56db25d4172b6bb10545c389;hb=d13d95b3eaee713cc4eabbc0682ca545b4c31800;hpb=870ea3dbf35b182e120c5d84ab89bf9cb7691232 diff --git a/pv/popups/channels.cpp b/pv/popups/channels.cpp index 9775998f..fdb97728 100644 --- a/pv/popups/channels.cpp +++ b/pv/popups/channels.cpp @@ -19,36 +19,32 @@ #include -#ifdef _WIN32 -// Windows: Avoid boost/thread namespace pollution (which includes windows.h). -#define NOGDI -#define NORESOURCE -#endif - +#include #include +#include #include #include #include #include "channels.hpp" +#include #include +#include +#include #include #include -#include -#include - -#include - -using namespace Qt; +using std::make_shared; using std::map; +using std::out_of_range; using std::shared_ptr; -using std::make_shared; using std::unordered_set; using std::vector; using pv::data::SignalBase; +using pv::data::Logic; +using pv::data::LogicSegment; using sigrok::Channel; using sigrok::ChannelGroup; @@ -63,6 +59,10 @@ Channels::Channels(Session &session, QWidget *parent) : updating_channels_(false), enable_all_channels_(tr("Enable All"), this), disable_all_channels_(tr("Disable All"), this), + enable_all_logic_channels_(tr("Enable only logic"), this), + enable_all_analog_channels_(tr("Enable only analog"), this), + enable_all_named_channels_(tr("Enable only named"), this), + enable_all_changing_channels_(tr("Enable only changing"), this), check_box_mapper_(this) { // Create the layout @@ -83,9 +83,8 @@ Channels::Channels(Session &session, QWidget *parent) : // Populate channel groups for (auto entry : device->channel_groups()) { - shared_ptr group = entry.second; - // Make a set of signals, and removed this signals from the - // signal map. + 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()) { const auto iter = signal_map.find(channel); @@ -113,17 +112,21 @@ Channels::Channels(Session &session, QWidget *parent) : populate_group(nullptr, global_sigs); // Create the enable/disable all buttons - connect(&enable_all_channels_, SIGNAL(clicked()), - this, SLOT(enable_all_channels())); - connect(&disable_all_channels_, SIGNAL(clicked()), - this, SLOT(disable_all_channels())); - - enable_all_channels_.setFlat(true); - disable_all_channels_.setFlat(true); - - buttons_bar_.addWidget(&enable_all_channels_); - buttons_bar_.addWidget(&disable_all_channels_); - buttons_bar_.addStretch(1); + connect(&enable_all_channels_, SIGNAL(clicked()), this, SLOT(enable_all_channels())); + connect(&disable_all_channels_, SIGNAL(clicked()), this, SLOT(disable_all_channels())); + connect(&enable_all_logic_channels_, SIGNAL(clicked()), this, SLOT(enable_all_logic_channels())); + connect(&enable_all_analog_channels_, SIGNAL(clicked()), this, SLOT(enable_all_analog_channels())); + connect(&enable_all_named_channels_, SIGNAL(clicked()), this, SLOT(enable_all_named_channels())); + connect(&enable_all_changing_channels_, SIGNAL(clicked()), + this, SLOT(enable_all_changing_channels())); + + buttons_bar_.setRowMinimumHeight(0, 2 * QFontMetrics(QApplication::font()).height()); + buttons_bar_.addWidget(&enable_all_channels_, 1, 0); + buttons_bar_.addWidget(&disable_all_channels_, 1, 1); + buttons_bar_.addWidget(&enable_all_logic_channels_, 2, 0); + buttons_bar_.addWidget(&enable_all_analog_channels_, 2, 1); + buttons_bar_.addWidget(&enable_all_named_channels_, 2, 2); + buttons_bar_.addWidget(&enable_all_changing_channels_, 2, 3); layout_.addRow(&buttons_bar_); @@ -136,14 +139,31 @@ void Channels::set_all_channels(bool set) { updating_channels_ = true; - for (map >::const_iterator i = - check_box_signal_map_.begin(); - i != check_box_signal_map_.end(); i++) { - const shared_ptr sig = (*i).second; + for (auto entry : check_box_signal_map_) { + QCheckBox *cb = entry.first; + const shared_ptr sig = entry.second; assert(sig); sig->set_enabled(set); - (*i).first->setChecked(set); + cb->setChecked(set); + } + + updating_channels_ = false; +} + +void Channels::set_all_channels_conditionally( + function)> cond_func) +{ + updating_channels_ = true; + + for (auto entry : check_box_signal_map_) { + QCheckBox *cb = entry.first; + const shared_ptr sig = entry.second; + assert(sig); + + const bool state = cond_func(sig); + sig->set_enabled(state); + cb->setChecked(state); } updating_channels_ = false; @@ -162,10 +182,13 @@ void Channels::populate_group(shared_ptr group, binding = make_shared(group); // Create a title if the group is going to have any content - if ((!sigs.empty() || (binding && !binding->properties().empty())) && - group) - layout_.addRow(new QLabel( - QString("

%1

").arg(group->name().c_str()))); + if ((!sigs.empty() || (binding && !binding->properties().empty())) && group) + { + QLabel *label = new QLabel( + QString("

%1

").arg(group->name().c_str())); + layout_.addRow(label); + group_label_map_[group] = label; + } // Create the channel group grid QGridLayout *const channel_grid = create_channel_group_grid(sigs); @@ -187,7 +210,7 @@ QGridLayout* Channels::create_channel_group_grid( for (const shared_ptr& sig : sigs) { assert(sig); - QCheckBox *const checkbox = new QCheckBox(sig->name()); + QCheckBox *const checkbox = new QCheckBox(sig->display_name()); check_box_mapper_.setMapping(checkbox, checkbox); connect(checkbox, SIGNAL(toggled(bool)), &check_box_mapper_, SLOT(map())); @@ -207,15 +230,31 @@ void Channels::showEvent(QShowEvent *event) { pv::widgets::Popup::showEvent(event); + const shared_ptr device = session_.device()->device(); + assert(device); + + // Update group labels + for (auto entry : device->channel_groups()) { + const shared_ptr group = entry.second; + + try { + QLabel* label = group_label_map_.at(group); + label->setText(QString("

%1

").arg(group->name().c_str())); + } catch (out_of_range&) { + // Do nothing + } + } + updating_channels_ = true; - for (map >::const_iterator i = - check_box_signal_map_.begin(); - i != check_box_signal_map_.end(); i++) { - const shared_ptr sig = (*i).second; + for (auto entry : check_box_signal_map_) { + QCheckBox *cb = entry.first; + const shared_ptr sig = entry.second; assert(sig); - (*i).first->setChecked(sig->enabled()); + // Update the check box + cb->setChecked(sig->enabled()); + cb->setText(sig->display_name()); } updating_channels_ = false; @@ -250,5 +289,56 @@ void Channels::disable_all_channels() set_all_channels(false); } +void Channels::enable_all_logic_channels() +{ + set_all_channels_conditionally([](const shared_ptr signal) + { return signal->type() == SignalBase::LogicChannel; }); +} + +void Channels::enable_all_analog_channels() +{ + set_all_channels_conditionally([](const shared_ptr signal) + { return signal->type() == SignalBase::AnalogChannel; }); +} + +void Channels::enable_all_named_channels() +{ + set_all_channels_conditionally([](const shared_ptr signal) + { return signal->name() != signal->internal_name(); }); +} + +void Channels::enable_all_changing_channels() +{ + set_all_channels_conditionally([](const shared_ptr signal) + { + // Never enable channels without sample data + if (!signal->has_samples()) + return false; + + // Non-logic channels are considered to always have a signal + if (signal->type() != SignalBase::LogicChannel) + return true; + + const shared_ptr logic = signal->logic_data(); + assert(logic); + + // If any of the segments has edges, enable this channel + for (shared_ptr segment : logic->logic_segments()) { + vector edges; + + segment->get_subsampled_edges(edges, + 0, segment->get_sample_count() - 1, + LogicSegment::MipMapScaleFactor, + signal->index()); + + if (edges.size() > 2) + return true; + } + + // No edges detected in any of the segments + return false; + }); +} + } // namespace popups } // namespace pv