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

Merge pull request #690 from abdullahtahiriyo/_more_sketcher_fixes_

Browse Source 
more sketcher fixes
This commit is contained in:
wwmayer
2017-04-12 17:00:41 +02:00
committed by GitHub
parent 8195b10fc6 1d6f677781
commit 3d15aca153
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Mod/Sketcher/Gui/CommandCreateGeo.cpp
View File

@@ -6203,7 +6203,7 @@ namespace SketcherGui {
Sketcher::SketchObject *sketch = static_cast<Sketcher::SketchObject*>(object);
sketch->allowOtherBody = (QApplication::keyboardModifiers() == Qt::ControlModifier || QApplication::keyboardModifiers() == (Qt::ControlModifier | Qt::AltModifier));
sketch->allowUnaligned = (QApplication::keyboardModifiers() == Qt::AltModifier || QApplication::keyboardModifiers() == (Qt::ControlModifier | Qt::AltModifier));
sketch->allowUnaligned = QApplication::keyboardModifiers() == (Qt::ControlModifier | Qt::AltModifier);
this->notAllowedReason = "";
Sketcher::SketchObject::eReasonList msg;
@@ -6224,13 +6224,13 @@ namespace SketcherGui {
this->notAllowedReason = QT_TR_NOOP("This object belongs to another part.");
break;
case Sketcher::SketchObject::rlNonParallel:
this->notAllowedReason = QT_TR_NOOP("The selected sketch is not parallel to this sketch. Hold Alt to allow non-parallel sketchs.");
this->notAllowedReason = QT_TR_NOOP("The selected sketch is not parallel to this sketch. Hold Ctrl+Alt to allow non-parallel sketchs.");
break;
case Sketcher::SketchObject::rlAxesMisaligned:
this->notAllowedReason = QT_TR_NOOP("The XY axes of the selected sketch do not have the same direction as this sketch. Hold Alt to disregard it.");
this->notAllowedReason = QT_TR_NOOP("The XY axes of the selected sketch do not have the same direction as this sketch. Hold Ctrl+Alt to disregard it.");
break;
case Sketcher::SketchObject::rlOriginsMisaligned:
this->notAllowedReason = QT_TR_NOOP("The origin of the selected sketch is not aligned with the origin of this sketch. Hold Alt to disregard it.");
this->notAllowedReason = QT_TR_NOOP("The origin of the selected sketch is not aligned with the origin of this sketch. Hold Ctrl+Alt to disregard it.");
break;
default:
break;

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

@@ -469,6 +469,12 @@ void CmdSketcherIncreaseDegree::activated(int iMsg)
Gui::Command::doCommand(
Doc,"App.ActiveDocument.%s.increaseBSplineDegree(%d) ",
selection[0].getFeatName(),GeoId);
// add new control points
Gui::Command::doCommand(Gui::Command::Doc,
"App.ActiveDocument.%s.exposeInternalGeometry(%d)",
selection[0].getFeatName(),
GeoId);
}
}