suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sketcher: new BSpline toolbar / command to hide control polygon

Browse Source
This commit is contained in:
Abdullah Tahiri 2017-02-08 16:06:04 +01:00 committed by wmayer
parent 2a4f24695a
commit 1bac54e63e
5 changed files with 197 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Mod/Sketcher/Gui/AppSketcherGui.cpp
View File

@ -49,6 +49,7 @@ void CreateSketcherCommandsCreateGeo(void);
void CreateSketcherCommandsConstraints(void);
void CreateSketcherCommandsConstraintAccel(void);
void CreateSketcherCommandsAlterGeo(void);
void CreateSketcherCommandsBSpline(void);
void loadSketcherResource()
{
@ -98,6 +99,7 @@ PyMODINIT_FUNC initSketcherGui()
CreateSketcherCommandsConstraints();
CreateSketcherCommandsAlterGeo();
CreateSketcherCommandsConstraintAccel();
CreateSketcherCommandsBSpline();
SketcherGui::Workbench::init();

1
src/Mod/Sketcher/Gui/CMakeLists.txt
View File

@ -79,6 +79,7 @@ SET(SketcherGui_SRCS
CommandConstraints.h
CommandConstraints.cpp
CommandSketcherTools.cpp
CommandSketcherBSpline.cpp
CommandAlterGeometry.cpp
Resources/Sketcher.qrc
PreCompiled.cpp

156
src/Mod/Sketcher/Gui/CommandSketcherBSpline.cpp Normal file
View File

@ -0,0 +1,156 @@
/***************************************************************************
* Copyright (c) 2017 Abdullah Tahiri <abdullah.tahiri.yo@gmail.com> *
* *
* This file is part of the FreeCAD CAx development system. *
* *
* This library is free software; you can redistribute it and/or *
* modify it under the terms of the GNU Library General Public *
* License as published by the Free Software Foundation; either *
* version 2 of the License, or (at your option) any later version. *
* *
* This library is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU Library General Public License for more details. *
* *
* You should have received a copy of the GNU Library General Public *
* License along with this library; see the file COPYING.LIB. If not, *
* write to the Free Software Foundation, Inc., 59 Temple Place, *
* Suite 330, Boston, MA 02111-1307, USA *
* *
***************************************************************************/
#include "PreCompiled.h"
#ifndef _PreComp_
# include <cfloat>
# include <QMessageBox>
# include <Precision.hxx>
# include <QApplication>
#endif
# include <QMessageBox>
#include <Base/Console.h>
#include <App/Application.h>
#include <Gui/Application.h>
#include <Gui/Document.h>
#include <Gui/Selection.h>
#include <Gui/Command.h>
#include <Gui/MainWindow.h>
#include <Gui/DlgEditFileIncludeProptertyExternal.h>
#include <Gui/Action.h>
#include <Gui/BitmapFactory.h>
#include "ViewProviderSketch.h"
#include "DrawSketchHandler.h"
#include <Mod/Part/App/Geometry.h>
#include <Mod/Sketcher/App/SketchObject.h>
#include "ViewProviderSketch.h"
using namespace std;
using namespace SketcherGui;
using namespace Sketcher;
bool isSketcherBSplineActive(Gui::Document *doc, bool actsOnSelection )
{
if (doc) {
// checks if a Sketch Viewprovider is in Edit and is in no special mode
if (doc->getInEdit() && doc->getInEdit()->isDerivedFrom(SketcherGui::ViewProviderSketch::getClassTypeId())) {
if (static_cast<SketcherGui::ViewProviderSketch*>(doc->getInEdit())
->getSketchMode() == ViewProviderSketch::STATUS_NONE) {
if (!actsOnSelection)
return true;
else if (Gui::Selection().countObjectsOfType(Sketcher::SketchObject::getClassTypeId()) > 0)
return true;
}
}
}
return false;
}
void ActivateBSplineHandler(Gui::Document *doc,DrawSketchHandler *handler)
{
if (doc) {
if (doc->getInEdit() && doc->getInEdit()->isDerivedFrom
(SketcherGui::ViewProviderSketch::getClassTypeId())) {
SketcherGui::ViewProviderSketch* vp = static_cast<SketcherGui::ViewProviderSketch*> (doc->getInEdit());
vp->purgeHandler();
vp->activateHandler(handler);
}
}
}
extern bool isPolygonShown;
// Show/Hide BSpline polygon
DEF_STD_CMD_A(CmdSketcherBSplinePolygon);
CmdSketcherBSplinePolygon::CmdSketcherBSplinePolygon()
:Command("Sketcher_BSplinePolygon")
{
sAppModule = "Sketcher";
sGroup = QT_TR_NOOP("Sketcher");
sMenuText = QT_TR_NOOP("Show/Hide B-Spline control polygon");
sToolTipText = QT_TR_NOOP("Switches between showing and hiding the control polygons for all B-Splines");
sWhatsThis = "Sketcher_BSplinePolygon";
sStatusTip = sToolTipText;
ParameterGrp::handle hGrp = App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/Preferences/Mod/Sketcher/General");
if(hGrp->GetBool("BSplinePolygonVisible", true))
sPixmap = "Sketcher_BSplinePolygon_on";
else
sPixmap = "Sketcher_BSplinePolygon_off";
sAccel = "";
eType = ForEdit;
}
void CmdSketcherBSplinePolygon::activated(int iMsg)
{
Q_UNUSED(iMsg);
Gui::Document * doc= getActiveGuiDocument();
SketcherGui::ViewProviderSketch* vp = static_cast<SketcherGui::ViewProviderSketch*>(doc->getInEdit());
ParameterGrp::handle hGrp = App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/Preferences/Mod/Sketcher/General");
bool status = hGrp->GetBool("BSplineControlPolygonVisible", true);
hGrp->SetBool("BSplineControlPolygonVisible", !status);
vp->showRestoreInformationLayer();
if(status) {
if (getAction()) {
getAction()->setIcon(Gui::BitmapFactory().pixmap("Sketcher_BSplinePolygon_on"));
}
}
else {
if (getAction()) {
getAction()->setIcon(Gui::BitmapFactory().pixmap("Sketcher_BSplinePolygon_off"));
}
}
}
bool CmdSketcherBSplinePolygon::isActive(void)
{
return isSketcherBSplineActive( getActiveGuiDocument(), false );
}
void CreateSketcherCommandsBSpline(void)
{
Gui::CommandManager &rcCmdMgr = Gui::Application::Instance->commandManager();
rcCmdMgr.addCommand(new CmdSketcherBSplinePolygon());
}

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

@ -79,11 +79,16 @@ Gui::MenuItem* Workbench::setupMenuBar() const
Gui::MenuItem* consaccel = new Gui::MenuItem();
consaccel->setCommand("Sketcher tools");
addSketcherWorkbenchTools(*consaccel);
Gui::MenuItem* bsplines = new Gui::MenuItem();
bsplines->setCommand("Sketcher B-Spline tools");
addSketcherWorkbenchBSplines(*bsplines);
addSketcherWorkbenchSketchActions( *sketch );
*sketch << geom
<< cons
<< consaccel;
<< consaccel
<< bsplines;
return root;
}
@ -107,6 +112,11 @@ Gui::ToolBarItem* Workbench::setupToolBars() const
Gui::ToolBarItem* consaccel = new Gui::ToolBarItem(root);
consaccel->setCommand("Sketcher tools");
addSketcherWorkbenchTools( *consaccel );
Gui::ToolBarItem* bspline = new Gui::ToolBarItem(root);
bspline->setCommand("Sketcher B-Spline tools");
addSketcherWorkbenchBSplines( *bspline );
return root;
}
@ -233,7 +243,7 @@ inline void SketcherAddWorkbenchConstraints<Gui::ToolBarItem>(Gui::ToolBarItem&
<< "Sketcher_ConstrainAngle"
<< "Sketcher_ConstrainSnellsLaw"
<< "Separator"
<< "Sketcher_ToggleDrivingConstraint";
<< "Sketcher_ToggleDrivingConstraint";
}
template <typename T>
@ -268,6 +278,19 @@ inline void SketcherAddWorkbenchTools<Gui::ToolBarItem>(Gui::ToolBarItem& consac
<< "Sketcher_RectangularArray";
}
template <typename T>
inline void SketcherAddWorkbenchBSplines(T& bspline);
template <>
inline void SketcherAddWorkbenchBSplines<Gui::MenuItem>(Gui::MenuItem& bspline){
bspline << "Sketcher_BSplinePolygon";
}
template <>
inline void SketcherAddWorkbenchBSplines<Gui::ToolBarItem>(Gui::ToolBarItem& bspline){
bspline << "Sketcher_BSplinePolygon";
}
template <typename T>
inline void SketcherAddWorkspaceSketchExtra(T& /*sketch*/){
}
@ -298,6 +321,10 @@ void addSketcherWorkbenchConstraints( Gui::MenuItem& cons ){
void addSketcherWorkbenchTools( Gui::MenuItem& consaccel ){
SketcherAddWorkbenchTools( consaccel );
}
void addSketcherWorkbenchBSplines( Gui::MenuItem& bspline ){
SketcherAddWorkbenchBSplines( bspline );
}
void addSketcherWorkbenchSketchActions( Gui::MenuItem& sketch ){
Sketcher_addWorkbenchSketchActions( sketch );
}
@ -308,10 +335,17 @@ void addSketcherWorkbenchGeometries( Gui::MenuItem& geom ){
void addSketcherWorkbenchConstraints( Gui::ToolBarItem& cons ){
SketcherAddWorkbenchConstraints( cons );
}
void addSketcherWorkbenchTools( Gui::ToolBarItem& consaccel )
{
SketcherAddWorkbenchTools( consaccel );
}
void addSketcherWorkbenchBSplines( Gui::ToolBarItem& bspline )
{
SketcherAddWorkbenchBSplines( bspline );
}
void addSketcherWorkbenchSketchActions( Gui::ToolBarItem& sketch ){
Sketcher_addWorkbenchSketchActions( sketch );
}

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

@ -52,11 +52,13 @@ protected:
SketcherGuiExport void addSketcherWorkbenchConstraints( Gui::MenuItem& cons );
SketcherGuiExport void addSketcherWorkbenchTools( Gui::MenuItem& consaccel );
SketcherGuiExport void addSketcherWorkbenchBSplines( Gui::MenuItem& bspline );
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 addSketcherWorkbenchSketchActions( Gui::ToolBarItem& sketch );
SketcherGuiExport void addSketcherWorkbenchGeometries( Gui::ToolBarItem& geom );