X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fpopups%2Fchannels.cpp;h=ce023a8ffdd622d908731cd41c724d4ac3634d91;hp=f8f94d1a4273534d09fbf9a2bb6766db518810c7;hb=9fa8a63c91ab09db32d744f854690411af164a62;hpb=73a25a6e488f1813c1cd12da085a16e4f91ed4da diff --git a/pv/popups/channels.cpp b/pv/popups/channels.cpp index f8f94d1a..ce023a8f 100644 --- a/pv/popups/channels.cpp +++ b/pv/popups/channels.cpp @@ -14,48 +14,38 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * along with this program; if not, see . */ #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 +#include #include #include "channels.hpp" +#include #include +#include +#include #include #include -#include -#include -#include - -using namespace Qt; - -using boost::shared_lock; -using boost::shared_mutex; -using std::lock_guard; +using std::make_shared; using std::map; -using std::mutex; -using std::set; +using std::out_of_range; using std::shared_ptr; 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; @@ -68,8 +58,12 @@ Channels::Channels(Session &session, QWidget *parent) : Popup(parent), session_(session), updating_channels_(false), - enable_all_channels_(tr("Enable All"), this), - disable_all_channels_(tr("Disable All"), this), + enable_all_channels_(tr("All"), this), + disable_all_channels_(tr("All"), this), + enable_all_logic_channels_(tr("Logic"), this), + enable_all_analog_channels_(tr("Analog"), this), + enable_all_named_channels_(tr("Named"), this), + enable_all_changing_channels_(tr("Changing"), this), check_box_mapper_(this) { // Create the layout @@ -82,17 +76,16 @@ Channels::Channels(Session &session, QWidget *parent) : map, shared_ptr > signal_map; unordered_set< shared_ptr > sigs; - for (const shared_ptr s : session_.signals()) - sigs.insert(s->base()); + 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()) { - 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); @@ -108,29 +101,44 @@ Channels::Channels(Session &session, QWidget *parent) : } // Make a vector of the remaining channels - vector< shared_ptr > global_sigs; + vector< shared_ptr > global_analog_sigs, global_logic_sigs; for (auto channel : device->channels()) { const map, shared_ptr >:: const_iterator iter = signal_map.find(channel); - if (iter != signal_map.end()) - global_sigs.push_back((*iter).second); + + if (iter != signal_map.end()) { + const shared_ptr signal = (*iter).second; + if (signal->type() == SignalBase::AnalogChannel) + global_analog_sigs.push_back(signal); + else + global_logic_sigs.push_back(signal); + } } - // Create a group - populate_group(nullptr, global_sigs); + // Create the groups for the ungrouped channels + populate_group(nullptr, global_logic_sigs); + populate_group(nullptr, global_analog_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_); + 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())); + + QLabel *label1 = new QLabel(tr("Disable: ")); + buttons_bar_.addWidget(label1); buttons_bar_.addWidget(&disable_all_channels_); - buttons_bar_.addStretch(1); + QLabel *label2 = new QLabel(tr("Enable: ")); + buttons_bar_.addWidget(label2); + buttons_bar_.addWidget(&enable_all_channels_); + buttons_bar_.addWidget(&enable_all_logic_channels_); + buttons_bar_.addWidget(&enable_all_analog_channels_); + buttons_bar_.addWidget(&enable_all_named_channels_); + buttons_bar_.addWidget(&enable_all_changing_channels_); + buttons_bar_.addStretch(); layout_.addRow(&buttons_bar_); @@ -143,14 +151,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; @@ -166,22 +191,23 @@ void Channels::populate_group(shared_ptr group, // popup. shared_ptr binding; if (group) - binding = shared_ptr(new Device(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); + QGridLayout *const channel_grid = create_channel_group_grid(sigs); layout_.addRow(channel_grid); // Create the channel group options - if (binding) - { + if (binding) { binding->add_properties_to_form(&layout_, true); group_bindings_.push_back(binding); } @@ -196,7 +222,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())); @@ -216,15 +242,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; @@ -259,5 +301,56 @@ void Channels::disable_all_channels() set_all_channels(false); } -} // popups -} // pv +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