From 6fcd3ca7ac7cacbece637e95aca192a7e9028a61 Mon Sep 17 00:00:00 2001 From: Paolo Cignoni cignoni Date: Tue, 13 Dec 2011 22:54:12 +0000 Subject: [PATCH] updated to reflect the UpdateSelection name changes. --- .../filter_layer/filter_layer.cpp | 12 +++++----- .../filter_mls/smallcomponentselection.h | 4 ++-- .../filter_qhull/filter_qhull.cpp | 8 +++---- .../filter_select/meshselect.cpp | 22 +++++++++---------- 4 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/meshlabplugins/filter_layer/filter_layer.cpp b/src/meshlabplugins/filter_layer/filter_layer.cpp index 483092786..7d4b1c210 100644 --- a/src/meshlabplugins/filter_layer/filter_layer.cpp +++ b/src/meshlabplugins/filter_layer/filter_layer.cpp @@ -134,19 +134,19 @@ bool FilterLayerPlugin::applyFilter(QAction *filter, MeshDocument &md, RichParam MeshModel *destMesh= md.addNewMesh("","SelectedSubset"); // After Adding a mesh to a MeshDocument the new mesh is the current one // select all points involved - tri::UpdateSelection::ClearVertex(currentMesh->cm); + tri::UpdateSelection::VertexClear(currentMesh->cm); tri::UpdateSelection::VertexFromFaceLoose(currentMesh->cm); tri::Append::Mesh(destMesh->cm, currentMesh->cm, true); - numFacesSel = tri::UpdateSelection::CountFace(currentMesh->cm); - numVertSel = tri::UpdateSelection::CountVertex(currentMesh->cm); + numFacesSel = tri::UpdateSelection::FaceCount(currentMesh->cm); + numVertSel = tri::UpdateSelection::VertexCount(currentMesh->cm); if(par.getBool("DeleteOriginal")) // delete original faces { CMeshO::VertexIterator vi; CMeshO::FaceIterator fi; - tri::UpdateSelection::ClearVertex(currentMesh->cm); + tri::UpdateSelection::VertexClear(currentMesh->cm); tri::UpdateSelection::VertexFromFaceStrict(currentMesh->cm); for(fi=currentMesh->cm.face.begin();fi!=currentMesh->cm.face.end();++fi) if(!(*fi).IsD() && (*fi).IsS() ) @@ -155,8 +155,8 @@ bool FilterLayerPlugin::applyFilter(QAction *filter, MeshDocument &md, RichParam if(!(*vi).IsD() && (*vi).IsS() ) tri::Allocator::DeleteVertex(currentMesh->cm,*vi); - tri::UpdateSelection::ClearVertex(currentMesh->cm); - tri::UpdateSelection::ClearFace(currentMesh->cm); + tri::UpdateSelection::VertexClear(currentMesh->cm); + tri::UpdateSelection::FaceClear(currentMesh->cm); currentMesh->clearDataMask(MeshModel::MM_FACEFACETOPO | MeshModel::MM_FACEFLAGBORDER); diff --git a/src/meshlabplugins/filter_mls/smallcomponentselection.h b/src/meshlabplugins/filter_mls/smallcomponentselection.h index 697524116..b8491d16a 100644 --- a/src/meshlabplugins/filter_mls/smallcomponentselection.h +++ b/src/meshlabplugins/filter_mls/smallcomponentselection.h @@ -99,7 +99,7 @@ public: } ++faceSeed; } - UpdateSelection::ClearFace(m); + UpdateSelection::FaceClear(m); // now the segmentation is done, let's compute the absolute face count threshold int total_selected = 0; @@ -130,7 +130,7 @@ public: { typename MeshType::FaceIterator fi; typename MeshType::VertexIterator vi; - UpdateSelection::ClearVertex(m); + UpdateSelection::VertexClear(m); UpdateSelection::VertexFromFaceStrict(m); for(fi=m.face.begin();fi!=m.face.end();++fi) diff --git a/src/meshlabplugins/filter_qhull/filter_qhull.cpp b/src/meshlabplugins/filter_qhull/filter_qhull.cpp index f946fcfe8..b6dd27a8d 100644 --- a/src/meshlabplugins/filter_qhull/filter_qhull.cpp +++ b/src/meshlabplugins/filter_qhull/filter_qhull.cpp @@ -261,7 +261,7 @@ bool QhullPlugin::applyFilter(QAction *filter, MeshDocument &md, RichParameterSe vcg::tri::UpdateTopology::FaceFace(pm.cm); vcg::tri::UpdateTopology::TestFaceFace(pm.cm); pm.clearDataMask(MeshModel::MM_FACEFACETOPO); - tri::UpdateSelection::ClearFace(pm.cm); + tri::UpdateSelection::FaceClear(pm.cm); } vcg::tri::UpdateBounding::Box(pm.cm); @@ -444,7 +444,7 @@ bool QhullPlugin::applyFilter(QAction *filter, MeshDocument &md, RichParameterSe m.updateDataMask(MeshModel::MM_VERTFLAGSELECT); //Clear old selection - tri::UpdateSelection::ClearVertex(m.cm); + tri::UpdateSelection::VertexClear(m.cm); int dim= 3; /* dimension of points */ int numpoints= m.cm.vn; /* number of mesh vertices */ @@ -493,7 +493,7 @@ bool QhullPlugin::applyFilter(QAction *filter, MeshDocument &md, RichParameterSe vcg::tri::UpdateTopology::TestFaceFace(pm.cm); pm.clearDataMask(MeshModel::MM_FACEFACETOPO); //Clear all face because,somewhere, they have been selected - tri::UpdateSelection::ClearFace(pm.cm); + tri::UpdateSelection::FaceClear(pm.cm); } vcg::tri::UpdateBounding::Box(pm.cm); vcg::tri::UpdateNormals::PerVertexNormalizedPerFace(pm.cm); @@ -520,7 +520,7 @@ bool QhullPlugin::applyFilter(QAction *filter, MeshDocument &md, RichParameterSe vcg::tri::UpdateTopology::TestFaceFace(pm2.cm); pm2.clearDataMask(MeshModel::MM_FACEFACETOPO); //Clear all face because,somewhere, they have been selected - tri::UpdateSelection::ClearFace(pm2.cm); + tri::UpdateSelection::FaceClear(pm2.cm); } vcg::tri::UpdateBounding::Box(pm2.cm); diff --git a/src/meshlabplugins/filter_select/meshselect.cpp b/src/meshlabplugins/filter_select/meshselect.cpp index 8528c6018..72a60852b 100644 --- a/src/meshlabplugins/filter_select/meshselect.cpp +++ b/src/meshlabplugins/filter_select/meshselect.cpp @@ -215,7 +215,7 @@ bool SelectionFilterPlugin::applyFilter(QAction *action, MeshDocument &md, RichP switch(ID(action)) { case FP_SELECT_DELETE_VERT : - tri::UpdateSelection::ClearFace(m.cm); + tri::UpdateSelection::FaceClear(m.cm); tri::UpdateSelection::FaceFromVertexLoose(m.cm); for(fi=m.cm.face.begin();fi!=m.cm.face.end();++fi) if(!(*fi).IsD() && (*fi).IsS() ) tri::Allocator::DeleteFace(m.cm,*fi); @@ -230,7 +230,7 @@ bool SelectionFilterPlugin::applyFilter(QAction *action, MeshDocument &md, RichP m.clearDataMask(MeshModel::MM_FACEFACETOPO | MeshModel::MM_FACEFLAGBORDER); break; case FP_SELECT_DELETE_FACEVERT : - tri::UpdateSelection::ClearVertex(m.cm); + tri::UpdateSelection::VertexClear(m.cm); tri::UpdateSelection::VertexFromFaceStrict(m.cm); for(fi=m.cm.face.begin();fi!=m.cm.face.end();++fi) if(!(*fi).IsD() && (*fi).IsS() ) @@ -275,16 +275,16 @@ bool SelectionFilterPlugin::applyFilter(QAction *action, MeshDocument &md, RichP } break; case FP_SELECT_ALL : - tri::UpdateSelection::AllVertex(m.cm); - tri::UpdateSelection::AllFace(m.cm); break; + tri::UpdateSelection::VertexAll(m.cm); + tri::UpdateSelection::FaceAll(m.cm); break; case FP_SELECT_NONE : - tri::UpdateSelection::ClearVertex(m.cm); - tri::UpdateSelection::ClearFace(m.cm); break; + tri::UpdateSelection::VertexClear(m.cm); + tri::UpdateSelection::FaceClear(m.cm); break; case FP_SELECT_INVERT : if (par.getBool("InvVerts")) - tri::UpdateSelection::InvertVertex(m.cm); + tri::UpdateSelection::VertexInvert(m.cm); if (par.getBool("InvFaces")) - tri::UpdateSelection::InvertFace(m.cm); break; + tri::UpdateSelection::FaceInvert(m.cm); break; case FP_SELECT_VERT_FROM_FACE : if(par.getBool("Inclusive")) tri::UpdateSelection::VertexFromFaceStrict(m.cm); @@ -339,8 +339,8 @@ bool SelectionFilterPlugin::applyFilter(QAction *action, MeshDocument &md, RichP float valueGS = par.getDynamicFloat("PercentGS"); float valueBV = par.getDynamicFloat("PercentBV"); - tri::UpdateSelection::ClearFace(m.cm); - tri::UpdateSelection::ClearVertex(m.cm); + tri::UpdateSelection::FaceClear(m.cm); + tri::UpdateSelection::VertexClear(m.cm); //now loop through all the faces for(vi = m.cm.vert.begin(); vi != m.cm.vert.end(); ++vi) @@ -389,7 +389,7 @@ bool SelectionFilterPlugin::applyFilter(QAction *action, MeshDocument &md, RichP std::vector IntersFace; std::vector::iterator fpi; tri::Clean::SelfIntersections(m.cm,IntersFace); - tri::UpdateSelection::ClearFace(m.cm); + tri::UpdateSelection::FaceClear(m.cm); for(fpi=IntersFace.begin();fpi!=IntersFace.end();++fpi) (*fpi)->SetS(); break;