projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Session: Store signals_ in an unordered_set
[pulseview.git]
/
pv
/
popups
/
channels.cpp
diff --git
a/pv/popups/channels.cpp
b/pv/popups/channels.cpp
index beacfb436d8eaf0166522e233ca822316277716c..3d209e84bb15a9350cc7445966c15fbde81f3b08 100644
(file)
--- a/
pv/popups/channels.cpp
+++ b/
pv/popups/channels.cpp
@@
-25,13
+25,13
@@
#include <QGridLayout>
#include <QLabel>
#include <QGridLayout>
#include <QLabel>
-#include "channels.h"
+#include "channels.h
pp
"
-#include <pv/
prop/binding/deviceoptions.h
>
-#include <pv/s
igsession.h
>
-#include <pv/view/signal.h>
+#include <pv/
binding/device.hpp
>
+#include <pv/s
ession.hpp
>
+#include <pv/view/signal.h
pp
>
-#include <libsigrok
/libsigrok
.hpp>
+#include <libsigrok
cxx/libsigrokcxx
.hpp>
using namespace Qt;
using namespace Qt;
@@
-42,6
+42,7
@@
using std::map;
using std::mutex;
using std::set;
using std::shared_ptr;
using std::mutex;
using std::set;
using std::shared_ptr;
+using std::unordered_set;
using std::vector;
using sigrok::Channel;
using std::vector;
using sigrok::Channel;
@@
-53,7
+54,7
@@
using pv::view::Signal;
namespace pv {
namespace popups {
namespace pv {
namespace popups {
-Channels::Channels(S
igS
ession &session, QWidget *parent) :
+Channels::Channels(Session &session, QWidget *parent) :
Popup(parent),
session_(session),
updating_channels_(false),
Popup(parent),
session_(session),
updating_channels_(false),
@@
-71,7
+72,7
@@
Channels::Channels(SigSession &session, QWidget *parent) :
map<shared_ptr<Channel>, shared_ptr<Signal> > signal_map;
shared_lock<shared_mutex> lock(session_.signals_mutex());
map<shared_ptr<Channel>, shared_ptr<Signal> > signal_map;
shared_lock<shared_mutex> lock(session_.signals_mutex());
- const
vector
< shared_ptr<Signal> > &sigs(session_.signals());
+ const
unordered_set
< shared_ptr<Signal> > &sigs(session_.signals());
for (const shared_ptr<Signal> &sig : sigs)
signal_map[sig->channel()] = sig;
for (const shared_ptr<Signal> &sig : sigs)
signal_map[sig->channel()] = sig;
@@
-151,14
+152,14
@@
void Channels::set_all_channels(bool set)
void Channels::populate_group(shared_ptr<ChannelGroup> group,
const vector< shared_ptr<pv::view::Signal> > sigs)
{
void Channels::populate_group(shared_ptr<ChannelGroup> group,
const vector< shared_ptr<pv::view::Signal> > sigs)
{
- using pv::
prop::binding::DeviceOptions
;
+ using pv::
binding::Device
;
// 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.
// 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<Device
Options
> binding;
+ shared_ptr<Device> binding;
if (group)
if (group)
- binding = shared_ptr<Device
Options>(new DeviceOptions
(group));
+ binding = shared_ptr<Device
>(new Device
(group));
// Create a title if the group is going to have any content
if ((!sigs.empty() || (binding && !binding->properties().empty())) &&
// Create a title if the group is going to have any content
if ((!sigs.empty() || (binding && !binding->properties().empty())) &&