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

Several fixes:

Browse Source 
+ use different iterator variable for nexted loops
+ avoid loss of data warnings
+ improve layout
This commit is contained in:
wmayer 2017-01-20 19:40:49 +01:00
parent 0955ccf594
commit 62b4782ed6
2 changed files with 60 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

112
src/Mod/Sketcher/App/SketchObject.cpp
View File

@ -2144,9 +2144,9 @@ int SketchObject::addSymmetric(const std::vector<int> &geoIdList, int refGeoId,
std::vector<Base::Vector3d> poles = geosymbsp->getPoles(); std::vector<Base::Vector3d> poles = geosymbsp->getPoles();
for(std::vector<Base::Vector3d>::iterator it = poles.begin(); it != poles.end(); ++it){ for(std::vector<Base::Vector3d>::iterator jt = poles.begin(); jt != poles.end(); ++jt){
(*it) = (*it) + 2.0*((*it).Perpendicular(refGeoLine->getStartPoint(),vectline)-(*it)); (*jt) = (*jt) + 2.0*((*jt).Perpendicular(refGeoLine->getStartPoint(),vectline)-(*jt));
} }
geosymbsp->setPoles(poles); geosymbsp->setPoles(poles);
@ -2671,14 +2671,14 @@ int SketchObject::addCopy(const std::vector<int> &geoIdList, const Base::Vector3
std::vector<Base::Vector3d> poles = geobsp->getPoles(); std::vector<Base::Vector3d> poles = geobsp->getPoles();
for(std::vector<Base::Vector3d>::iterator it = poles.begin(); it != poles.end(); ++it){ for(std::vector<Base::Vector3d>::iterator jt = poles.begin(); jt != poles.end(); ++jt){
(*it) = (*it) + double(x)*displacement + double(y)*perpendicularDisplacement; (*jt) = (*jt) + double(x)*displacement + double(y)*perpendicularDisplacement;
} }
geobsp->setPoles(poles); geobsp->setPoles(poles);
if(it == geoIdList.begin()) if (it == geoIdList.begin())
iterfirstpoint = geobsp->getStartPoint(); iterfirstpoint = geobsp->getStartPoint();
} }
else if(geocopy->getTypeId() == Part::GeomPoint::getClassTypeId()){ else if(geocopy->getTypeId() == Part::GeomPoint::getClassTypeId()){
@ -3492,7 +3492,7 @@ int SketchObject::DeleteUnusedInternalGeometry(int GeoId)
const std::vector< Sketcher::Constraint * > &vals = Constraints.getValues(); const std::vector< Sketcher::Constraint * > &vals = Constraints.getValues();
for (std::vector< Sketcher::Constraint * >::const_iterator it= vals.begin(); for (std::vector< Sketcher::Constraint * >::const_iterator it = vals.begin();
it != vals.end(); ++it) { it != vals.end(); ++it) {
if((*it)->Type == Sketcher::InternalAlignment && (*it)->Second == GeoId) if((*it)->Type == Sketcher::InternalAlignment && (*it)->Second == GeoId)
{ {
@ -3540,22 +3540,21 @@ int SketchObject::DeleteUnusedInternalGeometry(int GeoId)
std::vector<int> delgeometries; std::vector<int> delgeometries;
// those with less than 2 constraints must be removed // those with less than 2 constraints must be removed
if(focus2constraints<2) if (focus2constraints<2)
delgeometries.push_back(focus2elementindex); delgeometries.push_back(focus2elementindex);
if(focus1constraints<2) if (focus1constraints<2)
delgeometries.push_back(focus1elementindex); delgeometries.push_back(focus1elementindex);
if(minorconstraints<2) if (minorconstraints<2)
delgeometries.push_back(minorelementindex); delgeometries.push_back(minorelementindex);
if(majorconstraints<2) if (majorconstraints<2)
delgeometries.push_back(majorelementindex); delgeometries.push_back(majorelementindex);
std::sort(delgeometries.begin(), delgeometries.end()); // indices over an erased element get automatically updated!! std::sort(delgeometries.begin(), delgeometries.end()); // indices over an erased element get automatically updated!!
if(delgeometries.size()>0) if (delgeometries.size()>0) {
{
for (std::vector<int>::reverse_iterator it=delgeometries.rbegin(); it!=delgeometries.rend(); ++it) { for (std::vector<int>::reverse_iterator it=delgeometries.rbegin(); it!=delgeometries.rend(); ++it) {
delGeometry(*it); delGeometry(*it);
} }
@ -3572,21 +3571,19 @@ int SketchObject::DeleteUnusedInternalGeometry(int GeoId)
const std::vector< Sketcher::Constraint * > &vals = Constraints.getValues(); const std::vector< Sketcher::Constraint * > &vals = Constraints.getValues();
for (std::vector< Sketcher::Constraint * >::const_iterator it= vals.begin(); for (std::vector< Sketcher::Constraint * >::const_iterator it= vals.begin(); it != vals.end(); ++it) {
it != vals.end(); ++it) { if ((*it)->Type == Sketcher::InternalAlignment && (*it)->Second == GeoId) {
if((*it)->Type == Sketcher::InternalAlignment && (*it)->Second == GeoId) switch ((*it)->AlignmentType) {
{ case Sketcher::ParabolaFocus:
switch((*it)->AlignmentType){ focus1elementindex = (*it)->First;
case Sketcher::ParabolaFocus: break;
focus1elementindex=(*it)->First; default:
break; return -1;
default:
return -1;
} }
} }
} }
if(focus1elementindex!=-1) { if (focus1elementindex!=-1) {
// look for a line from focusgeoid:start to Geoid:mid_external // look for a line from focusgeoid:start to Geoid:mid_external
std::vector<int> focusgeoidlistgeoidlist; std::vector<int> focusgeoidlistgeoidlist;
std::vector<PointPos> focusposidlist; std::vector<PointPos> focusposidlist;
@ -3600,9 +3597,9 @@ int SketchObject::DeleteUnusedInternalGeometry(int GeoId)
if (!focusgeoidlistgeoidlist.empty() && !parabgeoidlistgeoidlist.empty()) { if (!focusgeoidlistgeoidlist.empty() && !parabgeoidlistgeoidlist.empty()) {
std::size_t i,j; std::size_t i,j;
for(i=0;i<focusgeoidlistgeoidlist.size();i++){ for (i=0;i<focusgeoidlistgeoidlist.size();i++) {
for(j=0;j<parabgeoidlistgeoidlist.size();j++) { for (j=0;j<parabgeoidlistgeoidlist.size();j++) {
if(focusgeoidlistgeoidlist[i] == parabgeoidlistgeoidlist[j]) { if (focusgeoidlistgeoidlist[i] == parabgeoidlistgeoidlist[j]) {
const Part::Geometry * geo = getGeometry(focusgeoidlistgeoidlist[i]); const Part::Geometry * geo = getGeometry(focusgeoidlistgeoidlist[i]);
if (geo && geo->getTypeId() == Part::GeomLineSegment::getClassTypeId()) { if (geo && geo->getTypeId() == Part::GeomLineSegment::getClassTypeId()) {
if((focusposidlist[i] == Sketcher::start && parabposidlist[j] == Sketcher::end) || if((focusposidlist[i] == Sketcher::start && parabposidlist[j] == Sketcher::end) ||
@ -3619,9 +3616,7 @@ int SketchObject::DeleteUnusedInternalGeometry(int GeoId)
int majorconstraints=0; // number of constraints associated to the geoid of the major axis other than the coincident ones int majorconstraints=0; // number of constraints associated to the geoid of the major axis other than the coincident ones
int focus1constraints=0; int focus1constraints=0;
for (std::vector< Sketcher::Constraint * >::const_iterator it= vals.begin(); for (std::vector< Sketcher::Constraint * >::const_iterator it= vals.begin(); it != vals.end(); ++it) {
it != vals.end(); ++it) {
if( (*it)->Second == majorelementindex || if( (*it)->Second == majorelementindex ||
(*it)->First == majorelementindex || (*it)->First == majorelementindex ||
(*it)->Third == majorelementindex) (*it)->Third == majorelementindex)
@ -3639,13 +3634,12 @@ int SketchObject::DeleteUnusedInternalGeometry(int GeoId)
majorelementindex = -1; majorelementindex = -1;
} }
if(majorelementindex == -1 && focus1elementindex !=-1 && focus1constraints<3) // focus has one coincident and one internal align if (majorelementindex == -1 && focus1elementindex !=-1 && focus1constraints<3) // focus has one coincident and one internal align
delgeometries.push_back(focus1elementindex); delgeometries.push_back(focus1elementindex);
std::sort(delgeometries.begin(), delgeometries.end()); // indices over an erased element get automatically updated!! std::sort(delgeometries.begin(), delgeometries.end()); // indices over an erased element get automatically updated!!
if(delgeometries.size()>0) if (delgeometries.size()>0) {
{
for (std::vector<int>::reverse_iterator it=delgeometries.rbegin(); it!=delgeometries.rend(); ++it) { for (std::vector<int>::reverse_iterator it=delgeometries.rbegin(); it!=delgeometries.rend(); ++it) {
delGeometry(*it); delGeometry(*it);
} }
@ -3653,7 +3647,7 @@ int SketchObject::DeleteUnusedInternalGeometry(int GeoId)
return delgeometries.size(); //number of deleted elements return delgeometries.size(); //number of deleted elements
} }
else if( geo->getTypeId() == Part::GeomBSplineCurve::getClassTypeId()) { else if (geo->getTypeId() == Part::GeomBSplineCurve::getClassTypeId()) {
const Part::GeomBSplineCurve *bsp = static_cast<const Part::GeomBSplineCurve *>(geo); const Part::GeomBSplineCurve *bsp = static_cast<const Part::GeomBSplineCurve *>(geo);
@ -3664,7 +3658,7 @@ int SketchObject::DeleteUnusedInternalGeometry(int GeoId)
std::vector<int>::iterator it; std::vector<int>::iterator it;
std::vector<int>::iterator ita; std::vector<int>::iterator ita;
for(it=controlpointgeoids.begin(), ita=associatedcontraints.begin(); it!=controlpointgeoids.end() && ita!=associatedcontraints.end(); ++it, ++ita) { for (it=controlpointgeoids.begin(), ita=associatedcontraints.begin(); it!=controlpointgeoids.end() && ita!=associatedcontraints.end(); ++it, ++ita) {
(*it) = -1; (*it) = -1;
(*ita) = 0; (*ita) = 0;
} }
@ -3672,16 +3666,14 @@ int SketchObject::DeleteUnusedInternalGeometry(int GeoId)
const std::vector< Sketcher::Constraint * > &vals = Constraints.getValues(); const std::vector< Sketcher::Constraint * > &vals = Constraints.getValues();
// search for existing poles // search for existing poles
for (std::vector< Sketcher::Constraint * >::const_iterator it= vals.begin(); for (std::vector< Sketcher::Constraint * >::const_iterator jt = vals.begin(); jt != vals.end(); ++jt) {
it != vals.end(); ++it) { if ((*jt)->Type == Sketcher::InternalAlignment && (*jt)->Second == GeoId) {
if((*it)->Type == Sketcher::InternalAlignment && (*it)->Second == GeoId) switch ((*jt)->AlignmentType) {
{ case Sketcher::BSplineControlPoint:
switch((*it)->AlignmentType){ controlpointgeoids[(*jt)->InternalAlignmentIndex] = (*jt)->First;
case Sketcher::BSplineControlPoint: break;
controlpointgeoids[(*it)->InternalAlignmentIndex] = (*it)->First; default:
break; return -1;
default:
return -1;
} }
} }
} }
@ -3689,17 +3681,17 @@ int SketchObject::DeleteUnusedInternalGeometry(int GeoId)
std::vector<int> delgeometries; std::vector<int> delgeometries;
bool firstpoledeleted = false; bool firstpoledeleted = false;
for( it=controlpointgeoids.begin(), ita=associatedcontraints.begin(); it!=controlpointgeoids.end() && ita!=associatedcontraints.end(); ++it, ++ita) { for (it=controlpointgeoids.begin(), ita=associatedcontraints.begin(); it!=controlpointgeoids.end() && ita!=associatedcontraints.end(); ++it, ++ita) {
if((*it) != -1) { if ((*it) != -1) {
// look for a circle at geoid index // look for a circle at geoid index
for (std::vector< Sketcher::Constraint * >::const_iterator itc= vals.begin(); for (std::vector< Sketcher::Constraint * >::const_iterator itc= vals.begin();
itc != vals.end(); ++itc) { itc != vals.end(); ++itc) {
if((*itc)->Second == (*it) || (*itc)->First == (*it) || (*itc)->Third == (*it)) if ((*itc)->Second == (*it) || (*itc)->First == (*it) || (*itc)->Third == (*it))
(*ita)++; (*ita)++;
} }
if((*ita)<3 ) { // IA + Weight if ((*ita)<3 ) { // IA + Weight
delgeometries.push_back((*it)); delgeometries.push_back((*it));
if (it == controlpointgeoids.begin()) if (it == controlpointgeoids.begin())
@ -3710,8 +3702,7 @@ int SketchObject::DeleteUnusedInternalGeometry(int GeoId)
std::sort(delgeometries.begin(), delgeometries.end()); // indices over an erased element get automatically updated!! std::sort(delgeometries.begin(), delgeometries.end()); // indices over an erased element get automatically updated!!
if(delgeometries.size()>0) if (delgeometries.size()>0) {
{
for (std::vector<int>::reverse_iterator it=delgeometries.rbegin(); it!=delgeometries.rend(); ++it) { for (std::vector<int>::reverse_iterator it=delgeometries.rbegin(); it!=delgeometries.rend(); ++it) {
delGeometry(*it); delGeometry(*it);
} }
@ -3721,31 +3712,30 @@ int SketchObject::DeleteUnusedInternalGeometry(int GeoId)
associatedcontraints[0] = 0; associatedcontraints[0] = 0;
delgeometries.clear(); delgeometries.clear();
if(controlpointgeoids[0] != -1 && !firstpoledeleted) { if (controlpointgeoids[0] != -1 && !firstpoledeleted) {
// look for a circle at geoid index // look for a circle at geoid index
for (std::vector< Sketcher::Constraint * >::const_iterator itc= vals.begin(); for (std::vector< Sketcher::Constraint * >::const_iterator itc= vals.begin(); itc != vals.end(); ++itc) {
itc != vals.end(); ++itc) { if ((*itc)->Second == controlpointgeoids[0] ||
(*itc)->First == controlpointgeoids[0] ||
if((*itc)->Second == controlpointgeoids[0] || (*itc)->First == controlpointgeoids[0] || (*itc)->Third == controlpointgeoids[0]) (*itc)->Third == controlpointgeoids[0])
associatedcontraints[0]++; associatedcontraints[0]++;
} }
if(associatedcontraints[0]<4 ) // IA + Weight + Radius if (associatedcontraints[0]<4 ) // IA + Weight + Radius
delgeometries.push_back(controlpointgeoids[0]); delgeometries.push_back(controlpointgeoids[0]);
} }
if(delgeometries.size()>0) if (delgeometries.size()>0) {
{
for (std::vector<int>::reverse_iterator it=delgeometries.rbegin(); it!=delgeometries.rend(); ++it) { for (std::vector<int>::reverse_iterator it=delgeometries.rbegin(); it!=delgeometries.rend(); ++it) {
delGeometry(*it); delGeometry(*it);
} }
} }
return delgeometries.size(); //number of deleted elements return delgeometries.size(); //number of deleted elements
} }
else else {
return -1; // not supported type return -1; // not supported type
}
} }
int SketchObject::addExternal(App::DocumentObject *Obj, const char* SubName) int SketchObject::addExternal(App::DocumentObject *Obj, const char* SubName)
@ -3766,6 +3756,7 @@ int SketchObject::addExternal(App::DocumentObject *Obj, const char* SubName)
Base::Console().Error("Internal error: counts of objects and subelements in external geometry links do not match\n"); Base::Console().Error("Internal error: counts of objects and subelements in external geometry links do not match\n");
return -1; return -1;
} }
for (size_t i = 0 ; i < Objects.size() ; ++i){ for (size_t i = 0 ; i < Objects.size() ; ++i){
if (Objects[i] == Obj && std::string(SubName) == SubElements[i]){ if (Objects[i] == Obj && std::string(SubName) == SubElements[i]){
Base::Console().Error("Link to %s already exists in this sketch.\n",SubName); Base::Console().Error("Link to %s already exists in this sketch.\n",SubName);
@ -3773,7 +3764,6 @@ int SketchObject::addExternal(App::DocumentObject *Obj, const char* SubName)
} }
} }
// add the new ones // add the new ones
Objects.push_back(Obj); Objects.push_back(Obj);
SubElements.push_back(std::string(SubName)); SubElements.push_back(std::string(SubName));

4
src/Mod/Sketcher/App/planegcs/Geo.cpp
View File

@ -669,7 +669,7 @@ DeriVector2 BSpline::Value(double u, double du, double* derivparam)
int BSpline::PushOwnParams(VEC_pD &pvec) int BSpline::PushOwnParams(VEC_pD &pvec)
{ {
int cnt=0; std::size_t cnt=0;
for(VEC_P::const_iterator it = poles.begin(); it != poles.end(); ++it) { for(VEC_P::const_iterator it = poles.begin(); it != poles.end(); ++it) {
pvec.push_back( (*it).x ); pvec.push_back( (*it).x );
@ -689,7 +689,7 @@ int BSpline::PushOwnParams(VEC_pD &pvec)
pvec.push_back(end.x); cnt++; pvec.push_back(end.x); cnt++;
pvec.push_back(end.y); cnt++; pvec.push_back(end.y); cnt++;
return cnt; return static_cast<int>(cnt);
} }
void BSpline::ReconstructOnNewPvec(VEC_pD &pvec, int &cnt) void BSpline::ReconstructOnNewPvec(VEC_pD &pvec, int &cnt)