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

Sketcher: add five tools to the Sketcher toolbar and reorder code

Browse Source 
Add template specification for `SketcherAddWorkspaceSketchExtra`
for type `Gui::ToolBarItem` so that the following commands
are added to the toolbar as well as the Sketcher menu:
`ReorientSketch`, `ValidateSketch`, `MergeSketch`, `MirrorSketch`,
`StopOperation`.

Reorganize the order of the function declarations
so that they are in this order: Sketch actions (general),
geometries, constraints, tools, B-splines, and virtual space.

Add separators to the list of tools commands in the menu
so that it looks clearer.

Correct the header guard `#ifndef SKETCHER_WORKBENCH_H`.
Previously, it was using a guard `IMAGE_WORKBENCH_H`
seemingly copied from the Image Workbench.
This commit is contained in:
vocx-fc
2020-09-26 18:56:53 -05:00
committed by wmayer
parent ef067e9f5f
commit b81ea41ae5
2 changed files with 160 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -58,21 +58,19 @@ Gui::MenuItem* Workbench::setupMenuBar() const
Gui::MenuItem* item = root->findItem("&Windows");
// == Profile menu ==========================================
/* Gui::MenuItem* profile = new Gui::MenuItem;
/* TODO: implement profile menu with different profiles
Gui::MenuItem* profile = new Gui::MenuItem;
root->insertItem(item, profile);
profile->setCommand("P&rofiles");
*profile << "Sketcher_ProfilesHexagon1";*/
*profile << "Sketcher_ProfilesHexagon1";
*/
// == Sketcher menu ==========================================
Gui::MenuItem* sketch = new Gui::MenuItem;
// root->insertItem(profile, sketch);
root->insertItem(item, sketch);
sketch->setCommand("S&ketch");
Gui::MenuItem* geom = new Gui::MenuItem();
geom->setCommand("Sketcher geometries");
addSketcherWorkbenchGeometries( *geom );
addSketcherWorkbenchGeometries(*geom);
Gui::MenuItem* cons = new Gui::MenuItem();
cons->setCommand("Sketcher constraints");
@@ -90,8 +88,10 @@ Gui::MenuItem* Workbench::setupMenuBar() const
virtualspace->setCommand("Sketcher virtual space");
addSketcherWorkbenchVirtualSpace(*virtualspace);
addSketcherWorkbenchSketchActions( *sketch );
*sketch << "Sketcher_StopOperation";
Gui::MenuItem* sketch = new Gui::MenuItem;
root->insertItem(item, sketch);
sketch->setCommand("S&ketch");
addSketcherWorkbenchSketchActions(*sketch);
*sketch << geom
<< cons
<< consaccel
@@ -105,9 +105,9 @@ Gui::ToolBarItem* Workbench::setupToolBars() const
{
Gui::ToolBarItem* root = StdWorkbench::setupToolBars();
Gui::ToolBarItem* part = new Gui::ToolBarItem(root);
part->setCommand("Sketcher");
addSketcherWorkbenchSketchActions( *part );
Gui::ToolBarItem* sketcher = new Gui::ToolBarItem(root);
sketcher->setCommand("Sketcher");
addSketcherWorkbenchSketchActions(*sketcher);
Gui::ToolBarItem* geom = new Gui::ToolBarItem(root);
geom->setCommand("Sketcher geometries");
@@ -115,26 +115,26 @@ Gui::ToolBarItem* Workbench::setupToolBars() const
Gui::ToolBarItem* cons = new Gui::ToolBarItem(root);
cons->setCommand("Sketcher constraints");
addSketcherWorkbenchConstraints( *cons );
addSketcherWorkbenchConstraints(*cons);
Gui::ToolBarItem* consaccel = new Gui::ToolBarItem(root);
consaccel->setCommand("Sketcher tools");
addSketcherWorkbenchTools( *consaccel );
addSketcherWorkbenchTools(*consaccel);
Gui::ToolBarItem* bspline = new Gui::ToolBarItem(root);
bspline->setCommand("Sketcher B-spline tools");
addSketcherWorkbenchBSplines( *bspline );
addSketcherWorkbenchBSplines(*bspline);
Gui::ToolBarItem* virtualspace = new Gui::ToolBarItem(root);
virtualspace->setCommand("Sketcher virtual space");
addSketcherWorkbenchVirtualSpace( *virtualspace );
addSketcherWorkbenchVirtualSpace(*virtualspace);
return root;
}
Gui::ToolBarItem* Workbench::setupCommandBars() const
{
// Part tools
// Sketcher tools
Gui::ToolBarItem* root = new Gui::ToolBarItem;
return root;
}
@@ -143,18 +143,52 @@ Gui::ToolBarItem* Workbench::setupCommandBars() const
namespace SketcherGui {
template <typename T>
void SketcherAddWorkbenchConstraints( T& cons );
template <typename T>
void Sketcher_addWorkbenchSketchActions( T& sketch );
template <typename T>
void SketcherAddWorkbenchGeometries( T& geom );
inline void SketcherAddWorkspaceSketchExtra(T& /*sketch*/) { }
template <>
inline void SketcherAddWorkspaceSketchExtra<Gui::MenuItem>(Gui::MenuItem& sketch)
{
sketch << "Sketcher_ReorientSketch"
<< "Sketcher_ValidateSketch"
<< "Sketcher_MergeSketches"
<< "Sketcher_MirrorSketch"
<< "Sketcher_StopOperation";
}
template <>
inline void SketcherAddWorkspaceSketchExtra<Gui::ToolBarItem>(Gui::ToolBarItem& sketch)
{
sketch << "Sketcher_ReorientSketch"
<< "Sketcher_ValidateSketch"
<< "Sketcher_MergeSketches"
<< "Sketcher_MirrorSketch"
<< "Sketcher_StopOperation";
}
template <typename T>
void SketcherAddWorkbenchSketchActions(T& sketch);
template <typename T>
inline void SketcherAddWorkbenchSketchActions(T& sketch)
{
sketch << "Sketcher_NewSketch"
<< "Sketcher_EditSketch"
<< "Sketcher_LeaveSketch"
<< "Sketcher_ViewSketch"
<< "Sketcher_ViewSection"
<< "Sketcher_MapSketch";
SketcherAddWorkspaceSketchExtra(sketch);
}
template <typename T>
void SketcherAddWorkbenchGeometries(T& geom);
template <typename T>
void SketcherAddWorkspaceArcs(T& geom);
template <>
inline void SketcherAddWorkspaceArcs<Gui::MenuItem>(Gui::MenuItem& geom){
inline void SketcherAddWorkspaceArcs<Gui::MenuItem>(Gui::MenuItem& geom)
{
geom << "Sketcher_CreateArc"
<< "Sketcher_Create3PointArc"
<< "Sketcher_CreateCircle"
@@ -167,17 +201,22 @@ inline void SketcherAddWorkspaceArcs<Gui::MenuItem>(Gui::MenuItem& geom){
<< "Sketcher_CreateBSpline"
<< "Sketcher_CreatePeriodicBSpline";
}
template <>
inline void SketcherAddWorkspaceArcs<Gui::ToolBarItem>(Gui::ToolBarItem& geom){
inline void SketcherAddWorkspaceArcs<Gui::ToolBarItem>(Gui::ToolBarItem& geom)
{
geom << "Sketcher_CompCreateArc"
<< "Sketcher_CompCreateCircle"
<< "Sketcher_CompCreateConic"
<< "Sketcher_CompCreateBSpline";
}
template <typename T>
void SketcherAddWorkspaceRegularPolygon(T& geom);
template <>
inline void SketcherAddWorkspaceRegularPolygon<Gui::MenuItem>(Gui::MenuItem& geom){
inline void SketcherAddWorkspaceRegularPolygon<Gui::MenuItem>(Gui::MenuItem& geom)
{
geom << "Sketcher_CreateTriangle"
<< "Sketcher_CreateSquare"
<< "Sketcher_CreatePentagon"
@@ -186,19 +225,23 @@ inline void SketcherAddWorkspaceRegularPolygon<Gui::MenuItem>(Gui::MenuItem& geo
<< "Sketcher_CreateOctagon"
<< "Sketcher_CreateRegularPolygon";
}
template <>
inline void SketcherAddWorkspaceRegularPolygon<Gui::ToolBarItem>(Gui::ToolBarItem& geom){
inline void SketcherAddWorkspaceRegularPolygon<Gui::ToolBarItem>(Gui::ToolBarItem& geom)
{
geom << "Sketcher_CompCreateRegularPolygon";
}
template <typename T>
inline void SketcherAddWorkbenchGeometries(T& geom){
inline void SketcherAddWorkbenchGeometries(T& geom)
{
geom << "Sketcher_CreatePoint"
<< "Sketcher_CreateLine";
SketcherAddWorkspaceArcs( geom );
SketcherAddWorkspaceArcs(geom);
geom << "Separator"
<< "Sketcher_CreatePolyline"
<< "Sketcher_CreateRectangle";
SketcherAddWorkspaceRegularPolygon( geom );
SketcherAddWorkspaceRegularPolygon(geom);
geom << "Sketcher_CreateSlot"
<< "Separator"
<< "Sketcher_CreateFillet"
@@ -211,11 +254,15 @@ inline void SketcherAddWorkbenchGeometries(T& geom){
/*<< "Sketcher_CreateDraftLine"*/;
}
//template <typename T>
//void SketcherAddWorkbenchConstraints(T& cons);
template <typename T>
inline void SketcherAddWorkbenchConstraints(T& cons);
template <>
inline void SketcherAddWorkbenchConstraints<Gui::MenuItem>(Gui::MenuItem& cons){
inline void SketcherAddWorkbenchConstraints<Gui::MenuItem>(Gui::MenuItem& cons)
{
cons << "Sketcher_ConstrainCoincident"
<< "Sketcher_ConstrainPointOnObject"
<< "Sketcher_ConstrainVertical"
@@ -242,7 +289,8 @@ inline void SketcherAddWorkbenchConstraints<Gui::MenuItem>(Gui::MenuItem& cons){
}
template <>
inline void SketcherAddWorkbenchConstraints<Gui::ToolBarItem>(Gui::ToolBarItem& cons){
inline void SketcherAddWorkbenchConstraints<Gui::ToolBarItem>(Gui::ToolBarItem& cons)
{
cons << "Sketcher_ConstrainCoincident"
<< "Sketcher_ConstrainPointOnObject"
<< "Sketcher_ConstrainVertical"
@@ -271,44 +319,54 @@ template <typename T>
inline void SketcherAddWorkbenchTools(T& consaccel);
template <>
inline void SketcherAddWorkbenchTools<Gui::MenuItem>(Gui::MenuItem& consaccel){
inline void SketcherAddWorkbenchTools<Gui::MenuItem>(Gui::MenuItem& consaccel)
{
consaccel << "Sketcher_SelectElementsWithDoFs"
<< "Sketcher_CloseShape"
<< "Sketcher_ConnectLines"
<< "Sketcher_SelectConstraints"
<< "Sketcher_SelectElementsAssociatedWithConstraints"
<< "Sketcher_SelectRedundantConstraints"
<< "Sketcher_SelectConflictingConstraints"
<< "Sketcher_RestoreInternalAlignmentGeometry"
<< "Separator"
<< "Sketcher_SelectOrigin"
<< "Sketcher_SelectVerticalAxis"
<< "Sketcher_SelectHorizontalAxis"
<< "Sketcher_SelectRedundantConstraints"
<< "Sketcher_SelectConflictingConstraints"
<< "Sketcher_SelectElementsAssociatedWithConstraints"
<< "Sketcher_RestoreInternalAlignmentGeometry"
<< "Separator"
<< "Sketcher_Symmetry"
<< "Sketcher_Clone"
<< "Sketcher_Copy"
<< "Sketcher_Move"
<< "Sketcher_RectangularArray"
<< "Separator"
<< "Sketcher_DeleteAllGeometry"
<< "Sketcher_DeleteAllConstraints";
}
template <>
inline void SketcherAddWorkbenchTools<Gui::ToolBarItem>(Gui::ToolBarItem& consaccel){
inline void SketcherAddWorkbenchTools<Gui::ToolBarItem>(Gui::ToolBarItem& consaccel)
{
consaccel << "Sketcher_SelectElementsWithDoFs"
<< "Sketcher_CloseShape"
<< "Sketcher_ConnectLines"
<< "Sketcher_SelectConstraints"
<< "Sketcher_SelectElementsAssociatedWithConstraints"
<< "Sketcher_SelectRedundantConstraints"
<< "Sketcher_SelectConflictingConstraints"
<< "Sketcher_RestoreInternalAlignmentGeometry"
<< "Sketcher_Symmetry"
<< "Sketcher_CompCopy"
<< "Sketcher_RectangularArray";
<< "Sketcher_RectangularArray"
<< "Sketcher_DeleteAllConstraints";
}
template <typename T>
inline void SketcherAddWorkbenchBSplines(T& bspline);
template <>
inline void SketcherAddWorkbenchBSplines<Gui::MenuItem>(Gui::MenuItem& bspline){
inline void SketcherAddWorkbenchBSplines<Gui::MenuItem>(Gui::MenuItem& bspline)
{
bspline << "Sketcher_BSplineDegree"
<< "Sketcher_BSplinePolygon"
<< "Sketcher_BSplineComb"
@@ -321,7 +379,8 @@ inline void SketcherAddWorkbenchBSplines<Gui::MenuItem>(Gui::MenuItem& bspline){
}
template <>
inline void SketcherAddWorkbenchBSplines<Gui::ToolBarItem>(Gui::ToolBarItem& bspline){
inline void SketcherAddWorkbenchBSplines<Gui::ToolBarItem>(Gui::ToolBarItem& bspline)
{
bspline << "Sketcher_CompBSplineShowHideGeometryInformation"
<< "Sketcher_BSplineConvertToNURB"
<< "Sketcher_BSplineIncreaseDegree"
@@ -333,87 +392,75 @@ template <typename T>
inline void SketcherAddWorkbenchVirtualSpace(T& virtualspace);
template <>
inline void SketcherAddWorkbenchVirtualSpace<Gui::MenuItem>(Gui::MenuItem& virtualspace){
inline void SketcherAddWorkbenchVirtualSpace<Gui::MenuItem>(Gui::MenuItem& virtualspace)
{
virtualspace << "Sketcher_SwitchVirtualSpace";
}
template <>
inline void SketcherAddWorkbenchVirtualSpace<Gui::ToolBarItem>(Gui::ToolBarItem& virtualspace){
inline void SketcherAddWorkbenchVirtualSpace<Gui::ToolBarItem>(Gui::ToolBarItem& virtualspace)
{
virtualspace << "Sketcher_SwitchVirtualSpace";
}
template <typename T>
inline void SketcherAddWorkspaceSketchExtra(T& /*sketch*/){
void addSketcherWorkbenchSketchActions(Gui::MenuItem& sketch)
{
SketcherAddWorkbenchSketchActions(sketch);
}
template <>
inline void SketcherAddWorkspaceSketchExtra<Gui::MenuItem>(Gui::MenuItem& sketch){
sketch << "Sketcher_ReorientSketch"
<< "Sketcher_ValidateSketch"
<< "Sketcher_MergeSketches"
<< "Sketcher_MirrorSketch";
}
template <typename T>
inline void Sketcher_addWorkbenchSketchActions(T& sketch){
sketch << "Sketcher_NewSketch"
<< "Sketcher_EditSketch"
<< "Sketcher_LeaveSketch"
<< "Sketcher_ViewSketch"
<< "Sketcher_ViewSection"
<< "Sketcher_MapSketch";
SketcherAddWorkspaceSketchExtra( sketch );
}
void addSketcherWorkbenchConstraints( Gui::MenuItem& cons ){
SketcherAddWorkbenchConstraints( cons );
}
void addSketcherWorkbenchTools( Gui::MenuItem& consaccel ){
SketcherAddWorkbenchTools( consaccel );
}
void addSketcherWorkbenchBSplines( Gui::MenuItem& bspline ){
SketcherAddWorkbenchBSplines( bspline );
}
void addSketcherWorkbenchVirtualSpace( Gui::MenuItem& virtualspace ){
SketcherAddWorkbenchVirtualSpace( virtualspace );
}
void addSketcherWorkbenchSketchActions( Gui::MenuItem& sketch ){
Sketcher_addWorkbenchSketchActions( sketch );
}
void addSketcherWorkbenchGeometries( Gui::MenuItem& geom ){
void addSketcherWorkbenchGeometries(Gui::MenuItem& geom)
{
SketcherAddWorkbenchGeometries(geom);
}
void addSketcherWorkbenchConstraints( Gui::ToolBarItem& cons ){
SketcherAddWorkbenchConstraints( cons );
}
void addSketcherWorkbenchTools( Gui::ToolBarItem& consaccel )
void addSketcherWorkbenchConstraints(Gui::MenuItem& cons)
{
SketcherAddWorkbenchTools( consaccel );
SketcherAddWorkbenchConstraints(cons);
}
void addSketcherWorkbenchBSplines( Gui::ToolBarItem& bspline )
void addSketcherWorkbenchTools(Gui::MenuItem& consaccel)
{
SketcherAddWorkbenchBSplines( bspline );
SketcherAddWorkbenchTools(consaccel);
}
void addSketcherWorkbenchVirtualSpace( Gui::ToolBarItem& virtualspace )
void addSketcherWorkbenchBSplines(Gui::MenuItem& bspline)
{
SketcherAddWorkbenchVirtualSpace( virtualspace );
SketcherAddWorkbenchBSplines(bspline);
}
void addSketcherWorkbenchSketchActions( Gui::ToolBarItem& sketch ){
Sketcher_addWorkbenchSketchActions( sketch );
void addSketcherWorkbenchVirtualSpace(Gui::MenuItem& virtualspace)
{
SketcherAddWorkbenchVirtualSpace(virtualspace);
}
void addSketcherWorkbenchGeometries( Gui::ToolBarItem& geom ){
void addSketcherWorkbenchSketchActions(Gui::ToolBarItem& sketch)
{
SketcherAddWorkbenchSketchActions(sketch);
}
void addSketcherWorkbenchGeometries(Gui::ToolBarItem& geom)
{
SketcherAddWorkbenchGeometries(geom);
}
void addSketcherWorkbenchConstraints(Gui::ToolBarItem& cons)
{
SketcherAddWorkbenchConstraints(cons);
}
void addSketcherWorkbenchTools(Gui::ToolBarItem& consaccel)
{
SketcherAddWorkbenchTools(consaccel);
}
void addSketcherWorkbenchBSplines(Gui::ToolBarItem& bspline)
{
SketcherAddWorkbenchBSplines(bspline);
}
void addSketcherWorkbenchVirtualSpace(Gui::ToolBarItem& virtualspace)
{
SketcherAddWorkbenchVirtualSpace(virtualspace);
}
} /* namespace SketcherGui */

34
src/Mod/Sketcher/Gui/Workbench.h
View File

@@ -21,8 +21,8 @@
***************************************************************************/
#ifndef IMAGE_WORKBENCH_H
#define IMAGE_WORKBENCH_H
#ifndef SKETCHER_WORKBENCH_H
#define SKETCHER_WORKBENCH_H
#include <Gui/Workbench.h>
#include <Gui/MenuManager.h>
@@ -47,24 +47,20 @@ protected:
Gui::ToolBarItem* setupCommandBars() const;
};
SketcherGuiExport void addSketcherWorkbenchSketchActions(Gui::MenuItem& sketch);
SketcherGuiExport void addSketcherWorkbenchGeometries(Gui::MenuItem& geom);
SketcherGuiExport void addSketcherWorkbenchConstraints(Gui::MenuItem& cons);
SketcherGuiExport void addSketcherWorkbenchTools(Gui::MenuItem& consaccel);
SketcherGuiExport void addSketcherWorkbenchBSplines(Gui::MenuItem& bspline);
SketcherGuiExport void addSketcherWorkbenchVirtualSpace(Gui::MenuItem& virtualspace);
SketcherGuiExport void addSketcherWorkbenchConstraints( Gui::MenuItem& cons );
SketcherGuiExport void addSketcherWorkbenchTools( Gui::MenuItem& consaccel );
SketcherGuiExport void addSketcherWorkbenchBSplines( Gui::MenuItem& bspline );
SketcherGuiExport void addSketcherWorkbenchVirtualSpace( Gui::MenuItem& virtualspace );
SketcherGuiExport void addSketcherWorkbenchSketchActions( Gui::MenuItem& sketch );
SketcherGuiExport void addSketcherWorkbenchGeometries( Gui::MenuItem& geom );
SketcherGuiExport void addSketcherWorkbenchConstraints( Gui::ToolBarItem& cons );
SketcherGuiExport void addSketcherWorkbenchTools( Gui::ToolBarItem& consaccel );
SketcherGuiExport void addSketcherWorkbenchBSplines( Gui::ToolBarItem& bspline );
SketcherGuiExport void addSketcherWorkbenchVirtualSpace( Gui::ToolBarItem& virtualspace );
SketcherGuiExport void addSketcherWorkbenchSketchActions( Gui::ToolBarItem& sketch );
SketcherGuiExport void addSketcherWorkbenchGeometries( Gui::ToolBarItem& geom );
SketcherGuiExport void addSketcherWorkbenchSketchActions(Gui::ToolBarItem& sketch);
SketcherGuiExport void addSketcherWorkbenchGeometries(Gui::ToolBarItem& geom);
SketcherGuiExport void addSketcherWorkbenchConstraints(Gui::ToolBarItem& cons);
SketcherGuiExport void addSketcherWorkbenchTools(Gui::ToolBarItem& consaccel);
SketcherGuiExport void addSketcherWorkbenchBSplines(Gui::ToolBarItem& bspline);
SketcherGuiExport void addSketcherWorkbenchVirtualSpace(Gui::ToolBarItem& virtualspace);
} // namespace SketcherGui
#endif // IMAGE_WORKBENCH_H
#endif // SKETCHER_WORKBENCH_H