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

Offset DSH : various fixes

Browse Source
This commit is contained in:
Paddle
2023-11-06 18:09:44 +01:00
committed by abdullahtahiriyo
parent 2aa67a0b38
commit 029fd10bf1
2 changed files with 201 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/Mod/Sketcher/Gui/CommandSketcherTools.cpp
View File

@@ -2292,20 +2292,40 @@ void CmdSketcherOffset::activated(int iMsg)
}
// get the needed lists and objects
const std::vector<std::string>& SubNames = selection[0].getSubNames();
if (!SubNames.empty()) {
for (std::vector<std::string>::const_iterator it = SubNames.begin(); it != SubNames.end(); ++it) {
auto* Obj = static_cast<Sketcher::SketchObject*>(selection[0].getObject());
const std::vector<std::string>& subNames = selection[0].getSubNames();
if (!subNames.empty()) {
for (auto& name : subNames) {
// only handle non-external edges
if (it->size() > 4 && it->substr(0, 4) == "Edge") {
int geoId = std::atoi(it->substr(4, 4000).c_str()) - 1;
if (name.size() > 4 && name.substr(0, 4) == "Edge") {
int geoId = std::atoi(name.substr(4, 4000).c_str()) - 1;
if (geoId >= 0) {
listOfGeoIds.push_back(geoId);
const Part::Geometry* geo = Obj->getGeometry(geoId);
if (!isPoint(*geo)
&& !isBSplineCurve(*geo)
&& !isEllipse(*geo)
&& !isArcOfEllipse(*geo)
&& !isArcOfHyperbola(*geo)
&& !isArcOfParabola(*geo)
&& !GeometryFacade::isInternalAligned(geo)) {
// Currently ellipse/parabola/hyperbola/bspline are not handled correctly.
// Occ engine gives offset of those as set of lines and arcs and does not seem to work consistently.
listOfGeoIds.push_back(geoId);
}
}
}
}
}
ActivateHandler(getActiveGuiDocument(), new DrawSketchHandlerOffset(listOfGeoIds));
if (listOfGeoIds.size() != 0) {
ActivateHandler(getActiveGuiDocument(), new DrawSketchHandlerOffset(listOfGeoIds));
}
else {
getSelection().clearSelection();
Gui::NotifyUserError(Obj,
QT_TRANSLATE_NOOP("Notifications", "Invalid selection"),
QT_TRANSLATE_NOOP("Notifications", "Selection has no valid geometries. BSplines, Points are not supported yet."));
}
}
bool CmdSketcherOffset::isActive()

322
src/Mod/Sketcher/Gui/DrawSketchHandlerOffset.h
View File

@@ -392,27 +392,27 @@ private:
}
bool create = false;
int posi, posj;
PointPos posi, posj;
if ((firstStartPoint - secondStartPoint).Length() < Precision::Confusion()) {
create = true;
posi = 1;
posj = 1;
posi = PointPos::start;
posj = PointPos::start;
}
else if ((firstStartPoint - secondEndPoint).Length() < Precision::Confusion()) {
create = true;
posi = 1;
posj = 2;
posi = PointPos::start;
posj = PointPos::end;
}
else if ((firstEndPoint - secondStartPoint).Length() < Precision::Confusion()) {
create = true;
posi = 2;
posj = 1;
posi = PointPos::end;
posj = PointPos::start;
}
else if ((firstEndPoint - secondEndPoint).Length() < Precision::Confusion()) {
create = true;
posi = 2;
posj = 2;
posi = PointPos::end;
posj = PointPos::end;
}
if (create) {
@@ -420,8 +420,8 @@ private:
needTangent(listOfOffsetGeoIds[i], listOfOffsetGeoIds[j], posi, posj);
stream << "conList.append(Sketcher.Constraint('"
<< (tangent ? "Tangent" : "Coincident");
stream << "'," << listOfOffsetGeoIds[i] << "," << posi << ", "
<< listOfOffsetGeoIds[j] << "," << posj << "))\n";
stream << "'," << listOfOffsetGeoIds[i] << "," << static_cast<int>(posi) << ", "
<< listOfOffsetGeoIds[j] << "," << static_cast<int>(posj) << "))\n";
}
}
}
@@ -431,69 +431,56 @@ private:
Gui::Command::doCommand(Gui::Command::Doc, stream.str().c_str());
}
bool needTangent(int geoId1, int geoId2, int pos1, int pos2)
bool needTangent(int geoId1, int geoId2, PointPos pos1, PointPos pos2)
{
// Todo: add cases for arcOfellipse parabolas hyperbolas bspline
SketchObject* Obj = sketchgui->getSketchObject();
const Part::Geometry* geo1 = Obj->getGeometry(geoId1);
const Part::Geometry* geo2 = Obj->getGeometry(geoId2);
if (geo1->getTypeId() == Part::GeomArcOfCircle::getClassTypeId()
|| geo2->getTypeId() == Part::GeomArcOfCircle::getClassTypeId()) {
Base::Vector3d perpendicular1, perpendicular2, p1, p2;
if (geo1->getTypeId() == Part::GeomArcOfCircle::getClassTypeId()
|| geo1->getTypeId() == Part::GeomArcOfEllipse::getClassTypeId()) {
const Part::GeomArcOfConic* arcOfCircle =
static_cast<const Part::GeomArcOfConic*>(geo1);
p1 = arcOfCircle->getEndPoint();
if (pos1 == 1) {
p1 = arcOfCircle->getStartPoint();
}
perpendicular1.x = -(arcOfCircle->getCenter() - p1).y;
perpendicular1.y = (arcOfCircle->getCenter() - p1).x;
}
else if (geo1->getTypeId() == Part::GeomLineSegment::getClassTypeId()) {
const Part::GeomLineSegment* line = static_cast<const Part::GeomLineSegment*>(geo1);
p1 = line->getEndPoint();
perpendicular1 = line->getStartPoint() - line->getEndPoint();
if (pos1 == 1) {
p1 = line->getStartPoint();
perpendicular1 = line->getEndPoint() - line->getStartPoint();
}
}
else {
return false;
}
// Todo: add cases for arcOfellipse parabolas hyperbolas bspline
if (geo2->getTypeId() == Part::GeomArcOfCircle::getClassTypeId()
|| geo2->getTypeId() == Part::GeomArcOfEllipse::getClassTypeId()) {
const Part::GeomArcOfConic* arcOfCircle =
static_cast<const Part::GeomArcOfConic*>(geo2);
p2 = arcOfCircle->getEndPoint();
if (pos2 == 1) {
p2 = arcOfCircle->getStartPoint();
}
perpendicular2.x = -(arcOfCircle->getCenter() - p2).y;
perpendicular2.y = (arcOfCircle->getCenter() - p2).x;
}
else if (geo2->getTypeId() == Part::GeomLineSegment::getClassTypeId()) {
const Part::GeomLineSegment* line = static_cast<const Part::GeomLineSegment*>(geo2);
p2 = line->getEndPoint();
perpendicular2 = line->getStartPoint() - line->getEndPoint();
if (pos2 == 1) {
p2 = line->getStartPoint();
perpendicular2 = line->getEndPoint() - line->getStartPoint();
}
}
else {
return false;
}
// Todo: add cases for arcOfellipse parabolas hyperbolas bspline
// if lines are parallel
if ((perpendicular1 % perpendicular2).Length() < Precision::Intersection()) {
return true;
}
if (!isArcOfCircle(*geo1) && !isArcOfCircle(*geo2)) {
return false;
}
Base::Vector3d perpendicular1, perpendicular2, p1, p2;
if (isArcOfCircle(*geo1)) {
auto* arcOfCircle = static_cast<const Part::GeomArcOfCircle*>(geo1);
p1 = pos1 == PointPos::start ? arcOfCircle->getStartPoint(true)
: arcOfCircle->getEndPoint(true);
perpendicular1.x = -(arcOfCircle->getCenter() - p1).y;
perpendicular1.y = (arcOfCircle->getCenter() - p1).x;
}
else if (isLineSegment(*geo1)) {
auto* line = static_cast<const Part::GeomLineSegment*>(geo1);
perpendicular1 = line->getStartPoint() - line->getEndPoint();
}
else {
return false;
}
if (isArcOfCircle(*geo2)) {
auto* arcOfCircle = static_cast<const Part::GeomArcOfCircle*>(geo2);
p2 = pos2 == PointPos::start ? arcOfCircle->getStartPoint(true)
: arcOfCircle->getEndPoint(true);
perpendicular2.x = -(arcOfCircle->getCenter() - p2).y;
perpendicular2.y = (arcOfCircle->getCenter() - p2).x;
}
else if (isLineSegment(*geo2)) {
auto* line = static_cast<const Part::GeomLineSegment*>(geo2);
perpendicular2 = line->getStartPoint() - line->getEndPoint();
}
else {
return false;
}
// if lines are parallel
if ((perpendicular1 % perpendicular2).Length() < Precision::Confusion()) {
return true;
}
return false;
}
@@ -520,8 +507,14 @@ private:
std::stringstream stream;
stream << "conList = []\n";
// We separate the constraints of new lines in case the construction lines are not needed.
std::stringstream newLinesStream;
newLinesStream << "conList2 = []\n";
vCCO = generatevCC(listOfOffsetGeoIds);
int geoIdCandidate1, geoIdCandidate2;
int newCurveCounter = 0;
int prevCurveCounter = 0;
std::vector<Part::Geometry*> geometriesToAdd;
@@ -573,8 +566,7 @@ private:
// Check if geoId is the offsetted curve giving curve[j].
const Part::Geometry* geo2 = Obj->getGeometry(geoId);
if (geo->getTypeId() == Part::GeomCircle::getClassTypeId()
&& geo2->getTypeId() == Part::GeomCircle::getClassTypeId()) {
if (isCircle(*geo) && isCircle(*geo2)) {
auto* circle = static_cast<const Part::GeomCircle*>(geo);
auto* circle2 = static_cast<const Part::GeomCircle*>(geo2);
Base::Vector3d p1 = circle->getCenter();
@@ -583,6 +575,7 @@ private:
// coincidence of center
stream << "conList.append(Sketcher.Constraint('Coincident'," << curve[j]
<< ",3, " << geoId << ",3))\n";
// Create line between both circles.
auto* line = new Part::GeomLineSegment();
p1.x = p1.x + circle->getRadius();
@@ -591,24 +584,26 @@ private:
GeometryFacade::setConstruction(line, true);
geometriesToAdd.push_back(line);
newCurveCounter++;
stream << "conList.append(Sketcher.Constraint('Perpendicular',"
<< getHighestCurveIndex() + newCurveCounter << ", " << curve[j]
<< "))\n";
stream << "conList.append(Sketcher.Constraint('PointOnObject',"
<< getHighestCurveIndex() + newCurveCounter << ",1, " << curve[j]
<< "))\n";
stream << "conList.append(Sketcher.Constraint('PointOnObject',"
<< getHighestCurveIndex() + newCurveCounter << ",2, " << geoId
<< "))\n";
newLinesStream << "conList2.append(Sketcher.Constraint('Perpendicular',"
<< getHighestCurveIndex() + newCurveCounter << ", "
<< curve[j] << "))\n";
newLinesStream << "conList2.append(Sketcher.Constraint('PointOnObject',"
<< getHighestCurveIndex() + newCurveCounter << ",1, "
<< curve[j] << "))\n";
newLinesStream << "conList2.append(Sketcher.Constraint('PointOnObject',"
<< getHighestCurveIndex() + newCurveCounter << ",2, "
<< geoId << "))\n";
geoIdCandidate1 = curve[j];
geoIdCandidate2 = geoId;
break;
}
}
else if (geo->getTypeId() == Part::GeomEllipse::getClassTypeId()
&& geo2->getTypeId() == Part::GeomEllipse::getClassTypeId()) {
else if (isEllipse(*geo) && isEllipse(*geo2)) {
// same as circle but 2 lines
}
else if (geo->getTypeId() == Part::GeomLineSegment::getClassTypeId()
&& geo2->getTypeId() == Part::GeomLineSegment::getClassTypeId()) {
else if (isLineSegment(*geo) && isLineSegment(*geo2)) {
auto* lineSeg1 = static_cast<const Part::GeomLineSegment*>(geo);
auto* lineSeg2 = static_cast<const Part::GeomLineSegment*>(geo2);
Base::Vector3d p1[2], p2[2];
@@ -639,32 +634,36 @@ private:
geometriesToAdd.push_back(line);
newCurveCounter++;
stream << "conList.append(Sketcher.Constraint('Perpendicular',"
<< getHighestCurveIndex() + newCurveCounter << ", "
<< curve[j] << "))\n";
stream << "conList.append(Sketcher.Constraint('PointOnObject',"
<< getHighestCurveIndex() + newCurveCounter << ",1, "
<< curve[j] << "))\n";
stream << "conList.append(Sketcher.Constraint('PointOnObject',"
<< getHighestCurveIndex() + newCurveCounter << ",2, "
<< geoId << "))\n";
newLinesStream
<< "conList2.append(Sketcher.Constraint('Perpendicular',"
<< getHighestCurveIndex() + newCurveCounter << ", "
<< curve[j] << "))\n";
newLinesStream
<< "conList2.append(Sketcher.Constraint('PointOnObject',"
<< getHighestCurveIndex() + newCurveCounter << ",1, "
<< curve[j] << "))\n";
newLinesStream
<< "conList2.append(Sketcher.Constraint('PointOnObject',"
<< getHighestCurveIndex() + newCurveCounter << ",2, "
<< geoId << "))\n";
geoIdCandidate1 = curve[j];
geoIdCandidate2 = geoId;
}
break;
}
}
}
else if (geo->getTypeId() == Part::GeomArcOfCircle::getClassTypeId()) {
else if (isArcOfCircle(*geo)) {
// multiple cases because arc join mode creates arcs or circle.
const Part::GeomArcOfCircle* arcOfCircle =
static_cast<const Part::GeomArcOfCircle*>(geo);
auto* arcOfCircle = static_cast<const Part::GeomArcOfCircle*>(geo);
Base::Vector3d p1 = arcOfCircle->getCenter();
if (geo2->getTypeId() == Part::GeomArcOfCircle::getClassTypeId()) {
const Part::GeomArcOfCircle* arcOfCircle2 =
static_cast<const Part::GeomArcOfCircle*>(geo2);
if (isArcOfCircle(*geo2)) {
auto* arcOfCircle2 = static_cast<const Part::GeomArcOfCircle*>(geo2);
Base::Vector3d p2 = arcOfCircle2->getCenter();
Base::Vector3d p3 = arcOfCircle2->getStartPoint();
Base::Vector3d p4 = arcOfCircle2->getEndPoint();
Base::Vector3d p3 = arcOfCircle2->getStartPoint(true);
Base::Vector3d p4 = arcOfCircle2->getEndPoint(true);
if ((p1 - p2).Length() < Precision::Confusion()) {
// coincidence of center. Offset arc is the offset of an arc
@@ -672,22 +671,28 @@ private:
<< curve[j] << ",3, " << geoId << ",3))\n";
if (createLine) {
// Create line between both circles.
Part::GeomLineSegment* line = new Part::GeomLineSegment();
auto* line = new Part::GeomLineSegment();
p1.x = p1.x + arcOfCircle->getRadius();
p2.x = p2.x + arcOfCircle2->getRadius();
line->setPoints(p1, p2);
GeometryFacade::setConstruction(line, true);
geometriesToAdd.push_back(line);
newCurveCounter++;
stream << "conList.append(Sketcher.Constraint('Perpendicular',"
<< getHighestCurveIndex() + newCurveCounter << ", "
<< curve[j] << "))\n";
stream << "conList.append(Sketcher.Constraint('PointOnObject',"
<< getHighestCurveIndex() + newCurveCounter << ",1, "
<< curve[j] << "))\n";
stream << "conList.append(Sketcher.Constraint('PointOnObject',"
<< getHighestCurveIndex() + newCurveCounter << ",2, "
<< geoId << "))\n";
newLinesStream
<< "conList2.append(Sketcher.Constraint('Perpendicular',"
<< getHighestCurveIndex() + newCurveCounter << ", "
<< curve[j] << "))\n";
newLinesStream
<< "conList2.append(Sketcher.Constraint('PointOnObject',"
<< getHighestCurveIndex() + newCurveCounter << ",1, "
<< curve[j] << "))\n";
newLinesStream
<< "conList2.append(Sketcher.Constraint('PointOnObject',"
<< getHighestCurveIndex() + newCurveCounter << ",2, "
<< geoId << "))\n";
geoIdCandidate1 = curve[j];
geoIdCandidate2 = geoId;
}
break;
}
@@ -715,47 +720,43 @@ private:
break;
}
}
else if (geo2->getTypeId() == Part::GeomLineSegment::getClassTypeId()
else if (isLineSegment(*geo2)
|| geo2->getTypeId() == Part::GeomArcOfConic::getClassTypeId()
|| geo2->getTypeId() == Part::GeomBSplineCurve::getClassTypeId()) {
|| isBSplineCurve(*geo2)) {
// cases where arc is created by arc join mode.
Base::Vector3d p2, p3;
if (getFirstSecondPoints(geoId, p2, p3)) {
if (((p1 - p2).Length() < Precision::Confusion())
|| ((p1 - p3).Length() < Precision::Confusion())) {
if ((p1 - p2).Length() < Precision::Confusion()) {
// coincidence of center to startpoint
stream << "conList.append(Sketcher.Constraint('Coincident',"
<< curve[j] << ",3, " << geoId << ", 1))\n";
}
else if ((p1 - p3).Length() < Precision::Confusion()) {
// coincidence of center to endpoint
stream << "conList.append(Sketcher.Constraint('Coincident',"
<< curve[j] << ",3, " << geoId << ", 2))\n";
}
bool startCoincidence = (p1 - p2).Length() < Precision::Confusion();
bool endCoincidence = (p1 - p3).Length() < Precision::Confusion();
if (startCoincidence || endCoincidence) {
// coincidence of center to startpoint
stream << "conList.append(Sketcher.Constraint('Coincident',"
<< curve[j] << ", 3, " << geoId << ", "
<< (startCoincidence ? 1 : 2) << "))\n";
geoIdCandidate1 = curve[j];
geoIdCandidate2 = geoId;
break;
}
}
}
}
else if (geo->getTypeId() == Part::GeomArcOfEllipse::getClassTypeId()
&& geo2->getTypeId() == Part::GeomArcOfEllipse::getClassTypeId()) {
else if (isArcOfEllipse(*geo) && isArcOfEllipse(*geo2)) {
// const Part::GeomArcOfEllipse* arcOfEllipse = static_cast<const
// Part::GeomArcOfEllipse*>(geo2);
}
else if (geo->getTypeId() == Part::GeomArcOfHyperbola::getClassTypeId()
&& geo2->getTypeId() == Part::GeomArcOfHyperbola::getClassTypeId()) {
else if (isArcOfHyperbola(*geo) && isArcOfHyperbola(*geo2)) {
// const Part::GeomArcOfHyperbola* arcOfHyperbola = static_cast<const
// Part::GeomArcOfHyperbola*>(geo2);
}
else if (geo->getTypeId() == Part::GeomArcOfParabola::getClassTypeId()
&& geo2->getTypeId() == Part::GeomArcOfParabola::getClassTypeId()) {
else if (isArcOfParabola(*geo) && isArcOfParabola(*geo2)) {
// const Part::GeomArcOfParabola* arcOfParabola = static_cast<const
// Part::GeomArcOfParabola*>(geo2);
}
else if (geo->getTypeId() == Part::GeomBSplineCurve::getClassTypeId()
&& geo2->getTypeId() == Part::GeomBSplineCurve::getClassTypeId()) {}
else if (isBSplineCurve(*geo) && isBSplineCurve(*geo2)) {}
}
if (newCurveCounter != prevCurveCounter) {
prevCurveCounter = newCurveCounter;
@@ -777,11 +778,42 @@ private:
}
}
}
if (newCurveCounter != 0) {
if (newCurveCounter >= 2) {
stream << "conList.append(Sketcher.Constraint('Distance'," << getHighestCurveIndex() + 1
<< ", " << fabs(offsetLength) << "))\n";
Obj->addGeometry(std::move(geometriesToAdd));
newLinesStream << Gui::Command::getObjectCmd(sketchgui->getObject())
<< ".addConstraint(conList2)\n";
newLinesStream << "del conList2\n";
Gui::Command::doCommand(Gui::Command::Doc, newLinesStream.str().c_str());
}
else {
// If there is a single construction line, then its not needed.
const Part::Geometry* geo = Obj->getGeometry(geoIdCandidate1);
if (isCircle(*geo)) {
stream << "conList.append(Sketcher.Constraint('Distance'," << geoIdCandidate1
<< ", " << geoIdCandidate2 << ", " << fabs(offsetLength) << "))\n";
}
else if (isLineSegment(*geo)) {
stream << "conList.append(Sketcher.Constraint('Distance'," << geoIdCandidate1
<< ", 1," << geoIdCandidate2 << ", " << fabs(offsetLength) << "))\n";
}
else if (isArcOfCircle(*geo)) {
const Part::Geometry* geo2 = Obj->getGeometry(geoIdCandidate2);
if (isArcOfCircle(*geo2)) {
stream << "conList.append(Sketcher.Constraint('Distance'," << geoIdCandidate1
<< ", 1," << geoIdCandidate2 << ", 1, " << fabs(offsetLength) << "))\n";
}
else if (isLineSegment(*geo2)) {
stream << "conList.append(Sketcher.Constraint('Distance'," << geoIdCandidate1
<< ", 3," << geoIdCandidate1 << ", 1, " << fabs(offsetLength) << "))\n";
}
}
}
Obj->addGeometry(std::move(geometriesToAdd));
stream << Gui::Command::getObjectCmd(sketchgui->getObject()) << ".addConstraint(conList)\n";
stream << "del conList\n";
@@ -797,15 +829,11 @@ private:
for (auto geoId : listOfGeo) {
std::vector<int> vecOfGeoIds;
const Part::Geometry* geo = Obj->getGeometry(geoId);
if (geo->getTypeId() == Part::GeomCircle::getClassTypeId()
|| geo->getTypeId() == Part::GeomEllipse::getClassTypeId()) {
if (isCircle(*geo) || isEllipse(*geo)) {
vecOfGeoIds.push_back(geoId);
vcc.push_back(vecOfGeoIds);
continue;
}
else if (geo->getTypeId() == Part::GeomPoint::getClassTypeId()) {
continue;
}
bool inserted = false;
int insertedIn = -1;
@@ -871,10 +899,10 @@ private:
SketchObject* Obj = sketchgui->getSketchObject();
for (size_t i = 0; i < vCC.size(); i++) {
for (auto& CC : vCC) {
BRepBuilderAPI_MakeWire mkWire;
for (size_t j = 0; j < vCC[i].size(); j++) {
mkWire.Add(TopoDS::Edge(Obj->getGeometry(vCC[i][j])->toShape()));
for (auto& curve : CC) {
mkWire.Add(TopoDS::Edge(Obj->getGeometry(curve)->toShape()));
}
sourceWires.push_back(mkWire.Wire());
}
@@ -919,22 +947,20 @@ private:
{
const Part::Geometry* geo = sketchgui->getSketchObject()->getGeometry(geoId);
if (geo->getTypeId() == Part::GeomLineSegment::getClassTypeId()) {
if (isLineSegment(*geo)) {
const auto* line = static_cast<const Part::GeomLineSegment*>(geo);
startPoint = line->getStartPoint();
endPoint = line->getEndPoint();
return true;
}
else if (geo->getTypeId() == Part::GeomArcOfCircle::getClassTypeId()
|| geo->getTypeId() == Part::GeomArcOfEllipse::getClassTypeId()
|| geo->getTypeId() == Part::GeomArcOfHyperbola::getClassTypeId()
|| geo->getTypeId() == Part::GeomArcOfParabola::getClassTypeId()) {
else if (isArcOfCircle(*geo) || isArcOfEllipse(*geo) || isArcOfHyperbola(*geo)
|| isArcOfParabola(*geo)) {
const auto* arcOfConic = static_cast<const Part::GeomArcOfConic*>(geo);
startPoint = arcOfConic->getStartPoint(true);
endPoint = arcOfConic->getEndPoint(true);
return true;
}
else if (geo->getTypeId() == Part::GeomBSplineCurve::getClassTypeId()) {
else if (isBSplineCurve(*geo)) {
const auto* bSpline = static_cast<const Part::GeomBSplineCurve*>(geo);
startPoint = bSpline->getStartPoint();
endPoint = bSpline->getEndPoint();