#include <cstdint>
#include <list>
#include <memory>
+#include <mutex>
#include <set>
-#include <unordered_map>
#include <vector>
#include <QAbstractScrollArea>
#include "tracetreeitemowner.hpp"
using std::list;
-using std::unordered_map;
+using std::map;
using std::set;
using std::shared_ptr;
using std::vector;
shared_ptr<Signal> get_signal_by_signalbase(shared_ptr<data::SignalBase> base) const;
- virtual void clear_signals();
-
- void add_signal(const shared_ptr<Signal> signal);
+ virtual void clear_signalbases();
+ virtual void add_signalbase(const shared_ptr<data::SignalBase> signalbase);
+ virtual void remove_signalbase(const shared_ptr<data::SignalBase> signalbase);
#ifdef ENABLE_DECODE
virtual void clear_decode_signals();
TraceTreeItemOwner* find_prevalent_trace_group(
const shared_ptr<sigrok::ChannelGroup> &group,
- const unordered_map<shared_ptr<data::SignalBase>,
- shared_ptr<Signal> > &signal_map);
+ const map<shared_ptr<data::SignalBase>, shared_ptr<Signal> > &signal_map);
static vector< shared_ptr<Trace> >
extract_new_traces_for_channels(
const vector< shared_ptr<sigrok::Channel> > &channels,
- const unordered_map<shared_ptr<data::SignalBase>,
- shared_ptr<Signal> > &signal_map,
+ const map<shared_ptr<data::SignalBase>, shared_ptr<Signal> > &signal_map,
set< shared_ptr<Trace> > &add_list);
void determine_time_unit();
QShortcut *grab_ruler_left_shortcut_, *grab_ruler_right_shortcut_;
QShortcut *cancel_grab_shortcut_;
+ mutable mutex signal_mutex_;
vector< shared_ptr<Signal> > signals_;
#ifdef ENABLE_DECODE