suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

+ support cutting of coloured mesh

Browse Source
This commit is contained in:
wmayer 2016-01-04 14:39:54 +01:00
parent 1747fb643f
commit 1d05f9c66e
2 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Mod/Mesh/App/Mesh.cpp
View File

@ -679,7 +679,7 @@ unsigned long MeshObject::getPointDegree(const std::vector<unsigned long>& indic
unsigned long countInvalids = std::count_if(pointDeg.begin(), pointDeg.end(),
std::bind2nd(std::equal_to<unsigned long>(), 0));
point_degree = pointDeg;
point_degree.swap(pointDeg);
return countInvalids;
}

26
src/Mod/Mesh/Gui/ViewProvider.cpp
View File

@ -1607,7 +1607,7 @@ void ViewProviderMesh::fillHole(unsigned long uFacet)
if (newFacets.empty())
return; // nothing to do
//add the facets to the mesh and open a transaction object for the undo/redo stuff
Gui::Application::Instance->activeDocument()->openCommand("Fill hole");
Mesh::MeshObject* kernel = fea->Mesh.startEditing();
@ -1621,6 +1621,30 @@ void ViewProviderMesh::removeFacets(const std::vector<unsigned long>& facets)
// Get the attached mesh property
Mesh::PropertyMeshKernel& meshProp = static_cast<Mesh::Feature*>(pcObject)->Mesh;
Mesh::MeshObject* kernel = meshProp.startEditing();
// get the colour property if there
App::PropertyColorList* prop = getColorProperty();
if (prop && prop->getSize() == static_cast<int>(kernel->countPoints())) {
std::vector<unsigned long> pointDegree;
unsigned long invalid = kernel->getPointDegree(facets, pointDegree);
if (invalid > 0) {
// switch off coloring mode
Coloring.setValue(false);
const std::vector<App::Color>& colors = prop->getValues();
std::vector<App::Color> valid_colors;
valid_colors.reserve(kernel->countPoints() - invalid);
std::size_t numPoints = pointDegree.size();
for (std::size_t index = 0; index < numPoints; index++) {
if (pointDegree[index] > 0) {
valid_colors.push_back(colors[index]);
}
}
prop->setValues(valid_colors);
}
}
//Remove the facets from the mesh and open a transaction object for the undo/redo stuff
kernel->deleteFacets(facets);
meshProp.finishEditing();