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

Sketcher: Correct checking of compatible equality geometry

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

Before this commit equality line to circle is allowed although the solver can not process it.

Similar happens for several combinations of incompatible edges.
This commit is contained in:
Abdullah Tahiri
2018-09-28 17:08:04 +02:00
committed by wmayer
parent 80e4b36f37
commit b73cbd739c
1 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6594,6 +6594,7 @@ void CmdSketcherConstrainEqual::activated(int iMsg)
std::vector<int> ids;
bool lineSel = false, arcSel = false, circSel = false, ellipsSel = false, arcEllipsSel=false, hasAlreadyExternal = false;
bool hyperbSel = false, parabSel=false;
for (std::vector<std::string>::const_iterator it=SubNames.begin(); it != SubNames.end(); ++it) {
@@ -6631,16 +6632,20 @@ void CmdSketcherConstrainEqual::activated(int iMsg)
return;
}
if (geo->getTypeId() != Part::GeomLineSegment::getClassTypeId())
if (geo->getTypeId() == Part::GeomLineSegment::getClassTypeId())
lineSel = true;
else if (geo->getTypeId() != Part::GeomArcOfCircle::getClassTypeId())
else if (geo->getTypeId() == Part::GeomArcOfCircle::getClassTypeId())
arcSel = true;
else if (geo->getTypeId() != Part::GeomCircle::getClassTypeId())
else if (geo->getTypeId() == Part::GeomCircle::getClassTypeId())
circSel = true;
else if (geo->getTypeId() != Part::GeomEllipse::getClassTypeId())
else if (geo->getTypeId() == Part::GeomEllipse::getClassTypeId())
ellipsSel = true;
else if (geo->getTypeId() != Part::GeomArcOfEllipse::getClassTypeId())
else if (geo->getTypeId() == Part::GeomArcOfEllipse::getClassTypeId())
arcEllipsSel = true;
else if (geo->getTypeId() == Part::GeomArcOfHyperbola::getClassTypeId())
hyperbSel = true;
else if (geo->getTypeId() == Part::GeomArcOfParabola::getClassTypeId())
parabSel = true;
else {
QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"),
QObject::tr("Select two or more edges of similar type"));
@@ -6650,7 +6655,12 @@ void CmdSketcherConstrainEqual::activated(int iMsg)
ids.push_back(GeoId);
}
if (lineSel && (arcSel || circSel) && (ellipsSel || arcEllipsSel)) {
// Check for heterogeneous groups in selection
if ( (lineSel && ((arcSel || circSel) || (ellipsSel || arcEllipsSel) || hyperbSel || parabSel) ) ||
((arcSel || circSel) && ((ellipsSel || arcEllipsSel) || hyperbSel || parabSel)) ||
((ellipsSel || arcEllipsSel) && (hyperbSel || parabSel)) ||
(hyperbSel && parabSel) ) {
QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"),
QObject::tr("Select two or more edges of similar type"));
return;