projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make member variable underscores a suffix instead of a prefix
[pulseview.git]
/
pv
/
view
/
ruler.cpp
diff --git
a/pv/view/ruler.cpp
b/pv/view/ruler.cpp
index 3cc2eb173404e0213c87d6161c198f2b00ad94c1..d3e42df6a2fb24573a7b7a55e819ed4b559ecc91 100644
(file)
--- a/
pv/view/ruler.cpp
+++ b/
pv/view/ruler.cpp
@@
-41,7
+41,7
@@
Ruler::Ruler(View &parent) :
{
setMouseTracking(true);
{
setMouseTracking(true);
- connect(&
_view
, SIGNAL(hover_point_changed()),
+ connect(&
view_
, SIGNAL(hover_point_changed()),
this, SLOT(hover_point_changed()));
}
this, SLOT(hover_point_changed()));
}
@@
-58,7
+58,7
@@
void Ruler::paintEvent(QPaintEvent*)
p.setRenderHint(QPainter::Antialiasing);
std::pair<double, unsigned int> spacing =
p.setRenderHint(QPainter::Antialiasing);
std::pair<double, unsigned int> spacing =
- calculate_tick_spacing(p,
_view.scale(), _view
.offset());
+ calculate_tick_spacing(p,
view_.scale(), view_
.offset());
double tick_period = spacing.first;
unsigned int prefix = spacing.second;
double tick_period = spacing.first;
unsigned int prefix = spacing.second;
@@
-71,9
+71,9
@@
void Ruler::paintEvent(QPaintEvent*)
const double minor_tick_period = tick_period / MinorTickSubdivision;
const double first_major_division =
const double minor_tick_period = tick_period / MinorTickSubdivision;
const double first_major_division =
- floor(
_view
.offset() / tick_period);
+ floor(
view_
.offset() / tick_period);
const double first_minor_division =
const double first_minor_division =
- ceil(
_view
.offset() / minor_tick_period);
+ ceil(
view_
.offset() / minor_tick_period);
const double t0 = first_major_division * tick_period;
int division = (int)round(first_minor_division -
const double t0 = first_major_division * tick_period;
int division = (int)round(first_minor_division -
@@
-87,7
+87,7
@@
void Ruler::paintEvent(QPaintEvent*)
do {
const double t = t0 + division * minor_tick_period;
do {
const double t = t0 + division * minor_tick_period;
- x = (t -
_view.offset()) / _view
.scale();
+ x = (t -
view_.offset()) / view_
.scale();
if (division % MinorTickSubdivision == 0)
{
if (division % MinorTickSubdivision == 0)
{
@@
-115,7
+115,7
@@
void Ruler::paintEvent(QPaintEvent*)
void Ruler::draw_hover_mark(QPainter &p)
{
void Ruler::draw_hover_mark(QPainter &p)
{
- const int x =
_view
.hover_point().x();
+ const int x =
view_
.hover_point().x();
if (x == -1)
return;
if (x == -1)
return;