lucaspalomodevelop/meshlab
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/meshlab.git synced 2026-03-15 00:54:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bugfix the new signature for decimator function call

Browse Source
This commit is contained in:
Paolo Cignoni cignoni 2006-01-26 16:49:50 +00:00
parent 0414e207b2
commit be22392fa1
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/meshlabplugins/meshfilter/meshfilter.cpp
View File

@ -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<CMeshO>::FaceFace(m.cm);
int delvert = Decimator<CMeshO>(m.cm,step);
int Xstep = decimatorDialog->getXStep();
int Ystep = decimatorDialog->getYStep();
int Zstep = decimatorDialog->getZStep();
vcg::tri::UpdateTopology<CMeshO>::FaceFace(m.cm);
int delvert = Decimator<CMeshO>(m.cm,Xstep,Ystep,Zstep);
if (log)
log->Log(GLLogStream::Info, "Removed %d vertices", delvert);
vcg::tri::UpdateNormals<CMeshO>::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();