Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[TD]ComplexSection Fixes #7972

Merged
merged 4 commits into from Dec 18, 2022
Merged

[TD]ComplexSection Fixes #7972

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0c4d4c8
[TD]fix parent page counting
WandererFan Dec 6, 2022
68e18a3
[TD]dialog fixes from user testing
WandererFan Dec 7, 2022
351fda2
[TD]move makeAlignedPieces to separate thread
WandererFan Dec 5, 2022
f4cc362
[TD]detail of rotated ComplexSection
WandererFan Dec 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
230 changes: 146 additions & 84 deletions src/Mod/TechDraw/App/DrawComplexSection.cpp
View file
Open in desktop

Large diffs are not rendered by default.

51 changes: 33 additions & 18 deletions src/Mod/TechDraw/App/DrawComplexSection.h
View file
Open in desktop
Expand Up @@ -50,23 +50,31 @@ class TechDrawExport DrawComplexSection: public DrawViewSection
TopoDS_Shape makeCuttingTool(double dMax) override;
gp_Ax2 getCSFromBase(const std::string sectionName) const override;
bool isBaseValid() const override;
TopoDS_Compound findSectionPlaneIntersections(const TopoDS_Shape &cutShape) override;
TopoDS_Shape prepareShape(const TopoDS_Shape &cutShape, double shapeSize) override;
TopoDS_Compound findSectionPlaneIntersections(const TopoDS_Shape& cutShape) override;
TopoDS_Shape prepareShape(const TopoDS_Shape& cutShape, double shapeSize) override;
TopoDS_Shape getShapeToPrepare() const override;
TopoDS_Shape getShapeToIntersect() override;
gp_Pln getSectionPlane() const override;
TopoDS_Compound alignSectionFaces(TopoDS_Shape faceIntersections) override;
std::pair<Base::Vector3d, Base::Vector3d> sectionLineEnds() override;

bool boxesIntersect(TopoDS_Face &face, TopoDS_Shape &shape);
TopoDS_Shape shapeShapeIntersect(const TopoDS_Shape &shape0, const TopoDS_Shape &shape1);
std::vector<TopoDS_Face> faceShapeIntersect(const TopoDS_Face &face, const TopoDS_Shape &shape);
TopoDS_Shape extrudeWireToFace(TopoDS_Wire &wire, gp_Dir extrudeDir, double extrudeDist);
TopoDS_Shape makeAlignedPieces(const TopoDS_Shape &rawShape, const TopoDS_Shape &toolFaceShape,
double extrudeDistance);
TopoDS_Shape distributeAlignedPieces(std::vector<TopoDS_Shape> pieces);
TopoDS_Compound singleToolIntersections(const TopoDS_Shape &cutShape);
TopoDS_Compound alignedToolIntersections(const TopoDS_Shape &cutShape);
void makeSectionCut(TopoDS_Shape& baseShape) override;

void waitingForAlign(bool s) { m_waitingForAlign = s; }
bool waitingForAlign(void) const { return m_waitingForAlign; }

TopoDS_Shape getShapeForDetail() const override;

public Q_SLOTS:
void onSectionCutFinished(void) override;

bool boxesIntersect(TopoDS_Face& face, TopoDS_Shape& shape);
TopoDS_Shape shapeShapeIntersect(const TopoDS_Shape& shape0, const TopoDS_Shape& shape1);
std::vector<TopoDS_Face> faceShapeIntersect(const TopoDS_Face& face, const TopoDS_Shape& shape);
TopoDS_Shape extrudeWireToFace(TopoDS_Wire& wire, gp_Dir extrudeDir, double extrudeDist);
void makeAlignedPieces(const TopoDS_Shape& rawShape);
TopoDS_Compound singleToolIntersections(const TopoDS_Shape& cutShape);
TopoDS_Compound alignedToolIntersections(const TopoDS_Shape& cutShape);

BaseGeomPtrVector makeSectionLineGeometry();
std::pair<Base::Vector3d, Base::Vector3d> sectionArrowDirs();
Expand All @@ -75,27 +83,34 @@ class TechDrawExport DrawComplexSection: public DrawViewSection
ChangePointVector getChangePointsFromSectionLine() override;

bool validateProfilePosition(TopoDS_Wire profileWire, gp_Ax2 sectionCS,
gp_Dir &gClosestBasis) const;
gp_Dir& gClosestBasis) const;
bool showSegment(gp_Dir segmentNormal) const;
gp_Vec projectVector(const gp_Vec& vec) const;

TopoDS_Wire makeProfileWire() const;
static TopoDS_Wire makeProfileWire(App::DocumentObject *toolObj);
static TopoDS_Wire makeProfileWire(App::DocumentObject* toolObj);
static TopoDS_Wire makeNoseToTailWire(TopoDS_Wire inWire);
static gp_Vec makeProfileVector(TopoDS_Wire profileWire);
static bool isProfileObject(App::DocumentObject *obj);
static bool isMultiSegmentProfile(App::DocumentObject *obj);
static bool isLinearProfile(App::DocumentObject *obj);
static bool isProfileObject(App::DocumentObject* obj);
static bool isMultiSegmentProfile(App::DocumentObject* obj);
static bool isLinearProfile(App::DocumentObject* obj);
static bool isTrulyEmpty(TopoDS_Shape inShape);
static bool canBuild(gp_Ax2 sectionCS, App::DocumentObject* profileObject);
static gp_Vec projectVector(const gp_Vec& vec, gp_Ax2 sectionCS);

private:
gp_Dir getFaceNormal(TopoDS_Face &face);
gp_Dir getFaceNormal(TopoDS_Face& face);

TopoDS_Shape m_toolFaceShape;
TopoDS_Shape m_alignResult;
TopoDS_Shape m_preparedShape;//saved for detail views

QMetaObject::Connection connectAlignWatcher;
QFutureWatcher<void> m_alignWatcher;
QFuture<void> m_alignFuture;
bool m_waitingForAlign;

static const char *ProjectionStrategyEnums[];
static const char* ProjectionStrategyEnums[];
};

using DrawComplexSectionPython = App::FeaturePythonT<DrawComplexSection>;
Expand Down
13 changes: 6 additions & 7 deletions src/Mod/TechDraw/App/DrawView.cpp
View file
Open in desktop
Expand Up @@ -323,12 +323,7 @@ std::vector<DrawPage*> DrawView::findAllParentPages() const
DrawViewCollection *collection = nullptr;
std::vector<App::DocumentObject*> parentsAll = getInList();

//prune the duplicates
std::sort(parentsAll.begin(), parentsAll.end());
auto last = std::unique(parentsAll.begin(), parentsAll.end());
parentsAll.erase(last, parentsAll.end());

for (auto& parent : parentsAll) {
for (auto& parent : parentsAll) {
if (parent->getTypeId().isDerivedFrom(DrawPage::getClassTypeId())) {
page = static_cast<TechDraw::DrawPage*>(parent);
} else if (parent->getTypeId().isDerivedFrom(DrawViewCollection::getClassTypeId())) {
Expand All @@ -341,10 +336,14 @@ std::vector<DrawPage*> DrawView::findAllParentPages() const
}
}

//prune the duplicates
std::sort(result.begin(), result.end());
auto last = std::unique(result.begin(), result.end());
result.erase(last, result.end());

return result;
}


bool DrawView::isInClip()
{
std::vector<App::DocumentObject*> parent = getInList();
Expand Down