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

PD: [skip ci] refactor Hole feature

Browse Source
This commit is contained in:
wmayer
2022-02-26 16:18:20 +01:00
parent 4753b0232d
commit df0fac1de8
2 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/Mod/PartDesign/App/FeatureHole.cpp
View File

@@ -1661,20 +1661,7 @@ App::DocumentObjectExecReturn* Hole::execute(void)
// Define this as zDir
gp_Vec zDir(SketchVector.x, SketchVector.y, SketchVector.z);
zDir.Transform(invObjLoc.Transformation());
// Define xDir
gp_Vec xDir;
/* Compute xDir normal to zDir */
if (std::abs(zDir.Z() - zDir.X()) > Precision::Confusion())
xDir = gp_Vec(zDir.Z(), 0, -zDir.X());
else if (std::abs(zDir.Z() - zDir.Y()) > Precision::Confusion())
xDir = gp_Vec(zDir.Y(), -zDir.X(), 0);
else
xDir = gp_Vec(0, -zDir.Z(), zDir.Y());
// Normalize xDir; this is needed as the computation above does not necessarily give a unit-length vector.
xDir.Normalize();
gp_Vec xDir = computePerpendicular(zDir);
if (method == "Dimension")
length = Depth.getValue();
@@ -2100,6 +2087,24 @@ void Hole::rotateToNormal(const gp_Dir& helixAxis, const gp_Dir& normalAxis, Top
}
}
gp_Vec Hole::computePerpendicular(const gp_Vec& zDir)
{
// Define xDir
gp_Vec xDir;
/* Compute xDir normal to zDir */
if (std::abs(zDir.Z() - zDir.X()) > Precision::Confusion())
xDir = gp_Vec(zDir.Z(), 0, -zDir.X());
else if (std::abs(zDir.Z() - zDir.Y()) > Precision::Confusion())
xDir = gp_Vec(zDir.Y(), -zDir.X(), 0);
else
xDir = gp_Vec(0, -zDir.Z(), zDir.Y());
// Normalize xDir; this is needed as the computation above does not necessarily give a unit-length vector.
xDir.Normalize();
return xDir;
}
void Hole::addCutType(const CutDimensionSet& dimensions)
{
const CutDimensionSet::ThreadType thread = dimensions.thread_type;

1
src/Mod/PartDesign/App/FeatureHole.h
View File

@@ -220,6 +220,7 @@ private:
double getThreadRunout(int mode = 1);
double getThreadPitch();
void rotateToNormal(const gp_Dir& helixAxis, const gp_Dir& normalAxis, TopoDS_Shape& helixShape);
gp_Vec computePerpendicular(const gp_Vec&);
// helpers for nlohmann json
friend void from_json(const nlohmann::json &j, CounterBoreDimension &t);