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

[TD]fix parallel edge test (fix #16851)

Browse Source 
- missing normalization before test
This commit is contained in:
wandererfan
2024-09-29 20:51:49 -04:00
committed by Yorik van Havre
parent 5ce6c7933a
commit 528c2a0a17
2 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Mod/TechDraw/Gui/CommandCreateDims.cpp
View File

@@ -2397,7 +2397,6 @@ void execDim(Gui::Command* cmd, std::string type, StringVector acceptableGeometr
//what 2d geometry configuration did we receive?
DimensionGeometryType geometryRefs2d = validateDimSelection(
references2d, acceptableGeometry, minimumCounts, acceptableDimensionGeometrys);
if (geometryRefs2d == TechDraw::isInvalid) {
QMessageBox::warning(Gui::getMainWindow(),
QObject::tr("Incorrect Selection"),
@@ -2406,7 +2405,7 @@ void execDim(Gui::Command* cmd, std::string type, StringVector acceptableGeometr
}
//what 3d geometry configuration did we receive?
DimensionGeometryType geometryRefs3d;
DimensionGeometryType geometryRefs3d{TechDraw::isInvalid};
if (geometryRefs2d == TechDraw::isViewReference && !references3d.empty()) {
geometryRefs3d = validateDimSelection3d(partFeat,
references3d,

30
src/Mod/TechDraw/Gui/DimensionValidators.cpp
View File

@@ -549,18 +549,16 @@ DimensionGeometryType TechDraw::isValidMultiEdge(ReferenceVector refs)
return isInvalid; //not supported yet
}
Base::Vector3d line0 = gen0->points.at(1) - gen0->points.at(0);
line0.Normalize();
Base::Vector3d line1 = gen1->points.at(1) - gen1->points.at(0);
double xprod = fabs(line0.x * line1.y - line0.y * line1.x);
if (xprod > FLT_EPSILON) {//edges are not parallel
return isAngle; //angle or distance
} else {
return isDiagonal;//distance || line
line1.Normalize();
double dot = fabs(line0.Dot(line1));
if (DU::fpCompare(dot, 1.0, EWTOLERANCE)) {
return isDiagonal; //distance || line
}
} else {
return isDiagonal;//two edges, not both straight lines
return isAngle; //angle or distance
}
return isInvalid;
return isDiagonal; //two edges, not both straight lines
}
//! verify that the edge references can make a dimension. Currently only extent
@@ -605,20 +603,24 @@ DimensionGeometryType TechDraw::isValidMultiEdge3d(DrawViewPart* dvp, ReferenceV
if (edgesAll.size() > 2) {
//must be an extent dimension of lines?
return isMultiEdge;
} else if (edgesAll.size() == 2) {
}
if (edgesAll.size() == 2) {
Base::Vector3d first0 = DU::toVector3d(BRep_Tool::Pnt(TopExp::FirstVertex(edgesAll.at(0))));
Base::Vector3d last0 = DU::toVector3d(BRep_Tool::Pnt(TopExp::LastVertex(edgesAll.at(1))));
Base::Vector3d line0 = last0 - first0;
Base::Vector3d first1 = DU::toVector3d(BRep_Tool::Pnt(TopExp::FirstVertex(edgesAll.at(0))));
Base::Vector3d last1 = DU::toVector3d(BRep_Tool::Pnt(TopExp::LastVertex(edgesAll.at(1))));
Base::Vector3d line1 = last1 - first1;
if (DU::fpCompare(fabs(line0.Dot(line1)), 1)) {
line0.Normalize();
line1.Normalize();
auto dot = fabs(line0.Dot(line1));
if (DU::fpCompare(dot, 1.0, EWTOLERANCE)) {
//lines are parallel, must be distance dim
return isDiagonal;
} else {
//lines are skew, could be angle, could be distance?
return isAngle;
}
//lines are skew, could be angle, could be distance?
return isAngle;
}
return isInvalid;