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;

6
src/Mod/MeshPart/App/MeshAlgos.cpp
View File

@@ -54,7 +54,7 @@ void MeshAlgos::offset(MeshCore::MeshKernel* Mesh, float fSize)
unsigned int i = 0;
// go throug all the Vertex normales
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
Mesh->MovePoint(i,It->Normalize() * fSize);
Mesh->RecalcBoundBox();
@@ -76,7 +76,7 @@ void MeshAlgos::offsetSpecial2(MeshCore::MeshKernel* Mesh, float fSize)
unsigned int i = 0;
// go throug all the Vertex normales
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(Mesh->GetPoint(i),Mesh->GetPoint(i)+It->Normalize() * fSize);
// and move each mesh point in the normal direction
Mesh->MovePoint(i,It->Normalize() * fSize);
@@ -126,7 +126,7 @@ void MeshAlgos::offsetSpecial(MeshCore::MeshKernel* Mesh, float fSize, float zma
unsigned int i = 0;
// go throug all the Vertex normales
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 = Mesh->GetPoint(i);

18
src/Mod/PartDesign/App/FeatureMultiTransform.cpp
View File

@@ -55,7 +55,7 @@ void MultiTransform::positionBySupport(void)
PartDesign::Transformed::positionBySupport();
std::vector<App::DocumentObject*> transFeatures = Transformations.getValues();
for (std::vector<App::DocumentObject*>::const_iterator f = transFeatures.begin();
f != transFeatures.end(); f++) {
f != transFeatures.end(); ++f) {
if (!((*f)->getTypeId().isDerivedFrom(PartDesign::Transformed::getClassTypeId())))
throw Base::Exception("Transformation features must be subclasses of Transformed");
PartDesign::Transformed* transFeature = static_cast<PartDesign::Transformed*>(*f);
@@ -95,7 +95,7 @@ const std::list<gp_Trsf> MultiTransform::getTransformations(const std::vector<Ap
std::list<gp_Pnt> cogs;
std::vector<App::DocumentObject*>::const_iterator f;
for (f = transFeatures.begin(); f != transFeatures.end(); f++) {
for (f = transFeatures.begin(); f != transFeatures.end(); ++f) {
if (!((*f)->getTypeId().isDerivedFrom(PartDesign::Transformed::getClassTypeId())))
throw Base::Exception("Transformation features must be subclasses of Transformed");
PartDesign::Transformed* transFeature = static_cast<PartDesign::Transformed*>(*f);
@@ -104,7 +104,7 @@ const std::list<gp_Trsf> MultiTransform::getTransformations(const std::vector<Ap
if (result.empty()) {
// First transformation Feature
result = newTransformations;
for (std::list<gp_Trsf>::const_iterator nt = newTransformations.begin(); nt != newTransformations.end(); nt++) {
for (std::list<gp_Trsf>::const_iterator nt = newTransformations.begin(); nt != newTransformations.end(); ++nt) {
cogs.push_back(cog.Transformed(*nt));
}
} else {
@@ -132,7 +132,7 @@ const std::list<gp_Trsf> MultiTransform::getTransformations(const std::vector<Ap
std::list<gp_Trsf>::const_iterator ot = oldTransformations.begin();
std::list<gp_Pnt>::const_iterator oc = oldCogs.begin();
for (std::list<gp_Trsf>::const_iterator nt = newTransformations.begin(); nt != newTransformations.end(); nt++) {
for (std::list<gp_Trsf>::const_iterator nt = newTransformations.begin(); nt != newTransformations.end(); ++nt) {
for (unsigned s = 0; s < sliceLength; s++) {
gp_Trsf trans;
double factor = nt->ScaleFactor(); // extract scale factor
@@ -146,8 +146,8 @@ const std::list<gp_Trsf> MultiTransform::getTransformations(const std::vector<Ap
cogs.push_back(oc->Transformed(*nt));
}
result.push_back(trans);
ot++;
oc++;
++ot;
++oc;
}
}
} else {
@@ -157,13 +157,13 @@ const std::list<gp_Trsf> MultiTransform::getTransformations(const std::vector<Ap
// a11 a12 b1 a11*b1 a12*b1 a11*b2 a12*b2 a11*b3 a12*b3
// a21 a22 mul b2 = a21*b1 a22*b1 a21*b2 a22*b2 a21*b3 a22*b3
// b3
for (std::list<gp_Trsf>::const_iterator nt = newTransformations.begin(); nt != newTransformations.end(); nt++) {
for (std::list<gp_Trsf>::const_iterator nt = newTransformations.begin(); nt != newTransformations.end(); ++nt) {
std::list<gp_Pnt>::const_iterator oc = oldCogs.begin();
for (std::list<gp_Trsf>::const_iterator ot = oldTransformations.begin(); ot != oldTransformations.end(); ot++) {
for (std::list<gp_Trsf>::const_iterator ot = oldTransformations.begin(); ot != oldTransformations.end(); ++ot) {
result.push_back((*nt) * (*ot));
cogs.push_back(oc->Transformed(*nt));
oc++;
++oc;
}
}
}

28
src/Mod/PartDesign/App/FeatureTransformed.cpp
View File

@@ -207,7 +207,7 @@ App::DocumentObjectExecReturn *Transformed::execute(void)
// Original separately. This way it is easier to discover what feature causes a fuse/cut
// to fail. The downside is that performance suffers when there are many originals. But it seems
// safe to assume that in most cases there are few originals and many transformations
for (std::vector<App::DocumentObject*>::const_iterator o = originals.begin(); o != originals.end(); o++)
for (std::vector<App::DocumentObject*>::const_iterator o = originals.begin(); o != originals.end(); ++o)
{
// Extract the original shape and determine whether to cut or to fuse
TopoDS_Shape shape;
@@ -234,8 +234,8 @@ App::DocumentObjectExecReturn *Transformed::execute(void)
std::vector<TopoDS_Shape> v_transformedShapes;
std::vector<gp_Trsf>::const_iterator t = transformations.begin();
t++; // Skip first transformation, which is always the identity transformation
for (; t != transformations.end(); t++) {
++t; // Skip first transformation, which is always the identity transformation
for (; t != transformations.end(); ++t) {
// Make an explicit copy of the shape because the "true" parameter to BRepBuilderAPI_Transform
// seems to be pretty broken
BRepBuilderAPI_Copy copy(shape);
@@ -281,10 +281,10 @@ App::DocumentObjectExecReturn *Transformed::execute(void)
std::vector<TopoDS_Shape>::iterator s1 = v_transformedShapes.begin();
std::vector<TopoDS_Shape>::iterator s2 = s1;
s2++;
++s2;
std::vector<std::vector<gp_Trsf>::const_iterator>::const_iterator t1 = v_transformations.begin();
std::vector<std::vector<gp_Trsf>::const_iterator>::const_iterator t2 = t1;
t2++;
++t2;
for (; s2 != v_transformedShapes.end();) {
// Check intersection with the original
if (Part::checkIntersection(shape, *s1, false, false)) {
@@ -292,19 +292,19 @@ App::DocumentObjectExecReturn *Transformed::execute(void)
overlapping_trsfms.insert(*t1);
}
// Check intersection with other transformations
for (; s2 != v_transformedShapes.end(); s2++, t2++)
for (; s2 != v_transformedShapes.end(); ++s2, ++t2)
if (Part::checkIntersection(*s1, *s2, false, false)) {
rejected_iterators.insert(s1);
rejected_iterators.insert(s2);
overlapping_trsfms.insert(*t1);
overlapping_trsfms.insert(*t2);
}
s1++;
++s1;
s2 = s1;
s2++;
t1++;
++s2;
++t1;
t2 = t1;
t2++;
++t2;
}
// Check intersection of last transformation with the original
if (Part::checkIntersection(shape, *s1, false, false)) {
@@ -313,7 +313,7 @@ App::DocumentObjectExecReturn *Transformed::execute(void)
}
for (std::set<std::vector<TopoDS_Shape>::iterator>::reverse_iterator it = rejected_iterators.rbegin();
it != rejected_iterators.rend(); it++)
it != rejected_iterators.rend(); ++it)
v_transformedShapes.erase(*it);
}
@@ -324,7 +324,7 @@ App::DocumentObjectExecReturn *Transformed::execute(void)
BRep_Builder builder;
TopoDS_Compound transformedShapes;
builder.MakeCompound(transformedShapes);
for (std::vector<TopoDS_Shape>::const_iterator s = v_transformedShapes.begin(); s != v_transformedShapes.end(); s++)
for (std::vector<TopoDS_Shape>::const_iterator s = v_transformedShapes.begin(); s != v_transformedShapes.end(); ++s)
builder.Add(transformedShapes, *s);
// Fuse/Cut the compounded transformed shapes with the support
@@ -354,11 +354,11 @@ App::DocumentObjectExecReturn *Transformed::execute(void)
if (!overlapping_trsfms.empty())
// Concentrate on overlapping shapes since they are more serious
for (std::set<std::vector<gp_Trsf>::const_iterator>::const_iterator it = overlapping_trsfms.begin();
it != overlapping_trsfms.end(); it++)
it != overlapping_trsfms.end(); ++it)
rejected.push_back(**it);
else
for (std::set<std::vector<gp_Trsf>::const_iterator>::const_iterator it = nointersect_trsfms.begin();
it != nointersect_trsfms.end(); it++)
it != nointersect_trsfms.end(); ++it)
rejected.push_back(**it);
this->Shape.setValue(support);

4
src/Mod/PartDesign/Gui/FeaturePickDialog.cpp
View File

@@ -43,7 +43,7 @@ FeaturePickDialog::FeaturePickDialog(std::vector<App::DocumentObject*>& objects)
: QDialog(Gui::getMainWindow()), ui(new Ui_FeaturePickDialog)
{
ui->setupUi(this);
for (std::vector<App::DocumentObject*>::const_iterator o = objects.begin(); o != objects.end(); o++)
for (std::vector<App::DocumentObject*>::const_iterator o = objects.begin(); o != objects.end(); ++o)
ui->listWidget->addItem(QString::fromAscii((*o)->getNameInDocument()));
}
@@ -55,7 +55,7 @@ FeaturePickDialog::~FeaturePickDialog()
std::vector<App::DocumentObject*> FeaturePickDialog::getFeatures() {
std::vector<App::DocumentObject*> result;
for (std::vector<QString>::const_iterator s = features.begin(); s != features.end(); s++)
for (std::vector<QString>::const_iterator s = features.begin(); s != features.end(); ++s)
result.push_back(App::GetApplication().getActiveDocument()->getObject(s->toAscii().data()));
return result;

4
src/Mod/PartDesign/Gui/TaskDraftParameters.cpp
View File

@@ -89,7 +89,7 @@ TaskDraftParameters::TaskDraftParameters(ViewProviderDraft *DraftView,QWidget *p
ui->checkReverse->setChecked(r);
std::vector<std::string> strings = pcDraft->Base.getSubValues();
for (std::vector<std::string>::const_iterator i = strings.begin(); i != strings.end(); i++)
for (std::vector<std::string>::const_iterator i = strings.begin(); i != strings.end(); ++i)
{
ui->listWidgetFaces->insertItem(0, QString::fromStdString(*i));
}
@@ -151,7 +151,7 @@ void TaskDraftParameters::onSelectionChanged(const Gui::SelectionChanges& msg)
pcDraft->Base.setValue(base, faces);
QList<QListWidgetItem*> items = ui->listWidgetFaces->findItems(QString::fromStdString(subName), Qt::MatchExactly);
if (!items.empty()) {
for (QList<QListWidgetItem*>::const_iterator i = items.begin(); i != items.end(); i++) {
for (QList<QListWidgetItem*>::const_iterator i = items.begin(); i != items.end(); ++i) {
QListWidgetItem* it = ui->listWidgetFaces->takeItem(ui->listWidgetFaces->row(*i));
delete it;
}

2
src/Mod/PartDesign/Gui/TaskLinearPatternParameters.cpp
View File

@@ -118,7 +118,7 @@ void TaskLinearPatternParameters::setupUI()
// Fill data into dialog elements
ui->lineOriginal->setEnabled(false);
for (std::vector<App::DocumentObject*>::const_iterator i = originals.begin(); i != originals.end(); i++)
for (std::vector<App::DocumentObject*>::const_iterator i = originals.begin(); i != originals.end(); ++i)
{
if ((*i) != NULL) { // find the first valid original
ui->lineOriginal->setText(QString::fromAscii((*i)->getNameInDocument()));

2
src/Mod/PartDesign/Gui/TaskMirroredParameters.cpp
View File

@@ -104,7 +104,7 @@ void TaskMirroredParameters::setupUI()
// Fill data into dialog elements
ui->lineOriginal->setEnabled(false);
for (std::vector<App::DocumentObject*>::const_iterator i = originals.begin(); i != originals.end(); i++)
for (std::vector<App::DocumentObject*>::const_iterator i = originals.begin(); i != originals.end(); ++i)
{
if ((*i) != NULL) { // find the first valid original
ui->lineOriginal->setText(QString::fromAscii((*i)->getNameInDocument()));

2
src/Mod/PartDesign/Gui/TaskPolarPatternParameters.cpp
View File

@@ -118,7 +118,7 @@ void TaskPolarPatternParameters::setupUI()
// Fill data into dialog elements
ui->lineOriginal->setEnabled(false);
for (std::vector<App::DocumentObject*>::const_iterator i = originals.begin(); i != originals.end(); i++)
for (std::vector<App::DocumentObject*>::const_iterator i = originals.begin(); i != originals.end(); ++i)
{
if ((*i) != NULL) { // find the first valid original
ui->lineOriginal->setText(QString::fromAscii((*i)->getNameInDocument()));

2
src/Mod/PartDesign/Gui/TaskScaledParameters.cpp
View File

@@ -103,7 +103,7 @@ void TaskScaledParameters::setupUI()
// Fill data into dialog elements
ui->lineOriginal->setEnabled(false);
for (std::vector<App::DocumentObject*>::const_iterator i = originals.begin(); i != originals.end(); i++)
for (std::vector<App::DocumentObject*>::const_iterator i = originals.begin(); i != originals.end(); ++i)
{
if ((*i) != NULL) { // find the first valid original
ui->lineOriginal->setText(QString::fromAscii((*i)->getNameInDocument()));

2
src/Mod/Path/Gui/Command.cpp
View File

@@ -67,7 +67,7 @@ void CmdPathCompound::activated(int iMsg)
std::ostringstream cmd;
cmd << "[";
Path::Feature *pcPathObject;
for (std::vector<Gui::SelectionSingleton::SelObj>::const_iterator it=Sel.begin();it!=Sel.end();it++) {
for (std::vector<Gui::SelectionSingleton::SelObj>::const_iterator it=Sel.begin();it!=Sel.end();++it) {
if ((*it).pObject->getTypeId().isDerivedFrom(Path::Feature::getClassTypeId())) {
pcPathObject = dynamic_cast<Path::Feature*>((*it).pObject);
cmd << "FreeCAD.activeDocument()." << pcPathObject->getNameInDocument() << ",";

2
src/Mod/Path/Gui/DlgProcessorChooser.cpp
View File

@@ -47,7 +47,7 @@ DlgProcessorChooser::DlgProcessorChooser(std::vector<std::string> &scriptnames)
{
ui->setupUi(this);
ui->comboBox->addItem(tr("None"));
for (std::vector<std::string>::const_iterator it = scriptnames.begin(); it != scriptnames.end(); it++)
for (std::vector<std::string>::const_iterator it = scriptnames.begin(); it != scriptnames.end(); ++it)
ui->comboBox->addItem(QString::fromUtf8((*it).c_str()));
QMetaObject::connectSlotsByName(this);
}

10
src/Mod/Raytracing/App/PovTools.cpp
View File

@@ -105,35 +105,35 @@ void PovTools::writeCameraVec(const char* FileName, const std::vector<CamDef>& C
// writing Camera positions
out << "// Array of positions\n"
<< "#declare CamPos = array[" << CamVec.size() << "] {\n";
for (It = CamVec.begin(); It != CamVec.end(); It++)
for (It = CamVec.begin(); It != CamVec.end(); ++It)
out << " <" << It->CamPos.X() <<"," << It->CamPos.Z() <<"," << It->CamPos.Y() <<">,\n";
out << "};\n"
// writing Camera Direction vector
<< "// Array of Directions (only for special calculations)\n"
<< "#declare CamDir = array[" << CamVec.size() << "] {\n";
for (It = CamVec.begin(); It != CamVec.end(); It++)
for (It = CamVec.begin(); It != CamVec.end(); ++It)
out << " <" << It->CamDir.X() <<"," << It->CamDir.Z() <<"," << It->CamDir.Y() <<">,\n";
out << "};\n"
// writing lookat
<< "// Array of Look At positions\n"
<< "#declare LookAt = array[" << CamVec.size() << "] {\n";
for (It = CamVec.begin(); It != CamVec.end(); It++)
for (It = CamVec.begin(); It != CamVec.end(); ++It)
out << " <" << It->LookAt.X() <<"," << It->LookAt.Z() <<"," << It->LookAt.Y() <<">,\n";
out << "};\n"
// writing the Up Vector
<< "// // Array of up vectors\n"
<< "#declare Up = array[" << CamVec.size() << "] {\n";
for (It = CamVec.begin(); It != CamVec.end(); It++)
for (It = CamVec.begin(); It != CamVec.end(); ++It)
out << " <" << It->Up.X() <<"," << It->Up.Z() <<"," << It->Up.Y() <<">,\n";
out << "};\n"
// array of zoom factors
<< "// // Array of up vectors\n"
<< "#declare CamZoom = array[" << CamVec.size() << "] {\n";
for (It = CamVec.begin(); It != CamVec.end(); It++)
for (It = CamVec.begin(); It != CamVec.end(); ++It)
out << " 45,\n";
out << "};\n";

10
src/Mod/ReverseEngineering/App/ApproxSurface.cpp
View File

@@ -695,18 +695,20 @@ bool ParameterCorrection::GetUVParameters(double fSizeFactor)
// Berechne die u,v-Parameter mit u,v aus [0,1]
_pvcUVParam->Init(gp_Pnt2d(0.0f, 0.0f));
int ii=0;
if (clBBox.fMaxX - clBBox.fMinX >= clBBox.fMaxY - clBBox.fMinY)
for (std::vector<Base::Vector2D>::iterator It2=vcProjPts.begin(); It2!=vcProjPts.end(); It2++)
if (clBBox.fMaxX - clBBox.fMinX >= clBBox.fMaxY - clBBox.fMinY) {
for (std::vector<Base::Vector2D>::iterator It2=vcProjPts.begin(); It2!=vcProjPts.end(); ++It2)
{
(*_pvcUVParam)(ii) = gp_Pnt2d((It2->fX-tx)/fDeltaX, (It2->fY-ty)/fDeltaY);
ii++;
}
else
for (std::vector<Base::Vector2D>::iterator It2=vcProjPts.begin(); It2!=vcProjPts.end(); It2++)
}
else {
for (std::vector<Base::Vector2D>::iterator It2=vcProjPts.begin(); It2!=vcProjPts.end(); ++It2)
{
(*_pvcUVParam)(ii) = gp_Pnt2d((It2->fY-ty)/fDeltaY, (It2->fX-tx)/fDeltaX);
ii++;
}
}
return true;
}

8
src/Mod/Sketcher/Gui/ViewProviderSketch.cpp
View File

@@ -4791,7 +4791,7 @@ bool ViewProviderSketch::onDelete(const std::vector<std::string> &subList)
}
std::set<int>::const_reverse_iterator rit;
for (rit = delConstraints.rbegin(); rit != delConstraints.rend(); rit++) {
for (rit = delConstraints.rbegin(); rit != delConstraints.rend(); ++rit) {
try {
Gui::Command::doCommand(Gui::Command::Doc,"App.ActiveDocument.%s.delConstraint(%i)"
,getObject()->getNameInDocument(), *rit);
@@ -4801,7 +4801,7 @@ bool ViewProviderSketch::onDelete(const std::vector<std::string> &subList)
}
}
for (rit = delCoincidents.rbegin(); rit != delCoincidents.rend(); rit++) {
for (rit = delCoincidents.rbegin(); rit != delCoincidents.rend(); ++rit) {
try {
Gui::Command::doCommand(Gui::Command::Doc,"App.ActiveDocument.%s.delConstraintOnPoint(%i)"
,getObject()->getNameInDocument(), *rit);
@@ -4811,7 +4811,7 @@ bool ViewProviderSketch::onDelete(const std::vector<std::string> &subList)
}
}
for (rit = delInternalGeometries.rbegin(); rit != delInternalGeometries.rend(); rit++) {
for (rit = delInternalGeometries.rbegin(); rit != delInternalGeometries.rend(); ++rit) {
try {
Gui::Command::doCommand(Gui::Command::Doc,"App.ActiveDocument.%s.delGeometry(%i)"
,getObject()->getNameInDocument(), *rit);
@@ -4821,7 +4821,7 @@ bool ViewProviderSketch::onDelete(const std::vector<std::string> &subList)
}
}
for (rit = delExternalGeometries.rbegin(); rit != delExternalGeometries.rend(); rit++) {
for (rit = delExternalGeometries.rbegin(); rit != delExternalGeometries.rend(); ++rit) {
try {
Gui::Command::doCommand(Gui::Command::Doc,"App.ActiveDocument.%s.delExternal(%i)"
,getObject()->getNameInDocument(), *rit);