#include <libsigrokdecode/libsigrokdecode.h>
}
+#include <mutex>
+
#include <extdef.h>
+#include <tuple>
+
#include <boost/functional/hash.hpp>
#include <QAction>
#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::make_pair;
using std::map;
using std::min;
using std::pair;
using std::shared_ptr;
+using std::tie;
using std::vector;
namespace pv {
return _decoder_stack;
}
-void DecodeTrace::set_view(pv::view::View *view)
+pair<int, int> DecodeTrace::v_extents() const
{
- assert(view);
- Trace::set_view(view);
+ /// @todo Replace this with an implementation that knows the true
+ /// height of the trace
+ QFontMetrics m(QApplication::font());
+ const int text_height = m.boundingRect(QRect(), 0, "Tg").height();
+ const int row_height = (text_height * 6) / 4;
+ return make_pair(-row_height / 2, row_height * 7 / 2);
}
void DecodeTrace::paint_back(QPainter &p, int left, int right)
{
Trace::paint_back(p, left, right);
- paint_axis(p, get_y(), left, right);
+ paint_axis(p, get_visual_y(), left, right);
}
void DecodeTrace::paint_mid(QPainter &p, int left, int right)
}
// Iterate through the rows
- assert(_view);
- int y = get_y();
+ int y = get_visual_y();
pair<uint64_t, uint64_t> sample_range = get_sample_range(left, right);
assert(_decoder_stack);
for (size_t i = 0; i < _visible_rows.size(); i++)
{
- const int y = i * _row_height + get_y();
+ const int y = i * _row_height + get_visual_y();
p.setPen(QPen(Qt::NoPen));
p.setBrush(QApplication::palette().brush(QPalette::WindowText));
QPainter &p, QColor text_color, int h, int left, int right, int y,
size_t base_colour) const
{
- const double samples_per_pixel = get_samples_per_pixel();
- const double pixels_offset = get_pixels_offset();
+ double samples_per_pixel, pixels_offset;
+ tie(pixels_offset, samples_per_pixel) =
+ get_pixels_offset_samples_per_pixel();
const double start = a.start_sample() / samples_per_pixel -
pixels_offset;
void DecodeTrace::draw_error(QPainter &p, const QString &message,
int left, int right)
{
- const int y = get_y();
+ const int y = get_visual_y();
p.setPen(ErrorBgColour.darker());
p.setBrush(ErrorBgColour);
using namespace pv::data;
using pv::data::decode::Decoder;
+ double samples_per_pixel, pixels_offset;
+
assert(_decoder_stack);
shared_ptr<Logic> data;
if (sample_count == samples_decoded)
return;
- const int y = get_y();
+ const int y = get_visual_y();
- const double samples_per_pixel = get_samples_per_pixel();
- const double pixels_offset = get_pixels_offset();
+ tie(pixels_offset, samples_per_pixel) =
+ get_pixels_offset_samples_per_pixel();
const double start = max(samples_decoded /
samples_per_pixel - pixels_offset, left - 1.0);
p.drawRect(no_decode_rect);
}
-double DecodeTrace::get_pixels_offset() const
+pair<double, double> DecodeTrace::get_pixels_offset_samples_per_pixel() const
{
- assert(_view);
+ assert(_owner);
assert(_decoder_stack);
- const double scale = _view->scale();
- assert(scale > 0);
-
- return (_view->offset() - _decoder_stack->get_start_time()) / scale;
-}
-
-double DecodeTrace::get_samples_per_pixel() const
-{
- assert(_view);
- assert(_decoder_stack);
+ const View *view = _owner->view();
+ assert(view);
- const double scale = _view->scale();
+ const double scale = view->scale();
assert(scale > 0);
+ const double pixels_offset =
+ (view->offset() - _decoder_stack->get_start_time()) / scale;
+
double samplerate = _decoder_stack->samplerate();
// Show sample rate as 1Hz when it is unknown
if (samplerate == 0.0)
samplerate = 1.0;
- return samplerate * scale;
+ return make_pair(pixels_offset, samplerate * scale);
}
pair<uint64_t, uint64_t> DecodeTrace::get_sample_range(
int x_start, int x_end) const
{
- const double samples_per_pixel = get_samples_per_pixel();
- const double pixels_offset = get_pixels_offset();
+ double samples_per_pixel, pixels_offset;
+ tie(pixels_offset, samples_per_pixel) =
+ get_pixels_offset_samples_per_pixel();
const uint64_t start = (uint64_t)max(
(x_start + pixels_offset) * samples_per_pixel, 0.0);
if (!_row_height)
return -1;
- const int row = (point.y() - get_y() + _row_height / 2) / _row_height;
+ const int row = (point.y() - get_visual_y() + _row_height / 2) /
+ _row_height;
if (row < 0 || row >= (int)_visible_rows.size())
return -1;
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()) {
// decode trace, not below.
hp.setX(hp.x() - (text_size.width() / 2) - padding);
- hp.setY(get_y() - (_row_height / 2) + (hover_row * _row_height)
- - _row_height - text_size.height());
+ hp.setY(get_visual_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
projects / pulseview.git / blobdiff