projects
/
pulseview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a472a88
)
pv::view::View::zoom: Removed duplicated scale clamping
author
Joel Holdsworth
<joel@airwebreathe.org.uk>
Fri, 17 Jan 2014 18:47:17 +0000
(18:47 +0000)
committer
Joel Holdsworth
<joel@airwebreathe.org.uk>
Fri, 17 Jan 2014 18:51:15 +0000
(18:51 +0000)
pv/view/view.cpp
patch
|
blob
|
history
diff --git
a/pv/view/view.cpp
b/pv/view/view.cpp
index 35195b58dc150c8743f5d623e7495ccb1ecd5412..cf990bcdced9f7cf44eeac9b149f2942cb8c2cc9 100644
(file)
--- a/
pv/view/view.cpp
+++ b/
pv/view/view.cpp
@@
-154,9
+154,7
@@
void View::zoom(double steps)
void View::zoom(double steps, int offset)
{
- const double new_scale = max(min(_scale * pow(3.0/2.0, -steps),
- MaxScale), MinScale);
- set_zoom(new_scale, offset);
+ set_zoom(_scale * pow(3.0/2.0, -steps), offset);
}
void View::zoom_fit()