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 f6c418433021d9007400b7a407cfe6e7289a6487..67d4f404d1162577f9afe524ea46f547d31b402c 100644
(file)
--- a/
pv/view/view.cpp
+++ b/
pv/view/view.cpp
@@
-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"
@@
-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