projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use device::Devices to represent sigrok Devices
[pulseview.git]
/
pv
/
view
/
view.cpp
diff --git
a/pv/view/view.cpp
b/pv/view/view.cpp
index c09609ac65d49daa9a9ad8988ff805f84cc39a6f..67d4f404d1162577f9afe524ea46f547d31b402c 100644
(file)
--- a/
pv/view/view.cpp
+++ b/
pv/view/view.cpp
@@
-36,7
+36,7
@@
#include <QMouseEvent>
#include <QScrollBar>
#include <QMouseEvent>
#include <QScrollBar>
-#include <libsigrok
/libsigrok
.hpp>
+#include <libsigrok
cxx/libsigrokcxx
.hpp>
#include "decodetrace.hpp"
#include "header.hpp"
#include "decodetrace.hpp"
#include "header.hpp"
@@
-48,6
+48,7
@@
#include "viewport.hpp"
#include "pv/session.hpp"
#include "viewport.hpp"
#include "pv/session.hpp"
+#include "pv/devices/device.hpp"
#include "pv/data/logic.hpp"
#include "pv/data/logicsegment.hpp"
#include "pv/util.hpp"
#include "pv/data/logic.hpp"
#include "pv/data/logicsegment.hpp"
#include "pv/util.hpp"
@@
-297,7
+298,7
@@
void View::set_scale_offset(double scale, double offset)
set< shared_ptr<SignalData> > View::get_visible_data() const
{
shared_lock<shared_mutex> lock(session().signals_mutex());
set< shared_ptr<SignalData> > View::get_visible_data() const
{
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());
// Make a set of all the visible data objects
set< shared_ptr<SignalData> > visible_data;
// Make a set of all the visible data objects
set< shared_ptr<SignalData> > visible_data;
@@
-323,7
+324,7
@@
pair<double, double> View::get_time_extents() const
const double start_time = s->start_time();
left_time = min(left_time, start_time);
right_time = max(right_time, start_time +
const double start_time = s->start_time();
left_time = min(left_time, start_time);
right_time = max(right_time, start_time +
- d->
get_
max_sample_count() / samplerate);
+ d->max_sample_count() / samplerate);
}
}
}
}
@@
-675,7
+676,7
@@
void View::signals_changed()
// Populate the traces
clear_child_items();
// Populate the traces
clear_child_items();
- shared_ptr<sigrok::Device> device = session_.device();
+ shared_ptr<sigrok::Device> device = session_.device()
->device()
;
assert(device);
// Collect a set of signals
assert(device);
// Collect a set of signals
@@
-683,7
+684,7
@@
void View::signals_changed()
signal_map;
shared_lock<shared_mutex> lock(session_.signals_mutex());
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;