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

Sketcher: Convert to NURBS command improvement - abortcommand

Browse Source
This commit is contained in:
Abdullah Tahiri 2017-02-19 22:07:06 +01:00 committed by wmayer
parent f1cf2fca44
commit 2b6292a07b
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/Mod/Sketcher/Gui/CommandSketcherBSpline.cpp
View File

@ -329,7 +329,9 @@ void CmdSketcherConvertToNURB::activated(int iMsg)
const std::vector<std::string> &SubNames = selection[0].getSubNames(); const std::vector<std::string> &SubNames = selection[0].getSubNames();
Sketcher::SketchObject* Obj = static_cast<Sketcher::SketchObject*>(selection[0].getObject()); Sketcher::SketchObject* Obj = static_cast<Sketcher::SketchObject*>(selection[0].getObject());
openCommand("IncreaseBSplineDegree"); bool nurbsized = false;
openCommand("Convert to NURBS");
for (unsigned int i=0; i<SubNames.size(); i++ ) { for (unsigned int i=0; i<SubNames.size(); i++ ) {
// only handle edges // only handle edges
@ -340,10 +342,19 @@ void CmdSketcherConvertToNURB::activated(int iMsg)
Gui::Command::doCommand( Gui::Command::doCommand(
Doc,"App.ActiveDocument.%s.ConvertToNURBS(%d) ", Doc,"App.ActiveDocument.%s.ConvertToNURBS(%d) ",
selection[0].getFeatName(),GeoId); selection[0].getFeatName(),GeoId);
nurbsized = true;
} }
} }
commitCommand(); if(!nurbsized) {
abortCommand();
QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"),
QObject::tr("None of the selected elements is an edge."));
}
else {
commitCommand();
}
ParameterGrp::handle hGrp = App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/Preferences/Mod/Sketcher"); ParameterGrp::handle hGrp = App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/Preferences/Mod/Sketcher");
bool autoRecompute = hGrp->GetBool("AutoRecompute",false); bool autoRecompute = hGrp->GetBool("AutoRecompute",false);