kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

+ Prefer prefix ++/-- operators for non-primitive types

Browse Source
This commit is contained in:
wmayer
2015-10-07 13:38:17 +02:00
parent 5a78a6ab79
commit b7be7aec13
32 changed files with 143 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Mod/Mesh/App/Core/Algorithm.cpp
View File

@@ -309,12 +309,12 @@ void MeshAlgorithm::GetFacetBorders (const std::vector<unsigned long> &raulInd,
// alle Facets markieren die in der Indizie-Liste vorkommen
ResetFacetFlag(MeshFacet::VISIT);
for (std::vector<unsigned long>::const_iterator pIter = raulInd.begin(); pIter != raulInd.end(); pIter++)
for (std::vector<unsigned long>::const_iterator pIter = raulInd.begin(); pIter != raulInd.end(); ++pIter)
rclFAry[*pIter].SetFlag(MeshFacet::VISIT);
std::list<std::pair<unsigned long, unsigned long> > aclEdges;
// alle Randkanten suchen und ablegen (unsortiert)
for (std::vector<unsigned long>::const_iterator pIter2 = raulInd.begin(); pIter2 != raulInd.end(); pIter2++)
for (std::vector<unsigned long>::const_iterator pIter2 = raulInd.begin(); pIter2 != raulInd.end(); ++pIter2)
{
const MeshFacet &rclFacet = rclFAry[*pIter2];
for (int i = 0; i < 3; i++)
@@ -348,7 +348,7 @@ void MeshAlgorithm::GetFacetBorders (const std::vector<unsigned long> &raulInd,
{
// naechste anliegende Kante suchen
std::list<std::pair<unsigned long, unsigned long> >::iterator pEI;
for (pEI = aclEdges.begin(); pEI != aclEdges.end(); pEI++)
for (pEI = aclEdges.begin(); pEI != aclEdges.end(); ++pEI)
{
if (pEI->first == ulLast)
{

10
src/Mod/Mesh/App/Core/Builder.cpp
View File

@@ -75,9 +75,9 @@ void MeshBuilder::Initialize (unsigned long ctFacets, bool deletion)
}
else
{
for (MeshPointArray::_TConstIterator it1 = _meshKernel._aclPointArray.begin(); it1 != _meshKernel._aclPointArray.end(); it1++)
for (MeshPointArray::_TConstIterator it1 = _meshKernel._aclPointArray.begin(); it1 != _meshKernel._aclPointArray.end(); ++it1)
{
MeshPointIterator pit = _points.insert(*it1);
MeshPointIterator pit = _points.insert(*it1);
_pointsIterator.push_back(pit);
}
_ptIdx = _points.size();
@@ -130,14 +130,14 @@ void MeshBuilder::AddFacet (Base::Vector3f* facetPoints, unsigned char flag, uns
int i = 0;
for (i = 0; i < 3; i++)
{
MeshPoint pt(facetPoints[i]);
MeshPoint pt(facetPoints[i]);
std::set<MeshPoint>::iterator p = _points.find(pt);
if (p == _points.end())
{
mf._aulPoints[i] = _ptIdx;
pt._ulProp = _ptIdx++;
// keep an iterator to the right vertex
MeshPointIterator it = _points.insert(pt);
MeshPointIterator it = _points.insert(pt);
_pointsIterator.push_back(it);
}
else
@@ -156,7 +156,7 @@ void MeshBuilder::SetNeighbourhood ()
std::set<Edge> edges;
int facetIdx = 0;
for (MeshFacetArray::_TIterator it = _meshKernel._aclFacetArray.begin(); it != _meshKernel._aclFacetArray.end(); it++)
for (MeshFacetArray::_TIterator it = _meshKernel._aclFacetArray.begin(); it != _meshKernel._aclFacetArray.end(); ++it)
{
this->_seq->next(true); // allow to cancel
MeshFacet& mf = *it;

16
src/Mod/Mesh/App/Core/Elements.cpp
View File

@@ -64,22 +64,22 @@ unsigned long MeshPointArray::GetOrAddIndex (const MeshPoint &rclPoint)
void MeshPointArray::SetFlag (MeshPoint::TFlagType tF) const
{
for (MeshPointArray::_TConstIterator i = begin(); i < end(); i++) i->SetFlag(tF);
for (MeshPointArray::_TConstIterator i = begin(); i < end(); ++i) i->SetFlag(tF);
}
void MeshPointArray::ResetFlag (MeshPoint::TFlagType tF) const
{
for (MeshPointArray::_TConstIterator i = begin(); i < end(); i++) i->ResetFlag(tF);
for (MeshPointArray::_TConstIterator i = begin(); i < end(); ++i) i->ResetFlag(tF);
}
void MeshPointArray::SetProperty (unsigned long ulVal) const
{
for (_TConstIterator pP = begin(); pP != end(); pP++) pP->SetProperty(ulVal);
for (_TConstIterator pP = begin(); pP != end(); ++pP) pP->SetProperty(ulVal);
}
void MeshPointArray::ResetInvalid (void) const
{
for (_TConstIterator pP = begin(); pP != end(); pP++) pP->ResetInvalid();
for (_TConstIterator pP = begin(); pP != end(); ++pP) pP->ResetInvalid();
}
MeshPointArray& MeshPointArray::operator = (const MeshPointArray &rclPAry)
@@ -134,22 +134,22 @@ void MeshFacetArray::DecrementIndices (unsigned long ulIndex)
void MeshFacetArray::SetFlag (MeshFacet::TFlagType tF) const
{
for (MeshFacetArray::_TConstIterator i = begin(); i < end(); i++) i->SetFlag(tF);
for (MeshFacetArray::_TConstIterator i = begin(); i < end(); ++i) i->SetFlag(tF);
}
void MeshFacetArray::ResetFlag (MeshFacet::TFlagType tF) const
{
for (MeshFacetArray::_TConstIterator i = begin(); i < end(); i++) i->ResetFlag(tF);
for (MeshFacetArray::_TConstIterator i = begin(); i < end(); ++i) i->ResetFlag(tF);
}
void MeshFacetArray::SetProperty (unsigned long ulVal) const
{
for (_TConstIterator pF = begin(); pF != end(); pF++) pF->SetProperty(ulVal);
for (_TConstIterator pF = begin(); pF != end(); ++pF) pF->SetProperty(ulVal);
}
void MeshFacetArray::ResetInvalid (void) const
{
for (_TConstIterator pF = begin(); pF != end(); pF++) pF->ResetInvalid();
for (_TConstIterator pF = begin(); pF != end(); ++pF) pF->ResetInvalid();
}
MeshFacetArray& MeshFacetArray::operator = (const MeshFacetArray &rclFAry)

14
src/Mod/Mesh/App/Core/Evaluation.cpp
View File

@@ -337,7 +337,7 @@ bool MeshEvalTopology::Evaluate ()
// build up an array of edges
MeshFacetArray::_TConstIterator pI;
Base::SequencerLauncher seq("Checking topology...", rclFAry.size());
for (pI = rclFAry.begin(); pI != rclFAry.end(); pI++) {
for (pI = rclFAry.begin(); pI != rclFAry.end(); ++pI) {
for (int i = 0; i < 3; i++) {
Edge_Index item;
item.p0 = std::min<unsigned long>(pI->_aulPoints[i], pI->_aulPoints[(i+1)%3]);
@@ -390,7 +390,7 @@ void MeshEvalTopology::GetFacetManifolds (std::vector<unsigned long> &raclFacetI
const MeshFacetArray& rclFAry = _rclMesh.GetFacets();
MeshFacetArray::_TConstIterator pI;
for (pI = rclFAry.begin(); pI != rclFAry.end(); pI++) {
for (pI = rclFAry.begin(); pI != rclFAry.end(); ++pI) {
for (int i = 0; i < 3; i++) {
unsigned long ulPt0 = std::min<unsigned long>(pI->_aulPoints[i], pI->_aulPoints[(i+1)%3]);
unsigned long ulPt1 = std::max<unsigned long>(pI->_aulPoints[i], pI->_aulPoints[(i+1)%3]);
@@ -526,7 +526,7 @@ bool MeshEvalSingleFacet::Evaluate ()
//
//
// build edge <=> facet map
for (pI = rclFAry.begin(); pI != rclFAry.end(); pI++)
for (pI = rclFAry.begin(); pI != rclFAry.end(); ++pI)
{
for (int i = 0; i < 3; i++)
{
@@ -537,7 +537,7 @@ bool MeshEvalSingleFacet::Evaluate ()
}
// now search for single links
for (std::vector<std::list<unsigned long> >::const_iterator pMF = aclMf.begin(); pMF != aclMf.end(); pMF++)
for (std::vector<std::list<unsigned long> >::const_iterator pMF = aclMf.begin(); pMF != aclMf.end(); ++pMF)
{
std::list<unsigned long> aulManifolds;
for (std::list<unsigned long>::const_iterator pF = pMF->begin(); pF != pMF->end(); ++pF)
@@ -809,7 +809,7 @@ bool MeshEvalNeighbourhood::Evaluate ()
// build up an array of edges
MeshFacetArray::_TConstIterator pI;
Base::SequencerLauncher seq("Checking indices...", rclFAry.size());
for (pI = rclFAry.begin(); pI != rclFAry.end(); pI++) {
for (pI = rclFAry.begin(); pI != rclFAry.end(); ++pI) {
for (int i = 0; i < 3; i++) {
Edge_Index item;
item.p0 = std::min<unsigned long>(pI->_aulPoints[i], pI->_aulPoints[(i+1)%3]);
@@ -875,7 +875,7 @@ std::vector<unsigned long> MeshEvalNeighbourhood::GetIndices() const
// build up an array of edges
MeshFacetArray::_TConstIterator pI;
Base::SequencerLauncher seq("Checking indices...", rclFAry.size());
for (pI = rclFAry.begin(); pI != rclFAry.end(); pI++) {
for (pI = rclFAry.begin(); pI != rclFAry.end(); ++pI) {
for (int i = 0; i < 3; i++) {
Edge_Index item;
item.p0 = std::min<unsigned long>(pI->_aulPoints[i], pI->_aulPoints[(i+1)%3]);
@@ -951,7 +951,7 @@ void MeshKernel::RebuildNeighbours (unsigned long index)
// build up an array of edges
MeshFacetArray::_TConstIterator pI;
MeshFacetArray::_TConstIterator pB = this->_aclFacetArray.begin();
for (pI = pB + index; pI != this->_aclFacetArray.end(); pI++) {
for (pI = pB + index; pI != this->_aclFacetArray.end(); ++pI) {
for (int i = 0; i < 3; i++) {
Edge_Index item;
item.p0 = std::min<unsigned long>(pI->_aulPoints[i], pI->_aulPoints[(i+1)%3]);

12
src/Mod/Mesh/App/Core/MeshIO.cpp
View File

@@ -1394,7 +1394,7 @@ bool MeshInput::LoadNastran (std::istream &rstrIn)
index = 0;
else
index = mTria.rbegin()->first + 1;
for (std::map <int, QUAD>::iterator QI=mQuad.begin(); QI!=mQuad.end(); QI++) {
for (std::map <int, QUAD>::iterator QI=mQuad.begin(); QI!=mQuad.end(); ++QI) {
for (int i = 0; i < 2; i++) {
float fDx = mNode[(*QI).second.iV[i+2]].x - mNode[(*QI).second.iV[i]].x;
float fDy = mNode[(*QI).second.iV[i+2]].y - mNode[(*QI).second.iV[i]].y;
@@ -1425,13 +1425,13 @@ bool MeshInput::LoadNastran (std::istream &rstrIn)
// Applying the nodes
vVertices.reserve(mNode.size());
for (std::map<int, NODE>::iterator MI=mNode.begin(); MI!=mNode.end(); MI++) {
for (std::map<int, NODE>::iterator MI=mNode.begin(); MI!=mNode.end(); ++MI) {
vVertices.push_back(Base::Vector3f(MI->second.x, MI->second.y, MI->second.z));
}
// Converting data to Mesh. Negative conversion for right orientation of normal-vectors.
vTriangle.reserve(mTria.size());
for (std::map<int, TRIA>::iterator MI=mTria.begin(); MI!=mTria.end(); MI++) {
for (std::map<int, TRIA>::iterator MI=mTria.begin(); MI!=mTria.end(); ++MI) {
clMeshFacet._aulPoints[0] = (*MI).second.iV[1];
clMeshFacet._aulPoints[1] = (*MI).second.iV[0];
clMeshFacet._aulPoints[2] = (*MI).second.iV[2];
@@ -2022,7 +2022,7 @@ void MeshOutput::SaveXML (Base::Writer &writer) const
writer.incInd();
if (this->apply_transform) {
Base::Vector3f pt;
for (MeshPointArray::_TConstIterator itp = rPoints.begin(); itp != rPoints.end(); itp++) {
for (MeshPointArray::_TConstIterator itp = rPoints.begin(); itp != rPoints.end(); ++itp) {
pt = this->_transform * *itp;
writer.Stream() << writer.ind() << "<P "
<< "x=\"" << pt.x << "\" "
@@ -2032,7 +2032,7 @@ void MeshOutput::SaveXML (Base::Writer &writer) const
}
}
else {
for (MeshPointArray::_TConstIterator itp = rPoints.begin(); itp != rPoints.end(); itp++) {
for (MeshPointArray::_TConstIterator itp = rPoints.begin(); itp != rPoints.end(); ++itp) {
writer.Stream() << writer.ind() << "<P "
<< "x=\"" << itp->x << "\" "
<< "y=\"" << itp->y << "\" "
@@ -2047,7 +2047,7 @@ void MeshOutput::SaveXML (Base::Writer &writer) const
writer.Stream() << writer.ind() << "<Faces Count=\"" << _rclMesh.CountFacets() << "\">" << std::endl;
writer.incInd();
for (MeshFacetArray::_TConstIterator it = rFacets.begin(); it != rFacets.end(); it++) {
for (MeshFacetArray::_TConstIterator it = rFacets.begin(); it != rFacets.end(); ++it) {
writer.Stream() << writer.ind() << "<F "
<< "p0=\"" << it->_aulPoints[0] << "\" "
<< "p1=\"" << it->_aulPoints[1] << "\" "

6
src/Mod/Mesh/App/Core/MeshKernel.cpp
View File

@@ -1031,14 +1031,14 @@ void MeshKernel::GetEdges (std::vector<MeshGeomEdge>& edges) const
{
std::set<MeshBuilder::Edge> tmp;
for (MeshFacetArray::_TConstIterator it = _aclFacetArray.begin(); it != _aclFacetArray.end(); it++) {
for (MeshFacetArray::_TConstIterator it = _aclFacetArray.begin(); it != _aclFacetArray.end(); ++it) {
for (int i = 0; i < 3; i++) {
tmp.insert(MeshBuilder::Edge(it->_aulPoints[i], it->_aulPoints[(i+1)%3], it->_aulNeighbours[i]));
}
}
edges.reserve(tmp.size());
for (std::set<MeshBuilder::Edge>::iterator it2 = tmp.begin(); it2 != tmp.end(); it2++) {
for (std::set<MeshBuilder::Edge>::iterator it2 = tmp.begin(); it2 != tmp.end(); ++it2) {
MeshGeomEdge edge;
edge._aclPoints[0] = this->_aclPointArray[it2->pt1];
edge._aclPoints[1] = this->_aclPointArray[it2->pt2];
@@ -1052,7 +1052,7 @@ unsigned long MeshKernel::CountEdges (void) const
{
unsigned long openEdges = 0, closedEdges = 0;
for (MeshFacetArray::_TConstIterator it = _aclFacetArray.begin(); it != _aclFacetArray.end(); it++) {
for (MeshFacetArray::_TConstIterator it = _aclFacetArray.begin(); it != _aclFacetArray.end(); ++it) {
for (int i = 0; i < 3; i++) {
if (it->_aulNeighbours[i] == ULONG_MAX)
openEdges++;

10
src/Mod/Mesh/App/Core/SetOperations.cpp
View File

@@ -198,13 +198,13 @@ void SetOperations::Cut (std::set<unsigned long>& facetsCuttingEdge0, std::set<u
grid1.GetElements(gx1, gy1, gz1, vecFacets1);
std::set<unsigned long>::iterator it1;
for (it1 = vecFacets1.begin(); it1 != vecFacets1.end(); it1++)
for (it1 = vecFacets1.begin(); it1 != vecFacets1.end(); ++it1)
{
unsigned long fidx1 = *it1;
MeshGeomFacet f1 = _cutMesh0.GetFacet(*it1);
std::vector<unsigned long>::iterator it2;
for (it2 = vecFacets2.begin(); it2 != vecFacets2.end(); it2++)
for (it2 = vecFacets2.begin(); it2 != vecFacets2.end(); ++it2)
{
unsigned long fidx2 = *it2;
MeshGeomFacet f2 = _cutMesh1.GetFacet(fidx2);
@@ -292,8 +292,8 @@ void SetOperations::Cut (std::set<unsigned long>& facetsCuttingEdge0, std::set<u
}
} // if (f1.IntersectWithFacet(f2, p0, p1))
} // for (it2 = vecFacets2.begin(); it2 != vecFacets2.end(); it2++)
} // for (it1 = vecFacets1.begin(); it1 != vecFacets1.end(); it1++)
} // for (it2 = vecFacets2.begin(); it2 != vecFacets2.end(); ++it2)
} // for (it1 = vecFacets1.begin(); it1 != vecFacets1.end(); ++it1)
} // if (vecFacets2.size() > 0)
} // if (grid1.GetCtElements(gx1, gy1, gz1) > 0)
} // for (gz1 = 0; gz1 < ctGz1; gz1++)
@@ -435,7 +435,7 @@ void SetOperations::TriangulateMesh (const MeshKernel &cutMesh, int side)
_newMeshFacets[side].push_back(facet);
} // for (i = 0; i < (out->numberoftriangles * 3); i += 3)
} // for (it1 = _facet2points[side].begin(); it1 != _facet2points[side].end(); it1++)
} // for (it1 = _facet2points[side].begin(); it1 != _facet2points[side].end(); ++it1)
}
void SetOperations::CollectFacets (int side, float mult)

6
src/Mod/Mesh/App/Core/TopoAlgorithm.cpp
View File

@@ -146,7 +146,7 @@ void MeshTopoAlgorithm::OptimizeTopology(float fMaxAngle)
// For each internal edge get the adjacent facets. When doing an edge swap we must update
// this structure.
std::map<std::pair<unsigned long, unsigned long>, std::vector<unsigned long> > aEdge2Face;
for (MeshFacetArray::_TIterator pI = _rclMesh._aclFacetArray.begin(); pI != _rclMesh._aclFacetArray.end(); pI++)
for (MeshFacetArray::_TIterator pI = _rclMesh._aclFacetArray.begin(); pI != _rclMesh._aclFacetArray.end(); ++pI)
{
for (int i = 0; i < 3; i++)
{
@@ -338,7 +338,7 @@ void MeshTopoAlgorithm::DelaunayFlip(float fMaxAngle)
// For each internal edge get the adjacent facets.
std::set<std::pair<unsigned long, unsigned long> > aEdge2Face;
unsigned long index = 0;
for (MeshFacetArray::_TIterator pI = _rclMesh._aclFacetArray.begin(); pI != _rclMesh._aclFacetArray.end(); pI++, index++) {
for (MeshFacetArray::_TIterator pI = _rclMesh._aclFacetArray.begin(); pI != _rclMesh._aclFacetArray.end(); ++pI, index++) {
for (int i = 0; i < 3; i++) {
// ignore open edges
if (pI->_aulNeighbours[i] != ULONG_MAX) {
@@ -1386,7 +1386,7 @@ void MeshTopoAlgorithm::HarmonizeNormals (void)
void MeshTopoAlgorithm::FlipNormals (void)
{
for (MeshFacetArray::_TIterator i = _rclMesh._aclFacetArray.begin(); i < _rclMesh._aclFacetArray.end(); i++)
for (MeshFacetArray::_TIterator i = _rclMesh._aclFacetArray.begin(); i < _rclMesh._aclFacetArray.end(); ++i)
i->FlipNormal();
}

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

@@ -697,7 +697,7 @@ void MeshObject::offset(float fSize)
unsigned int i = 0;
// go through all the vertex normals
for (std::vector<Base::Vector3f>::iterator It= normals.begin();It != normals.end();It++,i++)
for (std::vector<Base::Vector3f>::iterator It= normals.begin();It != normals.end();++It,i++)
// and move each mesh point in the normal direction
_kernel.MovePoint(i,It->Normalize() * fSize);
_kernel.RecalcBoundBox();
@@ -717,7 +717,7 @@ void MeshObject::offsetSpecial2(float fSize)
unsigned int i = 0;
// go through all the vertex normals
for (std::vector<Base::Vector3f>::iterator It= PointNormals.begin();It != PointNormals.end();It++,i++){
for (std::vector<Base::Vector3f>::iterator It= PointNormals.begin();It != PointNormals.end();++It,i++){
builder.addSingleLine(_kernel.GetPoint(i),_kernel.GetPoint(i)+It->Normalize() * fSize);
// and move each mesh point in the normal direction
_kernel.MovePoint(i,It->Normalize() * fSize);
@@ -763,7 +763,7 @@ void MeshObject::offsetSpecial(float fSize, float zmax, float zmin)
unsigned int i = 0;
// go through all the vertex normals
for (std::vector<Base::Vector3f>::iterator It= normals.begin();It != normals.end();It++,i++) {
for (std::vector<Base::Vector3f>::iterator It= normals.begin();It != normals.end();++It,i++) {
Base::Vector3f Pnt = _kernel.GetPoint(i);
if (Pnt.z < zmax && Pnt.z > zmin) {
Pnt.z = 0;