X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;ds=inline;f=pv%2Fview%2Fviewport.cpp;h=1504f482ca3915d605ff9a09d66e6c1584ab7362;hb=53bb2e1de75f5cca9244efc83c4e77a222e322f4;hp=9e136664f5078b1510dbef92d57c972b61d981ba;hpb=838d0522bf01d4e7550f8c124135debd452f0cac;p=pulseview.git
diff --git a/pv/view/viewport.cpp b/pv/view/viewport.cpp
index 9e13666..1504f48 100644
--- a/pv/view/viewport.cpp
+++ b/pv/view/viewport.cpp
@@ -14,8 +14,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * along with this program; if not, see .
*/
#include
@@ -32,6 +31,8 @@
#include
+#include
+
using std::abs;
using std::back_inserter;
using std::copy;
@@ -45,7 +46,8 @@ using std::stable_sort;
using std::vector;
namespace pv {
-namespace view {
+namespace views {
+namespace TraceView {
Viewport::Viewport(View &parent) :
ViewWidget(parent),
@@ -202,26 +204,27 @@ void Viewport::mouseDoubleClickEvent(QMouseEvent *event)
view_.zoom(-2.0, event->x());
}
-void Viewport::wheelEvent(QWheelEvent *e)
+void Viewport::wheelEvent(QWheelEvent *event)
{
- assert(e);
+ assert(event);
- if (e->orientation() == Qt::Vertical) {
- if (e->modifiers() & Qt::ControlModifier) {
+ if (event->orientation() == Qt::Vertical) {
+ if (event->modifiers() & Qt::ControlModifier) {
// Vertical scrolling with the control key pressed
// is intrepretted as vertical scrolling
view_.set_v_offset(-view_.owner_visual_v_offset() -
- (e->delta() * height()) / (8 * 120));
+ (event->delta() * height()) / (8 * 120));
} else {
// Vertical scrolling is interpreted as zooming in/out
- view_.zoom(e->delta() / 120, e->x());
+ view_.zoom(event->delta() / 120, event->x());
}
- } else if (e->orientation() == Qt::Horizontal) {
+ } else if (event->orientation() == Qt::Horizontal) {
// Horizontal scrolling is interpreted as moving left/right
view_.set_scale_offset(view_.scale(),
- e->delta() * view_.scale() + view_.offset());
+ event->delta() * view_.scale() + view_.offset());
}
}
-} // namespace view
+} // namespace TraceView
+} // namespace views
} // namespace pv