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

Sketcher: Sketcher_ConstrainHorizontal before Sketcher_ConstrainVertical in GUI

Browse Source 
Changes to TaskSketcherElements.cpp are not required, but were done for consistency. The order in the file follows the GUI.
This commit is contained in:
Roy-043
2024-02-29 17:03:26 +01:00
committed by Chris Hennes
parent 8056b2dec1
commit 94120db2a9
3 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/Mod/Sketcher/Gui/TaskSketcherElements.cpp
View File

@@ -658,16 +658,16 @@ void ElementView::contextMenuEvent(QContextMenuEvent* event)
"Sketcher_ConstrainPointOnObject",
doPointOnObjectConstraint,
true)
CONTEXT_ITEM("Constraint_Vertical",
"Vertical Constraint",
"Sketcher_ConstrainVertical",
doVerticalConstraint,
true)
CONTEXT_ITEM("Constraint_Horizontal",
"Horizontal Constraint",
"Sketcher_ConstrainHorizontal",
doHorizontalConstraint,
true)
CONTEXT_ITEM("Constraint_Vertical",
"Vertical Constraint",
"Sketcher_ConstrainVertical",
doVerticalConstraint,
true)
CONTEXT_ITEM("Constraint_Parallel",
"Parallel Constraint",
"Sketcher_ConstrainParallel",
@@ -792,8 +792,8 @@ void ElementView::contextMenuEvent(QContextMenuEvent* event)
CONTEXT_MEMBER_DEF("Sketcher_ConstrainCoincident", doPointCoincidence)
CONTEXT_MEMBER_DEF("Sketcher_ConstrainPointOnObject", doPointOnObjectConstraint)
CONTEXT_MEMBER_DEF("Sketcher_ConstrainVertical", doVerticalConstraint)
CONTEXT_MEMBER_DEF("Sketcher_ConstrainHorizontal", doHorizontalConstraint)
CONTEXT_MEMBER_DEF("Sketcher_ConstrainVertical", doVerticalConstraint)
CONTEXT_MEMBER_DEF("Sketcher_ConstrainParallel", doParallelConstraint)
CONTEXT_MEMBER_DEF("Sketcher_ConstrainPerpendicular", doPerpendicularConstraint)
CONTEXT_MEMBER_DEF("Sketcher_ConstrainTangent", doTangentConstraint)

16
src/Mod/Sketcher/Gui/ViewProviderSketch.cpp
View File

@@ -4044,8 +4044,8 @@ void ViewProviderSketch::generateContextMenu()
menu << "Sketcher_Dimension";
if (selectedConics == 0) {
menu << "Sketcher_ConstrainHorVer"
<< "Sketcher_ConstrainVertical"
<< "Sketcher_ConstrainHorizontal";
<< "Sketcher_ConstrainHorizontal"
<< "Sketcher_ConstrainVertical";
if (selectedLines > 1) {
menu << "Sketcher_ConstrainParallel";
@@ -4073,8 +4073,8 @@ void ViewProviderSketch::generateContextMenu()
if (selectedConics == 0 && selectedBsplines == 0) {
menu << "Sketcher_ConstrainCoincidentUnified"
<< "Sketcher_ConstrainHorVer"
<< "Sketcher_ConstrainVertical"
<< "Sketcher_ConstrainHorizontal";
<< "Sketcher_ConstrainHorizontal"
<< "Sketcher_ConstrainVertical";
if (selectedPoints == 2) {
menu << "Sketcher_ConstrainSymmetric";
}
@@ -4095,8 +4095,8 @@ void ViewProviderSketch::generateContextMenu()
if (selectedPoints > 1) {
menu << "Sketcher_ConstrainCoincidentUnified"
<< "Sketcher_ConstrainHorVer"
<< "Sketcher_ConstrainVertical"
<< "Sketcher_ConstrainHorizontal";
<< "Sketcher_ConstrainHorizontal"
<< "Sketcher_ConstrainVertical";
}
if (selectedPoints == 2) {
menu << "Sketcher_ConstrainPerpendicular"
@@ -4109,8 +4109,8 @@ void ViewProviderSketch::generateContextMenu()
else if (selectedLines >= 1 && selectedPoints >= 1 && !onlyOrigin) {
menu << "Sketcher_Dimension"
<< "Sketcher_ConstrainHorVer"
<< "Sketcher_ConstrainVertical"
<< "Sketcher_ConstrainHorizontal";
<< "Sketcher_ConstrainHorizontal"
<< "Sketcher_ConstrainVertical";
}
// context menu if only constraints are selected
else if (selectedConstraints >= 1) {

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

@@ -438,9 +438,9 @@ inline void SketcherAddWorkbenchConstraints<Gui::MenuItem>(Gui::MenuItem& cons)
cons << "Sketcher_ConstrainCoincident"
<< "Sketcher_ConstrainPointOnObject";
}
cons << "Sketcher_ConstrainVertical"
cons << "Sketcher_ConstrainHorVer"
<< "Sketcher_ConstrainHorizontal"
<< "Sketcher_ConstrainHorVer"
<< "Sketcher_ConstrainVertical"
<< "Sketcher_ConstrainParallel"
<< "Sketcher_ConstrainPerpendicular"
<< "Sketcher_ConstrainTangent"
@@ -480,8 +480,8 @@ inline void SketcherAddWorkbenchConstraints<Gui::ToolBarItem>(Gui::ToolBarItem&
cons << "Sketcher_CompHorVer";
}
else {
cons << "Sketcher_ConstrainVertical"
<< "Sketcher_ConstrainHorizontal";
cons << "Sketcher_ConstrainHorizontal"
<< "Sketcher_ConstrainVertical";
}
cons << "Sketcher_ConstrainParallel"
<< "Sketcher_ConstrainPerpendicular"