X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fpopups%2Fprobes.cpp;h=fc069b8fd42761ef6ce5d6edda43d93e55d02dd8;hp=51ba3ddca8b2744bfd60e89a109906ab741f60dd;hb=52a80eb3f81e1e4d8596164fe70d7ab8705d41eb;hpb=b7b659aa72851df2d34d4c1e5fd5636fbd9176d1 diff --git a/pv/popups/probes.cpp b/pv/popups/probes.cpp index 51ba3ddc..fc069b8f 100644 --- a/pv/popups/probes.cpp +++ b/pv/popups/probes.cpp @@ -18,14 +18,28 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include + +#include +#include +#include +#include + #include "probes.h" +#include +#include #include #include -using namespace boost; using namespace Qt; -using namespace std; + +using std::map; +using std::set; +using std::shared_ptr; +using std::vector; + +using pv::view::Signal; namespace pv { namespace popups { @@ -33,95 +47,200 @@ namespace popups { Probes::Probes(SigSession &session, QWidget *parent) : Popup(parent), _session(session), - _layout(this), - _probes(this), _updating_probes(false), - _probes_bar(this), - _enable_all_probes(this), - _disable_all_probes(this) + _enable_all_probes(tr("Enable All"), this), + _disable_all_probes(tr("Disable All"), this), + _check_box_mapper(this) { + // Create the layout setLayout(&_layout); + shared_ptr dev_inst = _session.get_device(); + assert(dev_inst); + const sr_dev_inst *const sdi = dev_inst->dev_inst(); + assert(sdi); + + // Collect a set of signals + map > signal_map; + const vector< shared_ptr > sigs = _session.get_signals(); + for (const shared_ptr &sig : sigs) + signal_map[sig->probe()] = sig; + + // Populate channel groups + for (const GSList *g = sdi->channel_groups; g; g = g->next) + { + const sr_channel_group *const group = + (const sr_channel_group*)g->data; + assert(group); + + // Make a set of signals, and removed this signals from the + // signal map. + vector< shared_ptr > group_sigs; + for (const GSList *p = group->channels; p; p = p->next) + { + const sr_channel *const probe = (const sr_channel*)p->data; + assert(probe); + + const auto iter = signal_map.find(probe); + + if (iter == signal_map.end()) + break; + + group_sigs.push_back((*iter).second); + signal_map.erase(iter); + } + + populate_group(group, group_sigs); + } + + // Make a vector of the remaining probes + vector< shared_ptr > global_sigs; + for (const GSList *p = sdi->channels; p; p = p->next) + { + const sr_channel *const probe = (const sr_channel*)p->data; + assert(probe); + + const map >:: + const_iterator iter = signal_map.find(probe); + if (iter != signal_map.end()) + global_sigs.push_back((*iter).second); + } + + // Create a group + populate_group(NULL, global_sigs); + + // Create the enable/disable all buttons connect(&_enable_all_probes, SIGNAL(clicked()), this, SLOT(enable_all_probes())); connect(&_disable_all_probes, SIGNAL(clicked()), this, SLOT(disable_all_probes())); - _layout.addWidget(&_probes); - - _enable_all_probes.setText(tr("Enable All")); - _probes_bar.addWidget(&_enable_all_probes); + _enable_all_probes.setFlat(true); + _disable_all_probes.setFlat(true); - _disable_all_probes.setText(tr("Disable All")); - _probes_bar.addWidget(&_disable_all_probes); + _buttons_bar.addWidget(&_enable_all_probes); + _buttons_bar.addWidget(&_disable_all_probes); + _buttons_bar.addStretch(1); - _layout.addWidget(&_probes_bar); + _layout.addRow(&_buttons_bar); - connect(&_probes, SIGNAL(itemChanged(QListWidgetItem*)), - this, SLOT(item_changed(QListWidgetItem*))); + // Connect the check-box signal mapper + connect(&_check_box_mapper, SIGNAL(mapped(QWidget*)), + this, SLOT(on_probe_checked(QWidget*))); } void Probes::set_all_probes(bool set) { - using pv::view::Signal; - _updating_probes = true; - const vector< shared_ptr > sigs = - _session.get_signals(); - for (unsigned int i = 0; i < sigs.size(); i++) + for (map >::const_iterator i = + _check_box_signal_map.begin(); + i != _check_box_signal_map.end(); i++) { - const shared_ptr &s = sigs[i]; - assert(s); - s->enable(set); + const shared_ptr sig = (*i).second; + assert(sig); - QListWidgetItem *const item = _probes.item(i); - assert(item); - item->setCheckState(set ? Qt::Checked : Qt::Unchecked); + sig->enable(set); + (*i).first->setChecked(set); } _updating_probes = false; } +void Probes::populate_group(const sr_channel_group *group, + const vector< shared_ptr > sigs) +{ + using pv::prop::binding::DeviceOptions; + + // Only bind options if this is a group. We don't do it for general + // options, because these properties are shown in the device config + // popup. + shared_ptr binding; + if (group) + binding = shared_ptr(new DeviceOptions( + _session.get_device(), group)); + + // Create a title if the group is going to have any content + if ((!sigs.empty() || (binding && !binding->properties().empty())) && + group && group->name) + _layout.addRow(new QLabel( + QString("

%1

").arg(group->name))); + + // Create the channel group grid + QGridLayout *const probe_grid = + create_channel_group_grid(sigs); + _layout.addRow(probe_grid); + + // Create the channel group options + if (binding) + { + binding->add_properties_to_form(&_layout, true); + _group_bindings.push_back(binding); + } +} + +QGridLayout* Probes::create_channel_group_grid( + const vector< shared_ptr > sigs) +{ + int row = 0, col = 0; + QGridLayout *const grid = new QGridLayout(); + + for (const shared_ptr& sig : sigs) + { + assert(sig); + + QCheckBox *const checkbox = new QCheckBox(sig->get_name()); + _check_box_mapper.setMapping(checkbox, checkbox); + connect(checkbox, SIGNAL(toggled(bool)), + &_check_box_mapper, SLOT(map())); + + grid->addWidget(checkbox, row, col); + + _check_box_signal_map[checkbox] = sig; + + if(++col >= 8) + col = 0, row++; + } + + return grid; +} + void Probes::showEvent(QShowEvent *e) { pv::widgets::Popup::showEvent(e); _updating_probes = true; - _probes.clear(); - - const vector< shared_ptr > sigs = - _session.get_signals(); - for (unsigned int i = 0; i < sigs.size(); i++) + for (map >::const_iterator i = + _check_box_signal_map.begin(); + i != _check_box_signal_map.end(); i++) { - const shared_ptr &s = sigs[i]; - assert(s); - QListWidgetItem *const item = new QListWidgetItem( - s->get_name(), &_probes); - assert(item); - item->setCheckState(s->enabled() ? Checked : Unchecked); - item->setData(UserRole, qVariantFromValue(i)); - _probes.addItem(item); + const shared_ptr sig = (*i).second; + assert(sig); + + (*i).first->setChecked(sig->enabled()); } _updating_probes = false; } -void Probes::item_changed(QListWidgetItem *item) +void Probes::on_probe_checked(QWidget *widget) { - using pv::view::Signal; - if (_updating_probes) return; - assert(item); - const vector< shared_ptr > sigs = - _session.get_signals(); - const shared_ptr s = sigs[ - item->data(UserRole).value()]; + QCheckBox *const check_box = (QCheckBox*)widget; + assert(check_box); + + // Look up the signal of this check-box + map< QCheckBox*, shared_ptr >::const_iterator iter = + _check_box_signal_map.find((QCheckBox*)check_box); + assert(iter != _check_box_signal_map.end()); + + const shared_ptr s = (*iter).second; assert(s); - s->enable(item->checkState() == Checked); + + s->enable(check_box->isChecked()); } void Probes::enable_all_probes()