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

GCS/Sketcher: Add equal length line constraint using the new single constraint

Browse Source
This commit is contained in:
Abdullah Tahiri
2021-01-19 19:55:45 +01:00
committed by abdullahtahiriyo
parent 5609269ca8
commit 186f5a4c19
3 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Mod/Sketcher/App/planegcs/GCS.cpp
View File

@@ -1045,10 +1045,12 @@ int System::addConstraintArcDiameter(Arc &a, double *radius, int tagId, bool dri
return addConstraintProportional(a.rad, radius, 0.5, tagId, driving);
}
int System::addConstraintEqualLength(Line &l1, Line &l2, double *length, int tagId, bool driving)
int System::addConstraintEqualLength(Line &l1, Line &l2, int tagId, bool driving)
{
addConstraintP2PDistance(l1.p1, l1.p2, length, tagId, driving);
return addConstraintP2PDistance(l2.p1, l2.p2, length, tagId, driving);
Constraint *constr = new ConstraintEqualLineLength(l1, l2);
constr->setTag(tagId);
constr->setDriving(driving);
return addConstraint(constr);
}
int System::addConstraintEqualRadius(Circle &c1, Circle &c2, int tagId, bool driving)
@@ -4051,7 +4053,7 @@ SolverReportingManager::Manager().LogToFile("GCS::System::diagnose()\n");
// identifyDependentParametersSparseQR(J, jacobianconstraintmap, pdiagnoselist, true)
//
// Debug:
// auto fut = std::async(std::launch::deferred,&System::identifyDependentParametersSparseQR,this,J,jacobianconstraintmap, pdiagnoselist, false);
//auto fut = std::async(std::launch::deferred,&System::identifyDependentParametersSparseQR,this,J,jacobianconstraintmap, pdiagnoselist, false);
auto fut = std::async(&System::identifyDependentParametersSparseQR,this,J,jacobianconstraintmap, pdiagnoselist, /*silent=*/true);
makeSparseQRDecomposition( J, jacobianconstraintmap, SqrJT, rank, R, /*transposed=*/true, /*silent=*/false);