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

Sketcher: Coincidence constraint: fix error introduced by concentric capability.

Browse Source
This commit is contained in:
Paddle
2022-11-14 11:10:21 +01:00
committed by 0penBrain
parent 45bb0289b0
commit d6934c0ecd
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/Mod/Sketcher/Gui/CommandConstraints.cpp
View File

@@ -1984,19 +1984,24 @@ void CmdSketcherConstrainCoincident::activated(int iMsg)
}
bool allConicsEdges = true; //If user selects only conics (circle, ellipse, arc, arcOfEllipse) then we make concentric constraint.
bool atLeastOneEdge = false;
for (std::vector<std::string>::const_iterator it = SubNames.begin(); it != SubNames.end(); ++it) {
int GeoId;
Sketcher::PointPos PosId;
getIdsFromName(*it, Obj, GeoId, PosId);
if (isEdge(GeoId,PosId)) {
if (!isGeoConcentricCompatible(Obj->getGeometry(GeoId))) {
QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"),
QObject::tr("Select two or more vertices from the sketch for a coincident constraint, or two or more circles, ellipses, arcs or arcs of ellipse for a concentric constraint."));
return;
}
if (isEdge(GeoId, PosId)) {
atLeastOneEdge = true;
if (!isGeoConcentricCompatible(Obj->getGeometry(GeoId)))
allConicsEdges = false;
}
else
allConicsEdges = false; //at least one point is selected, so concentric can't be applied.
if (atLeastOneEdge && !allConicsEdges) {
QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"),
QObject::tr("Select two or more vertices from the sketch for a coincident constraint, or two or more circles, ellipses, arcs or arcs of ellipse for a concentric constraint."));
return;
}
}
int GeoId1, GeoId2;