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

Merge pull request #11494 from Ondsel-Development/Coincident

Browse Source 
[Sketcher] Introduce an optional unified version of coincident and pointOnObject
This commit is contained in:
Chris Hennes
2023-12-04 10:46:21 -06:00
committed by GitHub
parent a1f0674020 921a8f3040
commit fe0f96ca44
4 changed files with 779 additions and 793 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/Mod/Sketcher/Gui/Workbench.cpp
View File

@@ -428,9 +428,17 @@ inline void SketcherAddWorkbenchConstraints(T& cons);
template<>
inline void SketcherAddWorkbenchConstraints<Gui::MenuItem>(Gui::MenuItem& cons)
{
cons << "Sketcher_ConstrainCoincident"
<< "Sketcher_ConstrainPointOnObject"
<< "Sketcher_ConstrainVertical"
ParameterGrp::handle hGrp = App::GetApplication().GetParameterGroupByPath(
"User parameter:BaseApp/Preferences/Mod/Sketcher/Constraints");
if (hGrp->GetBool("UnifiedCoincident", false)) {
cons << "Sketcher_ConstrainCoincidentUnified";
}
else {
cons << "Sketcher_ConstrainCoincident"
<< "Sketcher_ConstrainPointOnObject";
}
cons << "Sketcher_ConstrainVertical"
<< "Sketcher_ConstrainHorizontal"
<< "Sketcher_ConstrainHorVer"
<< "Sketcher_ConstrainParallel"
@@ -459,18 +467,33 @@ template<>
inline void SketcherAddWorkbenchConstraints<Gui::ToolBarItem>(Gui::ToolBarItem& cons)
{
ParameterGrp::handle hGrp = App::GetApplication().GetParameterGroupByPath(
"User parameter:BaseApp/Preferences/Mod/Sketcher/dimensioning");
"User parameter:BaseApp/Preferences/Mod/Sketcher/Constraints");
cons << "Sketcher_ConstrainCoincident"
<< "Sketcher_ConstrainPointOnObject"
<< "Sketcher_CompHorVer"
<< "Sketcher_ConstrainParallel"
if (hGrp->GetBool("UnifiedCoincident", false)) {
cons << "Sketcher_ConstrainCoincidentUnified";
}
else {
cons << "Sketcher_ConstrainCoincident"
<< "Sketcher_ConstrainPointOnObject";
}
if (hGrp->GetBool("AutoHorVer", true)) {
cons << "Sketcher_CompHorVer";
}
else {
cons << "Sketcher_ConstrainVertical"
<< "Sketcher_ConstrainHorizontal";
}
cons << "Sketcher_ConstrainParallel"
<< "Sketcher_ConstrainPerpendicular"
<< "Sketcher_ConstrainTangent"
<< "Sketcher_ConstrainEqual"
<< "Sketcher_ConstrainSymmetric"
<< "Sketcher_ConstrainBlock"
<< "Separator";
hGrp = App::GetApplication().GetParameterGroupByPath(
"User parameter:BaseApp/Preferences/Mod/Sketcher/dimensioning");
if (hGrp->GetBool("SingleDimensioningTool", true)) {
if (!hGrp->GetBool("SeparatedDimensioningTools", false)) {
cons << "Sketcher_CompDimensionTools";