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

Sketcher: External edges in constraint modes (radius)

Browse Source
This commit is contained in:
AjinkyaDahale 2017-02-22 05:49:15 +05:30 committed by wmayer
parent 2ffd94df5f
commit ff74ba32a8
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/Mod/Sketcher/Gui/CommandConstraints.cpp
View File

@ -3839,8 +3839,6 @@ void CmdSketcherConstrainPerpendicular::applyConstraint(std::vector<SelIdPair> &
// ======================================================================================
//DEF_STD_CMD_A(CmdSketcherConstrainTangent);
class CmdSketcherConstrainTangent : public CmdSketcherConstraint
{
public:
@ -4492,7 +4490,7 @@ CmdSketcherConstrainRadius::CmdSketcherConstrainRadius()
sAccel = "SHIFT+R";
eType = ForEdit;
allowedSelSequences = {{SelEdge}};
allowedSelSequences = {{SelEdge}, {SelExternalEdge}};
constraintCursor = cursor_genericconstraint;
}
@ -4798,6 +4796,8 @@ void CmdSketcherConstrainRadius::applyConstraint(std::vector<SelIdPair> &selSeq,
switch (seqIndex) {
case 0: // {SelEdge}
case 1: // {SelExternalEdge}
{
const Part::Geometry *geom = Obj->getGeometry(GeoId);
if (geom && geom->getTypeId() == Part::GeomArcOfCircle::getClassTypeId()) {
const Part::GeomArcOfCircle *arc = static_cast<const Part::GeomArcOfCircle *>(geom);
@ -4822,7 +4822,7 @@ void CmdSketcherConstrainRadius::applyConstraint(std::vector<SelIdPair> &selSeq,
int indexConstr = ConStr.size() - 1;
if(constraintCreationMode==Reference) {
if(GeoId <= Sketcher::GeoEnum::RefExt || constraintCreationMode==Reference) {
Gui::Command::doCommand(Doc, "App.ActiveDocument.%s.setDriving(%i,%s)",
Obj->getNameInDocument(), ConStr.size()-1, "False");
}
@ -4842,7 +4842,7 @@ void CmdSketcherConstrainRadius::applyConstraint(std::vector<SelIdPair> &selSeq,
ParameterGrp::handle hGrp = App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/Preferences/Mod/Sketcher");
bool show = hGrp->GetBool("ShowDialogOnDistanceConstraint", true);
// Ask for the value of the radius immediately
if (show && constraintCreationMode==Driving) {
if (show && constraintCreationMode==Driving && GeoId >= 0) {
QDialog dlg(Gui::getMainWindow());
Ui::InsertDatum ui_Datum;
ui_Datum.setupUi(&dlg);
@ -4928,6 +4928,7 @@ void CmdSketcherConstrainRadius::applyConstraint(std::vector<SelIdPair> &selSeq,
Obj->solve();
}
}
}
}
void CmdSketcherConstrainRadius::updateAction(int mode)