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

+ fix warnings with clang

Browse Source
This commit is contained in:
wmayer 2014-09-24 18:00:46 +02:00
parent 032c893183
commit 23a58fedf7
3 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/Mod/Fem/App/FemMesh.cpp
View File

@ -393,10 +393,10 @@ void FemMesh::compute()
std::set<long> FemMesh::getSurfaceNodes(long ElemId,short FaceId, float Angle) const
{
std::set<long> result;
const SMESHDS_Mesh* data = myMesh->GetMeshDS();
//const SMESHDS_Mesh* data = myMesh->GetMeshDS();
const SMDS_MeshElement * element = data->FindElement(ElemId);
int fNbr = element->NbFaces();
//const SMDS_MeshElement * element = data->FindElement(ElemId);
//int fNbr = element->NbFaces();
//element->
return result;
@ -406,7 +406,6 @@ std::set<long> FemMesh::getSurfaceNodes(const TopoDS_Face &face)const
{
std::set<long> result;
const SMESHDS_Mesh* data = myMesh->GetMeshDS();
Bnd_Box box;
BRepBndLib::Add(face, box);
@ -418,8 +417,8 @@ std::set<long> FemMesh::getSurfaceNodes(const TopoDS_Face &face)const
const Base::Matrix4D Mtrx(getTransform());
SMDS_NodeIteratorPtr aNodeIter = myMesh->GetMeshDS()->nodesIterator();
for (int i=0;aNodeIter->more();i++) {
const SMDS_MeshNode* aNode = aNodeIter->next();
while (aNodeIter->more()) {
const SMDS_MeshNode* aNode = aNodeIter->next();
Base::Vector3d vec(aNode->X(),aNode->Y(),aNode->Z());
// Apply the matrix to hold the BoundBox in absolute space.
vec = Mtrx * vec;
@ -438,7 +437,7 @@ std::set<long> FemMesh::getSurfaceNodes(const TopoDS_Face &face)const
result.insert(aNode->GetID());
}
}
}
return result;
}

4
src/Mod/Fem/Gui/Command.cpp
View File

@ -483,14 +483,14 @@ void DefineNodesCallback(void * ud, SoEventCallback * n)
Base::Vector3f pt2d;
std::set<int> IntSet;
for (int i=0;aNodeIter->more();) {
while (aNodeIter->more()) {
const SMDS_MeshNode* aNode = aNodeIter->next();
Base::Vector3f vec(aNode->X(),aNode->Y(),aNode->Z());
pt2d = proj(vec);
if (polygon.Contains(Base::Vector2D(pt2d.x, pt2d.y)) == true)
IntSet.insert(aNode->GetID());
}
std::stringstream set;
set << "[";

3
src/Mod/Fem/Gui/TaskCreateNodeSet.cpp
View File

@ -168,7 +168,7 @@ void TaskCreateNodeSet::DefineNodes(const Base::Polygon2D &polygon,const Gui::Vi
if(! ui->checkBox_Add->isChecked())
tempSet.clear();
for (int i=0;aNodeIter->more();) {
while (aNodeIter->more()) {
const SMDS_MeshNode* aNode = aNodeIter->next();
Base::Vector3f vec(aNode->X(),aNode->Y(),aNode->Z());
pt2d = proj(vec);
@ -177,7 +177,6 @@ void TaskCreateNodeSet::DefineNodes(const Base::Polygon2D &polygon,const Gui::Vi
}
MeshViewProvider->setHighlightNodes(tempSet);
}
void TaskCreateNodeSet::onSelectionChanged(const Gui::SelectionChanges& msg)