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

[Sketcher] Floating point computation immunity for carbon copy parallel/aligned checks

Browse Source
This commit is contained in:
0penBrain
2021-11-24 14:52:45 +01:00
committed by abdullahtahiriyo
parent 0ccdf8b717
commit 0ead26f5c2
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Mod/Sketcher/App/SketchObject.cpp
View File

@@ -3435,14 +3435,14 @@ bool SketchObject::isCarbonCopyAllowed(App::Document *pDoc, App::DocumentObject
double doty = sy * ly;
// the planes of the sketches must be parallel
if(!allowUnaligned && dot != 1.0 && dot != -1.0) {
if(!allowUnaligned && fabs(fabs(dot)-1) > Precision::Confusion()) {
if (rsn)
*rsn = rlNonParallel;
return false;
}
// the axis must be aligned
if(!allowUnaligned && ((dotx != 1.0 && dotx != -1.0) || (doty != 1.0 && doty != -1.0))) {
if(!allowUnaligned && ((fabs(fabs(dotx)-1) > Precision::Confusion()) || (fabs(fabs(doty)-1) > Precision::Confusion()))) {
if (rsn)
*rsn = rlAxesMisaligned;
return false;
@@ -3454,14 +3454,14 @@ bool SketchObject::isCarbonCopyAllowed(App::Document *pDoc, App::DocumentObject
double alignment = ddir * lnormal;
if(!allowUnaligned && (alignment != 1.0 && alignment != -1.0) && (psObj->Placement.getValue().getPosition() != this->Placement.getValue().getPosition()) ){
if(!allowUnaligned && (fabs(fabs(alignment)-1) > Precision::Confusion()) && (psObj->Placement.getValue().getPosition() != this->Placement.getValue().getPosition()) ){
if (rsn)
*rsn = rlOriginsMisaligned;
return false;
}
xinv = allowUnaligned?false:(dotx != 1.0);
yinv = allowUnaligned?false:(doty != 1.0);
xinv = allowUnaligned?false:(fabs(dotx-1) > Precision::Confusion());
yinv = allowUnaligned?false:(fabs(doty-1) > Precision::Confusion());
return true;
}