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

[TechDraw] Use OCC to compute intersections of any types of curves

Browse Source
This commit is contained in:
pavltom
2023-12-02 14:01:58 +01:00
committed by WandererFan
parent 1245c3f3b2
commit b26b83dfee
3 changed files with 62 additions and 177 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/Mod/TechDraw/Gui/CommandExtensionPack.cpp
View File

@@ -834,7 +834,6 @@ void CmdTechDrawExtensionVertexAtIntersection::activated(int iMsg)
return;
Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Cosmetic Intersection Vertex(es)"));
const std::vector<std::string> SubNames = selection[0].getSubNames();
std::vector<Base::Vector3d> interPoints;
if (SubNames.size() >= 2) {
std::string GeoType1 = TechDraw::DrawUtil::getGeomTypeFromName(SubNames[0]);
std::string GeoType2 = TechDraw::DrawUtil::getGeomTypeFromName(SubNames[1]);
@@ -843,15 +842,12 @@ void CmdTechDrawExtensionVertexAtIntersection::activated(int iMsg)
TechDraw::BaseGeomPtr geom1 = objFeat->getGeomByIndex(GeoId1);
int GeoId2 = TechDraw::DrawUtil::getIndexFromName(SubNames[1]);
TechDraw::BaseGeomPtr geom2 = objFeat->getGeomByIndex(GeoId2);
interPoints = geom1->intersection(geom2);
if (!interPoints.empty()) {
double scale = objFeat->getScale();
std::string id1 = objFeat->addCosmeticVertex(interPoints[0] / scale);
objFeat->add1CVToGV(id1);
if (interPoints.size() >= 2) {
std::string id2 = objFeat->addCosmeticVertex(interPoints[1] / scale);
objFeat->add1CVToGV(id2);
}
double scale = objFeat->getScale();
std::vector<Base::Vector3d> interPoints = geom1->intersection(geom2);
for (auto pt : interPoints) {
std::string ptId = objFeat->addCosmeticVertex(pt/scale);
objFeat->add1CVToGV(ptId);
}
}
}