From 4fa4f0eeff8e2ce25ee0ae2504ae6529dbb867a7 Mon Sep 17 00:00:00 2001 From: Paolo Cignoni cignoni Date: Fri, 9 Sep 2016 13:03:06 +0000 Subject: [PATCH] Small changes to make the edit align working again: - removed assert disabling - removed wrong assert - corrected test in the aling (thanks gianpaolo) --- src/meshlabplugins/edit_align/align/AlignPair.cpp | 2 +- src/meshlabplugins/edit_align/edit_align.pro | 3 --- src/meshlabplugins/edit_align/meshtree.h | 4 +--- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/src/meshlabplugins/edit_align/align/AlignPair.cpp b/src/meshlabplugins/edit_align/align/AlignPair.cpp index 20fbd8231..ba06691d1 100644 --- a/src/meshlabplugins/edit_align/align/AlignPair.cpp +++ b/src/meshlabplugins/edit_align/align/AlignPair.cpp @@ -339,7 +339,7 @@ bool AlignPair::Align( if (beyondCntVec[i] < maxBeyondCnt) { - if (!fixbox.IsIn(movvert[i])) + if (fixbox.IsIn(movvert[i])) { double error = StartMinDist; Point3d closestPoint, closestNormal; diff --git a/src/meshlabplugins/edit_align/edit_align.pro b/src/meshlabplugins/edit_align/edit_align.pro index 7e8ebd7c3..aea0a52cb 100644 --- a/src/meshlabplugins/edit_align/edit_align.pro +++ b/src/meshlabplugins/edit_align/edit_align.pro @@ -37,8 +37,5 @@ INCLUDEPATH += ../../external FORMS += alignDialog.ui TARGET = edit_align - RESOURCES = edit_align.qrc -release {DEFINES += NDEBUG} -macx:QMAKE_CXX=g++ diff --git a/src/meshlabplugins/edit_align/meshtree.h b/src/meshlabplugins/edit_align/meshtree.h index a532fd905..e7e8f8f48 100644 --- a/src/meshlabplugins/edit_align/meshtree.h +++ b/src/meshlabplugins/edit_align/meshtree.h @@ -91,9 +91,7 @@ public: for(QList::iterator li=resultList.begin();li!=resultList.end();++li) if((li->MovName==id1 && li->FixName==id2) || (li->MovName==id2 && li->FixName==id1) ) return &*li; - - assert("You are trying to find an unexistent result"==0); - return 0; + return 0; } void deleteResult(MeshNode *mp)