From be22392fa111d9891383e02f46d2aafdaa1d716b Mon Sep 17 00:00:00 2001 From: Paolo Cignoni cignoni Date: Thu, 26 Jan 2006 16:49:50 +0000 Subject: [PATCH] Bugfix the new signature for decimator function call --- src/meshlabplugins/meshfilter/meshfilter.cpp | 22 ++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/src/meshlabplugins/meshfilter/meshfilter.cpp b/src/meshlabplugins/meshfilter/meshfilter.cpp index d22b5c697..5325e5d81 100644 --- a/src/meshlabplugins/meshfilter/meshfilter.cpp +++ b/src/meshlabplugins/meshfilter/meshfilter.cpp @@ -22,6 +22,9 @@ /**************************************************************************** History $Log$ +Revision 1.49 2006/01/26 16:49:50 giec +Bugfix the new signature for decimator function call + Revision 1.48 2006/01/25 21:06:24 giec Implemented percentile for detucher's dialog @@ -400,12 +403,20 @@ bool ExtraMeshFilterPlugin::applyFilter(QAction *filter, MeshModel &m, QWidget * if(filter->text() == ST(FP_DECIMATOR)) { - int continueValue = decimatorDialog->exec(); - if (continueValue == QDialog::Rejected) + float diagonale = m.cm.bbox.Diag(); + + decimatorDialog->setBboxEdge(m.cm.bbox.min,m.cm.bbox.max); + //decimatorDialog->setDiagonale(diagonale); + + int continueValue = decimatorDialog->exec(); + + if (continueValue == QDialog::Rejected) return false; // don't continue, user pressed Cancel - int step = decimatorDialog->getStep(); - vcg::tri::UpdateTopology::FaceFace(m.cm); - int delvert = Decimator(m.cm,step); + int Xstep = decimatorDialog->getXStep(); + int Ystep = decimatorDialog->getYStep(); + int Zstep = decimatorDialog->getZStep(); + vcg::tri::UpdateTopology::FaceFace(m.cm); + int delvert = Decimator(m.cm,Xstep,Ystep,Zstep); if (log) log->Log(GLLogStream::Info, "Removed %d vertices", delvert); vcg::tri::UpdateNormals::PerVertexNormalizedPerFace(m.cm); @@ -470,7 +481,6 @@ bool ExtraMeshFilterPlugin::applyFilter(QAction *filter, MeshModel &m, QWidget * for(vi = m.cm.vert.begin(); vi != m.cm.vert.end(); ++vi) (*vi).ClearS(); - detacherDialog->setHistogram(histo); detacherDialog->setDiagonale(diagonale); int continueValue = detacherDialog->exec();