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

Sketcher: fix crash on mirroring geometry defined by internal alignment geometry

Browse Source 
================================================================================

Internal Alignment constraint mirroring was never implemented. With the enhancements
brought with implementation of geometry extensions in the sketcher, this lack of
implementation became a crash, as geometry was marked as being internal alignment, while
no associated internal alignment constraint was created.

Restrictions:
- Internal alignment geometry is only to be mirrored if the geometry it defines is also
being mirrored. Internal alignment geometry is otherwise skipped. This is because it
does not make sense to have a pole without a b-spline, or a major axis of a ellipse without
an ellipse.

fixes #4514
This commit is contained in:
Abdullah Tahiri
2020-12-20 11:42:45 +01:00
committed by abdullahtahiriyo
parent 420df63743
commit 63a0426952
1 changed files with 72 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3416,7 +3416,30 @@ int SketchObject::addSymmetric(const std::vector<int> &geoIdList, int refGeoId,
for (std::vector<int>::const_iterator it = geoIdList.begin(); it != geoIdList.end(); ++it) {
const Part::Geometry *geo = getGeometry(*it);
Part::Geometry *geosym = geo->copy();
Part::Geometry *geosym;
auto gf = GeometryFacade::getFacade(geo);
if(gf->isInternalAligned()) {
// only add this geometry if the corresponding geometry it defines is also in the list.
int definedGeo = Constraint::GeoUndef;
for( auto c : Constraints.getValues()) {
if(c->Type == Sketcher::InternalAlignment && c->First == *it) {
definedGeo = c->Second;
break;
}
}
if(std::find(geoIdList.begin(), geoIdList.end(), definedGeo) != geoIdList.end() )
geosym = geo->copy();
else
continue; // we should not mirror internal alignment geometry, unless the element they define is also mirrored
}
else {
geosym = geo->copy();
}
// Handle Geometry
if(geosym->getTypeId() == Part::GeomLineSegment::getClassTypeId()){
@@ -3676,7 +3699,31 @@ int SketchObject::addSymmetric(const std::vector<int> &geoIdList, int refGeoId,
for (std::vector<int>::const_iterator it = geoIdList.begin(); it != geoIdList.end(); ++it) {
const Part::Geometry *geo = getGeometry(*it);
Part::Geometry *geosym = geo->copy();
Part::Geometry *geosym;
auto gf = GeometryFacade::getFacade(geo);
if(gf->isInternalAligned()) {
// only add this geometry if the corresponding geometry it defines is also in the list.
int definedGeo = Constraint::GeoUndef;
for( auto c : Constraints.getValues()) {
if(c->Type == Sketcher::InternalAlignment && c->First == *it) {
definedGeo = c->Second;
break;
}
}
if(std::find(geoIdList.begin(), geoIdList.end(), definedGeo) != geoIdList.end() )
geosym = geo->copy();
else
continue; // we should not mirror internal alignment geometry, unless the element they define is also mirrored
}
else {
geosym = geo->copy();
}
// Handle Geometry
if(geosym->getTypeId() == Part::GeomLineSegment::getClassTypeId()){
@@ -3822,42 +3869,40 @@ int SketchObject::addSymmetric(const std::vector<int> &geoIdList, int refGeoId,
for (std::vector<Constraint *>::const_iterator it = constrvals.begin(); it != constrvals.end(); ++it) {
std::vector<int>::const_iterator fit=std::find(geoIdList.begin(), geoIdList.end(), (*it)->First);
auto fit = geoIdMap.find((*it)->First); // we look in the map, because we might have skipped internal alignment geometry
if(fit != geoIdList.end()) { // if First of constraint is in geoIdList
if(fit != geoIdMap.end()) { // if First of constraint is in geoIdList
if( (*it)->Second == Constraint::GeoUndef /*&& (*it)->Third == Constraint::GeoUndef*/) {
if( (*it)->Type != Sketcher::DistanceX &&
(*it)->Type != Sketcher::DistanceY) {
(*it)->Type != Sketcher::DistanceY) { // this includes all non-directional single GeoId constraints, as radius, diameter, weight,...
Constraint *constNew = (*it)->copy();
constNew->First = geoIdMap[(*it)->First];
constNew->First = fit->second;
newconstrVals.push_back(constNew);
}
}
else { // other geoids intervene in this constraint
std::vector<int>::const_iterator sit=std::find(geoIdList.begin(), geoIdList.end(), (*it)->Second);
auto sit = geoIdMap.find((*it)->Second);
if(sit != geoIdList.end()) { // Second is also in the list
if(sit != geoIdMap.end()) { // Second is also in the list
if( (*it)->Third == Constraint::GeoUndef ) {
if((*it)->Type == Sketcher::Coincident ||
(*it)->Type == Sketcher::Perpendicular ||
(*it)->Type == Sketcher::Parallel ||
(*it)->Type == Sketcher::Tangent ||
(*it)->Type == Sketcher::Distance ||
(*it)->Type == Sketcher::Equal ||
(*it)->Type == Sketcher::Radius ||
(*it)->Type == Sketcher::Diameter ||
(*it)->Type == Sketcher::Weight ||
(*it)->Type == Sketcher::Angle ||
(*it)->Type == Sketcher::PointOnObject ){
if((*it)->Type == Sketcher::Coincident ||
(*it)->Type == Sketcher::Perpendicular ||
(*it)->Type == Sketcher::Parallel ||
(*it)->Type == Sketcher::Tangent ||
(*it)->Type == Sketcher::Distance ||
(*it)->Type == Sketcher::Equal ||
(*it)->Type == Sketcher::Angle ||
(*it)->Type == Sketcher::PointOnObject ||
(*it)->Type == Sketcher::InternalAlignment ){
Constraint *constNew = (*it)->copy();
constNew->First = geoIdMap[(*it)->First];
constNew->Second = geoIdMap[(*it)->Second];
constNew->First = fit->second;
constNew->Second = sit->second;
if(isStartEndInverted[(*it)->First]){
if((*it)->FirstPos == Sketcher::start)
constNew->FirstPos = Sketcher::end;
@@ -3881,14 +3926,14 @@ int SketchObject::addSymmetric(const std::vector<int> &geoIdList, int refGeoId,
newconstrVals.push_back(constNew);
}
}
else {
std::vector<int>::const_iterator tit=std::find(geoIdList.begin(), geoIdList.end(), (*it)->Third);
else { // three GeoIds intervene in constraint
auto tit = geoIdMap.find((*it)->Third);
if(tit != geoIdList.end()) { // Third is also in the list
if(tit != geoIdMap.end()) { // Third is also in the list
Constraint *constNew = (*it)->copy();
constNew->First = geoIdMap[(*it)->First];
constNew->Second = geoIdMap[(*it)->Second];
constNew->Third = geoIdMap[(*it)->Third];
constNew->First = fit->second;
constNew->Second = sit->second;
constNew->Third = tit->second;
if(isStartEndInverted[(*it)->First]){
if((*it)->FirstPos == Sketcher::start)
constNew->FirstPos = Sketcher::end;