projects
/
pulseview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
01fd326
)
Removed copy-paste code from View::zoom
author
Joel Holdsworth
<joel@airwebreathe.org.uk>
Mon, 26 Aug 2013 15:34:54 +0000
(16:34 +0100)
committer
Joel Holdsworth
<joel@airwebreahe.org.uk>
Sun, 29 Sep 2013 01:52:28 +0000
(10:52 +0900)
pv/view/view.cpp
patch
|
blob
|
history
diff --git
a/pv/view/view.cpp
b/pv/view/view.cpp
index 026d2e7fda92a516e2032dcabac64d1a7d0d5fa5..e6ce6621f99d06786f230ede9714f82a6730f235 100644
(file)
--- a/
pv/view/view.cpp
+++ b/
pv/view/view.cpp
@@
-145,16
+145,12
@@
void View::zoom(double steps)
void View::zoom(double steps, int offset)
{
const double cursor_offset = _offset + _scale * offset;
void View::zoom(double steps, int offset)
{
const double cursor_offset = _offset + _scale * offset;
- _scale *= pow(3.0/2.0, -steps);
- _scale = max(min(_scale, MaxScale), MinScale);
- _offset = cursor_offset - _scale * offset;
-
- _ruler->update();
- _viewport->update();
- update_scroll();
+ const double new_scale = max(min(_scale * pow(3.0/2.0, -steps),
+ MaxScale), MinScale);
+ const double new_offset = cursor_offset - new_scale * offset;
+ set_scale_offset(new_scale, new_offset);
}
}
-
void View::set_scale_offset(double scale, double offset)
{
_scale = scale;
void View::set_scale_offset(double scale, double offset)
{
_scale = scale;