From deeac895c377df85aa6c68707a180028ce1b0f9d Mon Sep 17 00:00:00 2001 From: blacksun Date: Thu, 12 Feb 2015 21:37:56 +0000 Subject: [PATCH] Fix warning git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@3715 bfdf4180-ca20-0410-9c96-a3a8aa849046 --- sources/diagram.cpp | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/sources/diagram.cpp b/sources/diagram.cpp index 9c7f87738..a8dcd9bc3 100644 --- a/sources/diagram.cpp +++ b/sources/diagram.cpp @@ -1132,22 +1132,20 @@ DiagramPosition Diagram::convertPosition(const QPointF &pos) { * @param p point to find the nearest snaped point * @return */ -QPointF Diagram::snapToGrid(const QPointF &p) { - // arrondit l'abscisse a 10 px pres - if (QApplication::keyboardModifiers().testFlag(Qt::ControlModifier) == true) { - // arrondit l'abscisse a 1 px pres - int p_x = qRound(p.x()); - // arrondit l'ordonnee a 1 px pres - int p_y = qRound(p.y()); - return (QPointF(p_x, p_y)); +QPointF Diagram::snapToGrid(const QPointF &p) +{ + //Return a point rounded to the nearest pixel + if (QApplication::keyboardModifiers().testFlag(Qt::ControlModifier)) + { + int p_x = qRound(p.x()); + int p_y = qRound(p.y()); + return (QPointF(p_x, p_y)); } - else if (QApplication::keyboardModifiers().testFlag(Qt::ControlModifier) == false) { - // arrondit l'ordonnee a 10 px pres - int p_x = qRound(p.x() / (Diagram::xGrid * 1.0)) * Diagram::xGrid; - // arrondit l'ordonnee a 10 px pres - int p_y = qRound(p.y() / (Diagram::yGrid * 1.0)) * Diagram::yGrid; + + //Return a point snapped to the grid + int p_x = qRound(p.x() / Diagram::xGrid) * Diagram::xGrid; + int p_y = qRound(p.y() / Diagram::yGrid) * Diagram::yGrid; return (QPointF(p_x, p_y)); - } }