#include <libsigrokdecode/libsigrokdecode.h>
}
+#include <mutex>
+
#include <extdef.h>
#include <tuple>
#include <pv/widgets/decodergroupbox.h>
#include <pv/widgets/decodermenu.h>
+using boost::shared_lock;
+using boost::shared_mutex;
using std::dynamic_pointer_cast;
using std::list;
+using std::lock_guard;
using std::make_pair;
using std::max;
using std::map;
pair<double, double> DecodeTrace::get_pixels_offset_samples_per_pixel() const
{
- assert(_view);
+ assert(_owner);
assert(_decoder_stack);
- const double scale = _view->scale();
+ const View *view = _owner->view();
+ assert(view);
+
+ const double scale = view->scale();
assert(scale > 0);
const double pixels_offset =
- (_view->offset() - _decoder_stack->get_start_time()) / scale;
+ (view->offset() - _decoder_stack->get_start_time()) / scale;
double samplerate = _decoder_stack->samplerate();
void DecodeTrace::hover_point_changed()
{
- QPoint hp = _view->hover_point();
+ assert(_owner);
+
+ const View *const view = _owner->view();
+ assert(view);
+
+ QPoint hp = view->hover_point();
QString ann = get_annotation_at_point(hp);
- assert(_view);
+ assert(view);
assert(_row_height);
if (ann.isEmpty()) {
hp.setY(get_y() - (_row_height / 2) + (hover_row * _row_height)
- _row_height - text_size.height());
- QToolTip::showText(_view->viewport()->mapToGlobal(hp), ann);
+ QToolTip::showText(view->viewport()->mapToGlobal(hp), ann);
}
void DecodeTrace::create_decoder_form(int index,
{
assert(dec);
- const vector< shared_ptr<Signal> > sigs = _session.get_signals();
+ shared_lock<shared_mutex> lock(_session.signals_mutex());
+ const vector< shared_ptr<Signal> > &sigs(_session.signals());
assert(_decoder_stack);
const auto channel_iter = dec->channels().find(pdch);
if (dynamic_pointer_cast<LogicSignal>(s) && s->enabled())
{
- selector->addItem(s->get_name(),
+ selector->addItem(s->name(),
qVariantFromValue((void*)s.get()));
if ((*channel_iter).second == s)
selector->setCurrentIndex(i + 1);
assert(dec);
map<const srd_channel*, shared_ptr<LogicSignal> > channel_map;
- const vector< shared_ptr<Signal> > sigs = _session.get_signals();
+
+ shared_lock<shared_mutex> lock(_session.signals_mutex());
+ const vector< shared_ptr<Signal> > &sigs(_session.signals());
for (const ChannelSelector &s : _channel_selectors)
{
void DecodeTrace::on_new_decode_data()
{
- if (_view)
- _view->update_viewport();
+ if (_owner)
+ _owner->update_viewport();
}
void DecodeTrace::delete_pressed()
assert(index < (int)_decoder_forms.size());
_decoder_forms[index]->set_decoder_visible(show);
- _view->update_viewport();
+ _owner->update_viewport();
}
} // namespace view