diff --git a/src/Mod/Surface/Gui/Command.cpp b/src/Mod/Surface/Gui/Command.cpp index 9f56974070..c0c523c54e 100644 --- a/src/Mod/Surface/Gui/Command.cpp +++ b/src/Mod/Surface/Gui/Command.cpp @@ -63,7 +63,6 @@ #include #include "Mod/Part/App/PartFeature.h" -//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ //=========================================================================== // CmdSurfaceCut THIS IS THE SURFACE CUT COMMAND @@ -199,6 +198,7 @@ CmdSurfaceCurveOnMesh::CmdSurfaceCurveOnMesh() sToolTipText = QT_TR_NOOP("Curve on mesh"); sWhatsThis = "Surface_CurveOnMesh"; sStatusTip = sToolTipText; + sPixmap = "Surface_CurveOnMesh"; } void CmdSurfaceCurveOnMesh::activated(int) @@ -294,11 +294,12 @@ bool CmdSurfaceSections::isActive(void) void CreateSurfaceCommands(void) { Gui::CommandManager &rcCmdMgr = Gui::Application::Instance->commandManager(); -/* rcCmdMgr.addCommand(new CmdSurfaceFilling()); - rcCmdMgr.addCommand(new CmdSurfaceCut());*/ +/* + rcCmdMgr.addCommand(new CmdSurfaceCut()); +*/ rcCmdMgr.addCommand(new CmdSurfaceFilling()); rcCmdMgr.addCommand(new CmdSurfaceGeomFillSurface()); - rcCmdMgr.addCommand(new CmdSurfaceCurveOnMesh()); - rcCmdMgr.addCommand(new CmdSurfaceExtendFace()); rcCmdMgr.addCommand(new CmdSurfaceSections()); + rcCmdMgr.addCommand(new CmdSurfaceExtendFace()); + rcCmdMgr.addCommand(new CmdSurfaceCurveOnMesh()); } diff --git a/src/Mod/Surface/Gui/Resources/Surface.qrc b/src/Mod/Surface/Gui/Resources/Surface.qrc index 7056509352..c09283aa91 100644 --- a/src/Mod/Surface/Gui/Resources/Surface.qrc +++ b/src/Mod/Surface/Gui/Resources/Surface.qrc @@ -2,6 +2,7 @@ icons/Surface_BezierSurface.svg icons/Surface_BSplineSurface.svg + icons/Surface_CurveOnMesh.svg icons/Surface_Cut.svg icons/Surface_Extend.svg icons/Surface_Filling.svg diff --git a/src/Mod/Surface/Gui/Resources/icons/Surface_CurveOnMesh.svg b/src/Mod/Surface/Gui/Resources/icons/Surface_CurveOnMesh.svg new file mode 100644 index 0000000000..c6bf9bf8ba --- /dev/null +++ b/src/Mod/Surface/Gui/Resources/icons/Surface_CurveOnMesh.svg @@ -0,0 +1,2208 @@ + + + Surface_CurveOnMesh + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + Surface_CurveOnMesh + 2020-09-30 + + + [vocx] + + + + + CC-BY-SA 4.0 + + + + + FreeCAD + + + FreeCAD/src/Mod/Surface/Gui/Resources/icons/Surface_CurveOnMesh.svg + http://www.freecadweb.org/wiki/index.php?title=Artwork + A purple curved surface that has a thick, red, highlighted curve on top of, it in the middle of the shape. The surface has mesh lines. It is based on the 'Surface' icon. + + + + + + + + + mesh + curve + spline + middle + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Mod/Surface/Gui/Workbench.cpp b/src/Mod/Surface/Gui/Workbench.cpp index a5a0adb9b8..10928b4f2a 100644 --- a/src/Mod/Surface/Gui/Workbench.cpp +++ b/src/Mod/Surface/Gui/Workbench.cpp @@ -52,13 +52,14 @@ Gui::MenuItem* Workbench::setupMenuBar() const Gui::MenuItem* surface = new Gui::MenuItem; root->insertItem( item, surface ); surface->setCommand("Surface"); - *surface << "Surface_CurveOnMesh" - << "Surface_ExtendFace" - << "Surface_Filling" + *surface << "Surface_Filling" << "Surface_GeomFillSurface" - << "Surface_Sections"; -/* *surface << "Surface_Filling"; - *surface << "Surface_Cut";*/ + << "Surface_Sections" + << "Surface_ExtendFace" + << "Surface_CurveOnMesh"; +/* + *surface << "Surface_Cut"; +*/ return root; } @@ -68,12 +69,15 @@ Gui::ToolBarItem* Workbench::setupToolBars() const Gui::ToolBarItem* root = StdWorkbench::setupToolBars(); Gui::ToolBarItem* surface = new Gui::ToolBarItem(root); - surface->setCommand( "Surface" ); + surface->setCommand("Surface"); *surface << "Surface_Filling" << "Surface_GeomFillSurface" << "Surface_Sections" - << "Surface_ExtendFace"; -/* *surface << "Surface_Cut"; */ + << "Surface_ExtendFace" + << "Surface_CurveOnMesh"; +/* + *surface << "Surface_Cut"; +*/ return root; }