Modification des conditions definissant un trajet de conducteur comme etant incoherent.

git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@595 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
xavier
2009-04-18 17:23:04 +00:00
parent f23c1b1d93
commit 29ddef0035

View File

@@ -16,7 +16,6 @@
along with QElectroTech. If not, see <http://www.gnu.org/licenses/>. along with QElectroTech. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include <QtDebug> #include <QtDebug>
#include <limits>
#include "conductor.h" #include "conductor.h"
#include "conductorsegment.h" #include "conductorsegment.h"
#include "conductorsegmentprofile.h" #include "conductorsegmentprofile.h"
@@ -894,13 +893,15 @@ bool Conductor::fromXml(QDomElement &e) {
QPointF t2 = terminal2 -> amarrageConductor(); QPointF t2 = terminal2 -> amarrageConductor();
qreal expected_width = t2.x() - t1.x(); qreal expected_width = t2.x() - t1.x();
qreal expected_height = t2.y() - t1.y(); qreal expected_height = t2.y() - t1.y();
qreal precision = std::numeric_limits<qreal>::epsilon();
// on considere que le trajet est incoherent a partir d'une unite de difference avec l'espacement entre les bornes
if ( if (
expected_width > width + precision ||\ qAbs(expected_width - width) > 1.0 ||
expected_width < width - precision ||\ qAbs(expected_height - height) > 1.0
expected_height > height + precision ||\ ) {
expected_height < height - precision qDebug() << "Conductor::fromXml : les segments du conducteur ne semblent pas coherents - utilisation d'un trajet automatique";
) return(false); return(false);
}
/* on recree les segments a partir des donnes XML */ /* on recree les segments a partir des donnes XML */
// cree la liste de points // cree la liste de points