projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Replaced duplicated code with Trace::get_y
[pulseview.git]
/
pv
/
view
/
decodetrace.cpp
diff --git
a/pv/view/decodetrace.cpp
b/pv/view/decodetrace.cpp
index fb4b7c29844fa5be0cc35b23fd45db6f50d8ea45..cb455c5ae3c5246f7111f5fc455032e979688002 100644
(file)
--- a/
pv/view/decodetrace.cpp
+++ b/
pv/view/decodetrace.cpp
@@
-24,6
+24,8
@@
extern "C" {
#include <extdef.h>
#include <extdef.h>
+#include <tuple>
+
#include <boost/functional/hash.hpp>
#include <QAction>
#include <boost/functional/hash.hpp>
#include <QAction>
@@
-57,6
+59,7
@@
using std::map;
using std::min;
using std::pair;
using std::shared_ptr;
using std::min;
using std::pair;
using std::shared_ptr;
+using std::tie;
using std::vector;
namespace pv {
using std::vector;
namespace pv {
@@
-178,7
+181,6
@@
void DecodeTrace::paint_mid(QPainter &p, int left, int right)
}
// Iterate through the rows
}
// Iterate through the rows
- assert(_view);
int y = get_y();
pair<uint64_t, uint64_t> sample_range = get_sample_range(left, right);
int y = get_y();
pair<uint64_t, uint64_t> sample_range = get_sample_range(left, right);
@@
-328,8
+330,9
@@
void DecodeTrace::draw_annotation(const pv::data::decode::Annotation &a,
QPainter &p, QColor text_color, int h, int left, int right, int y,
size_t base_colour) const
{
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;
const double start = a.start_sample() / samples_per_pixel -
pixels_offset;
@@
-454,6
+457,8
@@
void DecodeTrace::draw_unresolved_period(QPainter &p, int h, int left,
using namespace pv::data;
using pv::data::decode::Decoder;
using namespace pv::data;
using pv::data::decode::Decoder;
+ double samples_per_pixel, pixels_offset;
+
assert(_decoder_stack);
shared_ptr<Logic> data;
assert(_decoder_stack);
shared_ptr<Logic> data;
@@
-486,8
+491,8
@@
void DecodeTrace::draw_unresolved_period(QPainter &p, int h, int left,
const int y = get_y();
const int y = get_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);
const double start = max(samples_decoded /
samples_per_pixel - pixels_offset, left - 1.0);
@@
-504,7
+509,7
@@
void DecodeTrace::draw_unresolved_period(QPainter &p, int h, int left,
p.drawRect(no_decode_rect);
}
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(_decoder_stack);
{
assert(_view);
assert(_decoder_stack);
@@
-512,16
+517,8
@@
double DecodeTrace::get_pixels_offset() const
const double scale = _view->scale();
assert(scale > 0);
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 double scale = _view->scale();
- assert(scale > 0);
+ const double pixels_offset =
+ (_view->offset() - _decoder_stack->get_start_time()) / scale;
double samplerate = _decoder_stack->samplerate();
double samplerate = _decoder_stack->samplerate();
@@
-529,14
+526,15
@@
double DecodeTrace::get_samples_per_pixel() const
if (samplerate == 0.0)
samplerate = 1.0;
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
{
}
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);
const uint64_t start = (uint64_t)max(
(x_start + pixels_offset) * samples_per_pixel, 0.0);