#include <mutex>
#include <unordered_set>
+#include <boost/thread/locks.hpp>
+
#include <QApplication>
#include <QEvent>
#include <QFontMetrics>
using pv::util::TimeUnit;
using pv::util::Timestamp;
+using std::back_inserter;
+using std::copy_if;
using std::deque;
using std::dynamic_pointer_cast;
using std::inserter;
using std::lock_guard;
using std::max;
using std::make_pair;
+using std::make_shared;
using std::min;
using std::pair;
using std::set;
set< shared_ptr<SignalData> > View::get_visible_data() const
{
- shared_lock<shared_mutex> lock(session().signals_mutex());
- const unordered_set< 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;
void View::restack_all_trace_tree_items()
{
// Make a list of owners that is sorted from deepest first
- const auto owners = list_row_item_owners();
+ const vector<shared_ptr<TraceTreeItem>> items(
+ list_by_type<TraceTreeItem>());
+ set< TraceTreeItemOwner* > owners;
+ for (const auto &r : items)
+ owners.insert(r->owner());
vector< TraceTreeItemOwner* > sorted_owners(owners.begin(), owners.end());
sort(sorted_owners.begin(), sorted_owners.end(),
[](const TraceTreeItemOwner* a, const TraceTreeItemOwner *b) {
o->restack_items();
// Animate the items to their destination
- for (const auto &r : *this)
- r->animate_to_layout_v_offset();
+ for (const auto &i : items)
+ i->animate_to_layout_v_offset();
}
void View::get_scroll_layout(double &length, Timestamp &offset) const
{
// Check whether we know the sample rate and hence can use time as the unit
if (time_unit_ == util::TimeUnit::Samples) {
- shared_lock<shared_mutex> lock(session().signals_mutex());
- const unordered_set< shared_ptr<Signal> > &sigs(session().signals());
+ const unordered_set< shared_ptr<Signal> > sigs(session().signals());
// Check all signals but...
for (const shared_ptr<Signal> signal : sigs) {
void View::signals_changed()
{
+ using sigrok::Channel;
+
vector< shared_ptr<TraceTreeItem> > new_top_level_items;
const auto device = session_.device();
shared_ptr<sigrok::Device> sr_dev = device->device();
assert(sr_dev);
+ const vector< shared_ptr<Channel> > channels(
+ sr_dev->channels());
+
// Make a list of traces that are being added, and a list of traces
// that are being removed
const vector<shared_ptr<Trace>> prev_trace_list = list_by_type<Trace>();
const set<shared_ptr<Trace>> prev_traces(
prev_trace_list.begin(), prev_trace_list.end());
- shared_lock<shared_mutex> lock(session_.signals_mutex());
- const unordered_set< shared_ptr<Signal> > &sigs(session_.signals());
+ const unordered_set< shared_ptr<Signal> > sigs(session_.signals());
set< shared_ptr<Trace> > traces(sigs.begin(), sigs.end());
new_top_level_items.push_back(new_trace_group);
}
+ // Enqueue the remaining logic channels in a group
+ vector< shared_ptr<Channel> > logic_channels;
+ copy_if(channels.begin(), channels.end(), back_inserter(logic_channels),
+ [](const shared_ptr<Channel>& c) {
+ return c->type() == sigrok::ChannelType::LOGIC; });
+ const vector< shared_ptr<Trace> > non_grouped_logic_signals =
+ extract_new_traces_for_channels(logic_channels,
+ signal_map, add_traces);
+ const shared_ptr<TraceGroup> non_grouped_trace_group(
+ make_shared<TraceGroup>());
+ for (shared_ptr<Trace> trace : non_grouped_logic_signals)
+ non_grouped_trace_group->add_child_item(trace);
+ new_top_level_items.push_back(non_grouped_trace_group);
+
// Enqueue the remaining channels as free ungrouped traces
const vector< shared_ptr<Trace> > new_top_level_signals =
- extract_new_traces_for_channels(sr_dev->channels(),
+ extract_new_traces_for_channels(channels,
signal_map, add_traces);
new_top_level_items.insert(new_top_level_items.end(),
new_top_level_signals.begin(), new_top_level_signals.end());
void View::on_hover_point_changed()
{
- for (shared_ptr<TraceTreeItem> r : *this)
+ const vector<shared_ptr<TraceTreeItem>> trace_tree_items(
+ list_by_type<TraceTreeItem>());
+ for (shared_ptr<TraceTreeItem> r : trace_tree_items)
r->hover_point_changed();
}