X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fpopups%2Fchannels.cpp;h=8aca2921566ffef531cf29739dc8f3914813d2e4;hp=a24c26517245b31021ab650098a6bb061abf0b51;hb=8d49811c6da39b75e3f421fb5f507f45f3543a9a;hpb=b887c4d87ee9e5fdf4363c1d46e337485ed83539 diff --git a/pv/popups/channels.cpp b/pv/popups/channels.cpp index a24c265..8aca292 100644 --- a/pv/popups/channels.cpp +++ b/pv/popups/channels.cpp @@ -24,6 +24,7 @@ #include #include #include +#include #include #include "channels.hpp" @@ -57,12 +58,16 @@ 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_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), + enable_all_channels_(tr("All"), this), + disable_all_channels_(tr("All"), this), + enable_all_logic_channels_(tr("Logic"), this), + disable_all_logic_channels_(tr("Logic"), this), + enable_all_analog_channels_(tr("Analog"), this), + disable_all_analog_channels_(tr("Analog"), this), + enable_all_named_channels_(tr("Named"), this), + disable_all_unnamed_channels_(tr("Unnamed"), this), + enable_all_changing_channels_(tr("Changing"), this), + disable_all_non_changing_channels_(tr("Non-changing"), this), check_box_mapper_(this) { // Create the layout @@ -100,35 +105,56 @@ 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())); connect(&enable_all_logic_channels_, SIGNAL(clicked()), this, SLOT(enable_all_logic_channels())); + connect(&disable_all_logic_channels_, SIGNAL(clicked()), this, SLOT(disable_all_logic_channels())); connect(&enable_all_analog_channels_, SIGNAL(clicked()), this, SLOT(enable_all_analog_channels())); + connect(&disable_all_analog_channels_, SIGNAL(clicked()), this, SLOT(disable_all_analog_channels())); connect(&enable_all_named_channels_, SIGNAL(clicked()), this, SLOT(enable_all_named_channels())); + connect(&disable_all_unnamed_channels_, SIGNAL(clicked()), this, SLOT(disable_all_unnamed_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_); + connect(&disable_all_non_changing_channels_, SIGNAL(clicked()), + this, SLOT(disable_all_non_changing_channels())); + + QLabel *label1 = new QLabel(tr("Disable: ")); + filter_buttons_bar_.addWidget(label1, 0, 0); + filter_buttons_bar_.addWidget(&disable_all_channels_, 0, 1); + filter_buttons_bar_.addWidget(&disable_all_logic_channels_, 0, 2); + filter_buttons_bar_.addWidget(&disable_all_analog_channels_, 0, 3); + filter_buttons_bar_.addWidget(&disable_all_unnamed_channels_, 0, 4); + filter_buttons_bar_.addWidget(&disable_all_non_changing_channels_, 0, 5); + + QLabel *label2 = new QLabel(tr("Enable: ")); + filter_buttons_bar_.addWidget(label2, 1, 0); + filter_buttons_bar_.addWidget(&enable_all_channels_, 1, 1); + filter_buttons_bar_.addWidget(&enable_all_logic_channels_, 1, 2); + filter_buttons_bar_.addWidget(&enable_all_analog_channels_, 1, 3); + filter_buttons_bar_.addWidget(&enable_all_named_channels_, 1, 4); + filter_buttons_bar_.addWidget(&enable_all_changing_channels_, 1, 5); + + layout_.addItem(new QSpacerItem(0, 15, QSizePolicy::Expanding, QSizePolicy::Expanding)); + layout_.addRow(&filter_buttons_bar_); // Connect the check-box signal mapper connect(&check_box_mapper_, SIGNAL(mapped(QWidget*)), @@ -151,7 +177,7 @@ void Channels::set_all_channels(bool set) updating_channels_ = false; } -void Channels::set_all_channels_conditionally( +void Channels::enable_channels_conditionally( function)> cond_func) { updating_channels_ = true; @@ -161,9 +187,29 @@ void Channels::set_all_channels_conditionally( const shared_ptr sig = entry.second; assert(sig); - const bool state = cond_func(sig); - sig->set_enabled(state); - cb->setChecked(state); + if (cond_func(sig)) { + sig->set_enabled(true); + cb->setChecked(true); + } + } + + updating_channels_ = false; +} + +void Channels::disable_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); + + if (cond_func(sig)) { + sig->set_enabled(false); + cb->setChecked(false); + } } updating_channels_ = false; @@ -291,26 +337,48 @@ void Channels::disable_all_channels() void Channels::enable_all_logic_channels() { - set_all_channels_conditionally([](const shared_ptr signal) + enable_channels_conditionally([](const shared_ptr signal) + { return signal->type() == SignalBase::LogicChannel; }); +} + +void Channels::disable_all_logic_channels() +{ + disable_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) + enable_channels_conditionally([](const shared_ptr signal) + { return signal->type() == SignalBase::AnalogChannel; }); +} + +void Channels::disable_all_analog_channels() +{ + disable_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) + enable_channels_conditionally([](const shared_ptr signal) { return signal->name() != signal->internal_name(); }); } +void Channels::disable_all_unnamed_channels() +{ + disable_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) + enable_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; @@ -336,5 +404,38 @@ void Channels::enable_all_changing_channels() }); } +void Channels::disable_all_non_changing_channels() +{ + disable_channels_conditionally([](const shared_ptr signal) + { + // Always disable channels without sample data + if (!signal->has_samples()) + return true; + + // Non-logic channels are considered to always have a signal + if (signal->type() != SignalBase::LogicChannel) + return false; + + const shared_ptr logic = signal->logic_data(); + assert(logic); + + // If any of the segments has edges, leave this channel enabled + 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 false; + } + + // No edges detected in any of the segments + return true; + }); +} + } // namespace popups } // namespace pv