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

Sketcher: small style changes to make the lines shorter

Browse Source
This commit is contained in:
vocx-fc
2020-09-23 21:04:23 -05:00
committed by Yorik van Havre
parent ec0acf44f1
commit 273e6a30ae
3 changed files with 195 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -124,13 +124,16 @@ void finishDistanceConstraint(Gui::Command* cmd, Sketcher::SketchObject* sketch,
void showNoConstraintBetweenExternal()
{
QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"),
QObject::tr("Cannot add a constraint between two external geometries!"));
QObject::tr("Cannot add a constraint between two external geometries."));
}
void showNoConstraintBetweenFixedGeometry()
{
QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"),
QObject::tr("Cannot add a constraint between two fixed geometries! Fixed geometries involve external geometry, blocked geometry or special points as B-spline knot points."));
QObject::tr("Cannot add a constraint between two fixed geometries. "
"Fixed geometries involve external geometry, "
"blocked geometry or special points "
"as B-spline knot points."));
}
bool SketcherGui::checkBothExternal(int GeoId1, int GeoId2)
@@ -1508,7 +1511,7 @@ void CmdSketcherConstrainLock::activated(int iMsg)
Base::Vector3d pnt = Obj->getPoint(GeoId[0],PosId[0]);
// undo command open
openCommand("Add Lock constraint");
openCommand("Add 'Lock' constraint");
Gui::cmdAppObjectArgs(selection[0].getObject(), "addConstraint(Sketcher.Constraint('DistanceX',%d,%d,%f)) ",
GeoId[0],PosId[0],pnt.x);
Gui::cmdAppObjectArgs(selection[0].getObject(), "addConstraint(Sketcher.Constraint('DistanceY',%d,%d,%f)) ",
@@ -1516,7 +1519,9 @@ void CmdSketcherConstrainLock::activated(int iMsg)
lastconstraintindex+=2;
if (edgeisblocked || GeoId[0] <= Sketcher::GeoEnum::RefExt || isConstructionPoint(Obj,GeoId[0]) || constraintCreationMode==Reference) {
if (edgeisblocked || GeoId[0] <= Sketcher::GeoEnum::RefExt
|| isConstructionPoint(Obj,GeoId[0])
|| constraintCreationMode==Reference) {
// it is a constraint on a external line, make it non-driving
Gui::cmdAppObjectArgs(selection[0].getObject(), "setDriving(%i,%s)",
@@ -1547,7 +1552,7 @@ void CmdSketcherConstrainLock::activated(int iMsg)
Base::Vector3d pnt = Obj->getPoint(*itg,*itp);
// undo command open
openCommand("Add relative Lock constraint");
openCommand("Add relative 'Lock' constraint");
Gui::cmdAppObjectArgs(selection[0].getObject(), "addConstraint(Sketcher.Constraint('DistanceX',%d,%d,%d,%d,%f)) ",
*itg,*itp,GeoId.back(),PosId.back(),pntr.x-pnt.x);
@@ -1652,7 +1657,7 @@ CmdSketcherConstrainBlock::CmdSketcherConstrainBlock()
{
sAppModule = "Sketcher";
sGroup = QT_TR_NOOP("Sketcher");
sMenuText = QT_TR_NOOP("Constrain Block");
sMenuText = QT_TR_NOOP("Constrain block");
sToolTipText = QT_TR_NOOP("Block constraint: "
"block the selected edge from moving");
sWhatsThis = "Sketcher_ConstrainBlock";
@@ -1693,7 +1698,10 @@ void CmdSketcherConstrainBlock::activated(int iMsg)
// Check that the solver does not report redundant/conflicting constraints
if(Obj->getLastSolverStatus()!=GCS::Success || Obj->getLastHasConflicts() || Obj->getLastHasRedundancies()) {
QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong solver status"),
QObject::tr("A Block constraint cannot be added if the sketch is unsolved or there are redundant and/or conflicting constraints."));
QObject::tr("A Block constraint cannot be added "
"if the sketch is unsolved "
"or there are redundant and "
"conflicting constraints."));
return;
}
@@ -1731,7 +1739,7 @@ void CmdSketcherConstrainBlock::activated(int iMsg)
for (std::vector<int>::iterator itg = GeoId.begin(); itg != GeoId.end(); ++itg) {
// undo command open
openCommand("Add Block constraint");
openCommand("Add 'Block' constraint");
try {
@@ -2238,7 +2246,8 @@ void CmdSketcherConstrainDistance::activated(int iMsg)
GeoId1,PosId1,GeoId2,PosId2,(pnt2-pnt1).Length());
}
if (arebothpointsorsegmentsfixed || constraintCreationMode==Reference) { // it is a constraint on a external line, make it non-driving
if (arebothpointsorsegmentsfixed || constraintCreationMode==Reference) {
// it is a constraint on a external line, make it non-driving
const std::vector<Sketcher::Constraint *> &ConStr = Obj->Constraints.getValues();
Gui::cmdAppObjectArgs(selection[0].getObject(),
@@ -2366,7 +2375,8 @@ void CmdSketcherConstrainDistance::applyConstraint(std::vector<SelIdPair> &selSe
GeoId1,PosId1,GeoId2,PosId2,(pnt2-pnt1).Length());
}
if (arebothpointsorsegmentsfixed || constraintCreationMode==Reference) { // it is a constraint on a external line, make it non-driving
if (arebothpointsorsegmentsfixed || constraintCreationMode==Reference) {
// it is a constraint on a external line, make it non-driving
const std::vector<Sketcher::Constraint *> &ConStr = Obj->Constraints.getValues();
Gui::cmdAppObjectArgs(Obj,"setDriving(%i,%s)",
@@ -2396,7 +2406,11 @@ void CmdSketcherConstrainDistance::applyConstraint(std::vector<SelIdPair> &selSe
Gui::cmdAppObjectArgs(Obj,"addConstraint(Sketcher.Constraint('Distance',%d,%f)) ",
GeoId1,ActLength);
if (arebothpointsorsegmentsfixed || GeoId1 <= Sketcher::GeoEnum::RefExt || isConstructionPoint(Obj,GeoId1) || constraintCreationMode==Reference) { // it is a constraint on a external line, make it non-driving
if (arebothpointsorsegmentsfixed
|| GeoId1 <= Sketcher::GeoEnum::RefExt
|| isConstructionPoint(Obj,GeoId1)
|| constraintCreationMode==Reference) {
// it is a constraint on a external line, make it non-driving
const std::vector<Sketcher::Constraint *> &ConStr = Obj->Constraints.getValues();
Gui::cmdAppObjectArgs(Obj, "setDriving(%i,%s)",
@@ -2435,7 +2449,8 @@ void CmdSketcherConstrainDistance::applyConstraint(std::vector<SelIdPair> &selSe
Gui::cmdAppObjectArgs(Obj,"addConstraint(Sketcher.Constraint('Distance',%d,%d,%d,%f)) ",
GeoId1,PosId1,GeoId2,ActDist);
if (arebothpointsorsegmentsfixed || constraintCreationMode==Reference) { // it is a constraint on a external line, make it non-driving
if (arebothpointsorsegmentsfixed || constraintCreationMode==Reference) {
// it is a constraint on a external line, make it non-driving
const std::vector<Sketcher::Constraint *> &ConStr = Obj->Constraints.getValues();
Gui::cmdAppObjectArgs(Obj,"setDriving(%i,%s)",
@@ -2576,14 +2591,18 @@ void CmdSketcherConstrainPointOnObject::activated(int iMsg)
} else {
abortCommand();
QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"),
QObject::tr("None of the selected points were constrained onto the respective curves, either "
"because they are parts of the same element, or because they are both external geometry."));
QObject::tr("None of the selected points were constrained "
"onto the respective curves, "
"either because they are parts "
"of the same element, "
"or because they are both external geometry."));
}
return;
}
QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"),
QObject::tr("Select either one point and several curves, or one curve and several points. "
QObject::tr("Select either one point and several curves, "
"or one curve and several points. "
"You have selected %1 curves and %2 points.").arg(curves.size()).arg(points.size()));
return;
}
@@ -2646,8 +2665,10 @@ void CmdSketcherConstrainPointOnObject::applyConstraint(std::vector<SelIdPair> &
else {
abortCommand();
QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"),
QObject::tr("None of the selected points were constrained onto the respective curves, either "
"because they are parts of the same element, or because they are both external geometry."));
QObject::tr("None of the selected points "
"were constrained onto the respective curves, "
"either because they are parts of the same element, "
"or because they are both external geometry."));
}
return;
}
@@ -2673,15 +2694,17 @@ CmdSketcherConstrainDistanceX::CmdSketcherConstrainDistanceX()
sAppModule = "Sketcher";
sGroup = QT_TR_NOOP("Sketcher");
sMenuText = QT_TR_NOOP("Constrain horizontal distance");
sToolTipText = QT_TR_NOOP("Fix the horizontal distance between two points or line ends");
sToolTipText = QT_TR_NOOP("Fix the horizontal distance "
"between two points or line ends");
sWhatsThis = "Sketcher_ConstrainDistanceX";
sStatusTip = sToolTipText;
sPixmap = "Constraint_HorizontalDistance";
sAccel = "SHIFT+H";
eType = ForEdit;
// Can't do single vertex because its a prefix for 2 vertices
allowedSelSequences = {{SelVertex, SelVertexOrRoot}, {SelRoot, SelVertex},
{SelEdge}, {SelExternalEdge}}; // Can't do single vertex because its a prefix for 2 vertices
{SelEdge}, {SelExternalEdge}};
}
void CmdSketcherConstrainDistanceX::activated(int iMsg)
@@ -2731,17 +2754,19 @@ void CmdSketcherConstrainDistanceX::activated(int iMsg)
std::swap(PosId1,PosId2);
}
if (GeoId1 == Sketcher::GeoEnum::HAxis && PosId1 == Sketcher::none) // reject horizontal axis from selection
if (GeoId1 == Sketcher::GeoEnum::HAxis && PosId1 == Sketcher::none)
// reject horizontal axis from selection
GeoId1 = Constraint::GeoUndef;
else if (GeoId1 == Sketcher::GeoEnum::VAxis && PosId1 == Sketcher::none) {
GeoId1 = Sketcher::GeoEnum::HAxis;
PosId1 = Sketcher::start;
}
if (isEdge(GeoId1,PosId1) && GeoId2 == Constraint::GeoUndef) { // horizontal length of a line
if (isEdge(GeoId1,PosId1) && GeoId2 == Constraint::GeoUndef) {
// horizontal length of a line
if (GeoId1 < 0 && GeoId1 >= Sketcher::GeoEnum::VAxis) {
QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"),
QObject::tr("Cannot add a horizontal length constraint on an axis!"));
QObject::tr("Cannot add a horizontal length constraint on an axis!"));
return;
}
@@ -2755,8 +2780,8 @@ void CmdSketcherConstrainDistanceX::activated(int iMsg)
PosId2 = Sketcher::end;
}
}
if (isVertex(GeoId1,PosId1) && isVertex(GeoId2,PosId2)) { // point to point horizontal distance
if (isVertex(GeoId1,PosId1) && isVertex(GeoId2,PosId2)) {
// point to point horizontal distance
Base::Vector3d pnt1 = Obj->getPoint(GeoId1,PosId1);
Base::Vector3d pnt2 = Obj->getPoint(GeoId2,PosId2);
double ActLength = pnt2.x-pnt1.x;
@@ -2773,7 +2798,8 @@ void CmdSketcherConstrainDistanceX::activated(int iMsg)
Gui::cmdAppObjectArgs(selection[0].getObject(), "addConstraint(Sketcher.Constraint('DistanceX',%d,%d,%d,%d,%f)) ",
GeoId1,PosId1,GeoId2,PosId2,ActLength);
if (arebothpointsorsegmentsfixed || constraintCreationMode==Reference) { // it is a constraint on a external line, make it non-driving
if (arebothpointsorsegmentsfixed || constraintCreationMode==Reference) {
// it is a constraint on a external line, make it non-driving
const std::vector<Sketcher::Constraint *> &ConStr = Obj->Constraints.getValues();
Gui::cmdAppObjectArgs(selection[0].getObject(), "setDriving(%i,%s)",
@@ -2785,7 +2811,8 @@ void CmdSketcherConstrainDistanceX::activated(int iMsg)
return;
}
else if (isVertex(GeoId1,PosId1) && GeoId2 == Constraint::GeoUndef) { // point on fixed x-coordinate
else if (isVertex(GeoId1,PosId1) && GeoId2 == Constraint::GeoUndef) {
// point on fixed x-coordinate
if (GeoId1 < 0 && GeoId1 >= Sketcher::GeoEnum::VAxis) {
QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"),
@@ -2803,7 +2830,8 @@ void CmdSketcherConstrainDistanceX::activated(int iMsg)
GeoId1,PosId1,ActX);
if (arebothpointsorsegmentsfixed || constraintCreationMode==Reference) { // it is a constraint on a external line, make it non-driving
if (arebothpointsorsegmentsfixed || constraintCreationMode==Reference) {
// it is a constraint on a external line, make it non-driving
const std::vector<Sketcher::Constraint *> &ConStr = Obj->Constraints.getValues();
Gui::cmdAppObjectArgs(selection[0].getObject(),"setDriving(%i,%s)",
@@ -2872,7 +2900,8 @@ void CmdSketcherConstrainDistanceX::applyConstraint(std::vector<SelIdPair> &selS
Gui::cmdAppObjectArgs(Obj,"addConstraint(Sketcher.Constraint('DistanceX',%d,%d,%d,%d,%f)) ",
GeoId1,PosId1,GeoId2,PosId2,ActLength);
if (areBothPointsOrSegmentsFixed(Obj,GeoId1, GeoId2) || constraintCreationMode==Reference) { // it is a constraint on a external line, make it non-driving
if (areBothPointsOrSegmentsFixed(Obj,GeoId1, GeoId2) || constraintCreationMode==Reference) {
// it is a constraint on a external line, make it non-driving
const std::vector<Sketcher::Constraint *> &ConStr = Obj->Constraints.getValues();
Gui::cmdAppObjectArgs(Obj,"setDriving(%i,%s)",
@@ -2926,8 +2955,9 @@ CmdSketcherConstrainDistanceY::CmdSketcherConstrainDistanceY()
sAccel = "SHIFT+V";
eType = ForEdit;
// Can't do single vertex because its a prefix for 2 vertices
allowedSelSequences = {{SelVertex, SelVertexOrRoot}, {SelRoot, SelVertex},
{SelEdge}, {SelExternalEdge}}; // Can't do single vertex because its a prefix for 2 vertices
{SelEdge}, {SelExternalEdge}};
}
void CmdSketcherConstrainDistanceY::activated(int iMsg)
@@ -2999,8 +3029,8 @@ void CmdSketcherConstrainDistanceY::activated(int iMsg)
}
}
if (isVertex(GeoId1,PosId1) && isVertex(GeoId2,PosId2)) { // point to point vertical distance
if (isVertex(GeoId1,PosId1) && isVertex(GeoId2,PosId2)) {
// point to point vertical distance
Base::Vector3d pnt1 = Obj->getPoint(GeoId1,PosId1);
Base::Vector3d pnt2 = Obj->getPoint(GeoId2,PosId2);
double ActLength = pnt2.y-pnt1.y;
@@ -3017,7 +3047,8 @@ void CmdSketcherConstrainDistanceY::activated(int iMsg)
Gui::cmdAppObjectArgs(selection[0].getObject(),"addConstraint(Sketcher.Constraint('DistanceY',%d,%d,%d,%d,%f)) ",
GeoId1,PosId1,GeoId2,PosId2,ActLength);
if (arebothpointsorsegmentsfixed || constraintCreationMode==Reference) { // it is a constraint on a external line, make it non-driving
if (arebothpointsorsegmentsfixed || constraintCreationMode==Reference) {
// it is a constraint on a external line, make it non-driving
const std::vector<Sketcher::Constraint *> &ConStr = Obj->Constraints.getValues();
Gui::cmdAppObjectArgs(selection[0].getObject(), "setDriving(%i,%s)",
@@ -3029,8 +3060,8 @@ void CmdSketcherConstrainDistanceY::activated(int iMsg)
return;
}
else if (isVertex(GeoId1,PosId1) && GeoId2 == Constraint::GeoUndef) { // point on fixed y-coordinate
else if (isVertex(GeoId1,PosId1) && GeoId2 == Constraint::GeoUndef) {
// point on fixed y-coordinate
if (GeoId1 < 0 && GeoId1 >= Sketcher::GeoEnum::VAxis) {
QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"),
QObject::tr("Cannot add a fixed y-coordinate constraint on the origin point!"));
@@ -3046,7 +3077,10 @@ void CmdSketcherConstrainDistanceY::activated(int iMsg)
Gui::cmdAppObjectArgs(selection[0].getObject(), "addConstraint(Sketcher.Constraint('DistanceY',%d,%d,%f)) ",
GeoId1,PosId1,ActY);
if (GeoId1 <= Sketcher::GeoEnum::RefExt || isConstructionPoint(Obj,GeoId1) || constraintCreationMode==Reference) { // it is a constraint on a external line, make it non-driving
if (GeoId1 <= Sketcher::GeoEnum::RefExt
|| isConstructionPoint(Obj,GeoId1)
|| constraintCreationMode==Reference) {
// it is a constraint on a external line, make it non-driving
const std::vector<Sketcher::Constraint *> &ConStr = Obj->Constraints.getValues();
Gui::cmdAppObjectArgs(selection[0].getObject(), "setDriving(%i,%s)",
@@ -5678,7 +5712,8 @@ void CmdSketcherConstrainAngle::activated(int iMsg)
}
//assuming point-on-curves have been solved, calculate the angle.
//DeepSOIC: this may be slow, but I wanted to reuse the conversion from Geometry to GCS shapes that is done in Sketch
//DeepSOIC: this may be slow, but I wanted to reuse the conversion
//from Geometry to GCS shapes that is done in Sketch
Base::Vector3d p = Obj->getPoint(GeoId3, PosId3 );
ActAngle = Obj->calculateAngleViaPoint(GeoId1,GeoId2,p.x,p.y);
@@ -5821,7 +5856,8 @@ void CmdSketcherConstrainAngle::activated(int iMsg)
Gui::cmdAppObjectArgs(selection[0].getObject(),"addConstraint(Sketcher.Constraint('Angle',%d,%f)) ",
GeoId1,ActAngle);
if (GeoId1 <= Sketcher::GeoEnum::RefExt || constraintCreationMode==Reference) { // it is a constraint on a external line, make it non-driving
if (GeoId1 <= Sketcher::GeoEnum::RefExt || constraintCreationMode==Reference) {
// it is a constraint on a external line, make it non-driving
const std::vector<Sketcher::Constraint *> &ConStr = Obj->Constraints.getValues();
Gui::cmdAppObjectArgs(selection[0].getObject(), "setDriving(%i,%s)",
@@ -5844,7 +5880,8 @@ void CmdSketcherConstrainAngle::activated(int iMsg)
Gui::cmdAppObjectArgs(selection[0].getObject(), "addConstraint(Sketcher.Constraint('Angle',%d,%f)) ",
GeoId1,angle);
if (GeoId1 <= Sketcher::GeoEnum::RefExt || constraintCreationMode==Reference) { // it is a constraint on a external line, make it non-driving
if (GeoId1 <= Sketcher::GeoEnum::RefExt || constraintCreationMode==Reference) {
// it is a constraint on a external line, make it non-driving
const std::vector<Sketcher::Constraint *> &ConStr = Obj->Constraints.getValues();
Gui::cmdAppObjectArgs(selection[0].getObject(), "setDriving(%i,%s)",
@@ -5956,7 +5993,8 @@ void CmdSketcherConstrainAngle::applyConstraint(std::vector<SelIdPair> &selSeq,
Gui::cmdAppObjectArgs(Obj, "addConstraint(Sketcher.Constraint('Angle',%d,%d,%d,%d,%f)) ",
GeoId1,PosId1,GeoId2,PosId2,ActAngle);
if (areBothPointsOrSegmentsFixed(Obj,GeoId1, GeoId2) || constraintCreationMode==Reference) { // it is a constraint on a external line, make it non-driving
if (areBothPointsOrSegmentsFixed(Obj,GeoId1, GeoId2) || constraintCreationMode==Reference) {
// it is a constraint on a external line, make it non-driving
const std::vector<Sketcher::Constraint *> &ConStr = Obj->Constraints.getValues();
Gui::cmdAppObjectArgs(Obj,"setDriving(%i,%s)",
@@ -6009,13 +6047,15 @@ void CmdSketcherConstrainAngle::applyConstraint(std::vector<SelIdPair> &selSeq,
Gui::cmdAppObjectArgs(Obj,"addConstraint(Sketcher.Constraint('PointOnObject',%d,%d,%d)) ",
GeoId3,PosId3,GeoId2);
}
if(! IsPointAlreadyOnCurve(GeoId1, GeoId3, PosId3, Obj)){//FIXME: it's a good idea to add a check if the sketch is solved
if(! IsPointAlreadyOnCurve(GeoId1, GeoId3, PosId3, Obj)){
//FIXME: it's a good idea to add a check if the sketch is solved
Gui::cmdAppObjectArgs(Obj,"addConstraint(Sketcher.Constraint('PointOnObject',%d,%d,%d)) ",
GeoId3,PosId3,GeoId1);
}
//assuming point-on-curves have been solved, calculate the angle.
//DeepSOIC: this may be slow, but I wanted to reuse the conversion from Geometry to GCS shapes that is done in Sketch
//DeepSOIC: this may be slow, but I wanted to reuse the conversion
//from Geometry to GCS shapes that is done in Sketch
Base::Vector3d p = Obj->getPoint(GeoId3, PosId3 );
ActAngle = Obj->calculateAngleViaPoint(GeoId1,GeoId2,p.x,p.y);
@@ -6029,7 +6069,8 @@ void CmdSketcherConstrainAngle::applyConstraint(std::vector<SelIdPair> &selSeq,
Gui::cmdAppObjectArgs(Obj,"addConstraint(Sketcher.Constraint('AngleViaPoint',%d,%d,%d,%d,%f)) ",
GeoId1,GeoId2,GeoId3,PosId3,ActAngle);
if (bothexternal || constraintCreationMode==Reference) { // it is a constraint on a external line, make it non-driving
if (bothexternal || constraintCreationMode==Reference) {
// it is a constraint on a external line, make it non-driving
const std::vector<Sketcher::Constraint *> &ConStr = Obj->Constraints.getValues();
Gui::cmdAppObjectArgs(Obj,"setDriving(%i,%s)",
@@ -6267,7 +6308,9 @@ CmdSketcherConstrainSymmetric::CmdSketcherConstrainSymmetric()
sAppModule = "Sketcher";
sGroup = QT_TR_NOOP("Sketcher");
sMenuText = QT_TR_NOOP("Constrain symmetrical");
sToolTipText = QT_TR_NOOP("Create a symmetry constraint between two points with respect to a line or a third point");
sToolTipText = QT_TR_NOOP("Create a symmetry constraint "
"between two points\n"
"with respect to a line or a third point");
sWhatsThis = "Sketcher_ConstrainSymmetric";
sStatusTip = sToolTipText;
sPixmap = "Constraint_Symmetric";
@@ -6303,7 +6346,8 @@ void CmdSketcherConstrainSymmetric::activated(int iMsg)
getSelection().clearSelection();
} else {
QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"),
QObject::tr("Select two points and a symmetry line, two points and a symmetry point "
QObject::tr("Select two points and a symmetry line, "
"two points and a symmetry point "
"or a line and a symmetry point from the sketch."));
}
return;
@@ -6315,7 +6359,8 @@ void CmdSketcherConstrainSymmetric::activated(int iMsg)
if (SubNames.size() != 3 && SubNames.size() != 2) {
QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"),
QObject::tr("Select two points and a symmetry line, two points and a symmetry point "
QObject::tr("Select two points and a symmetry line, "
"two points and a symmetry point "
"or a line and a symmetry point from the sketch."));
return;
}
@@ -6339,7 +6384,8 @@ void CmdSketcherConstrainSymmetric::activated(int iMsg)
if (geom->getTypeId() == Part::GeomLineSegment::getClassTypeId()) {
if (GeoId1 == GeoId2) {
QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"),
QObject::tr("Cannot add a symmetry constraint between a line and its end points!"));
QObject::tr("Cannot add a symmetry constraint "
"between a line and its end points."));
return;
}
@@ -6360,7 +6406,8 @@ void CmdSketcherConstrainSymmetric::activated(int iMsg)
}
QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"),
QObject::tr("Select two points and a symmetry line, two points and a symmetry point "
QObject::tr("Select two points and a symmetry line, "
"two points and a symmetry point "
"or a line and a symmetry point from the sketch."));
return;
}
@@ -6389,7 +6436,8 @@ void CmdSketcherConstrainSymmetric::activated(int iMsg)
if (geom->getTypeId() == Part::GeomLineSegment::getClassTypeId()) {
if (GeoId1 == GeoId2 && GeoId2 == GeoId3) {
QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"),
QObject::tr("Cannot add a symmetry constraint between a line and its end points!"));
QObject::tr("Cannot add a symmetry constraint "
"between a line and its end points!"));
return;
}
@@ -6425,7 +6473,8 @@ void CmdSketcherConstrainSymmetric::activated(int iMsg)
}
}
QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"),
QObject::tr("Select two points and a symmetry line, two points and a symmetry point "
QObject::tr("Select two points and a symmetry line, "
"two points and a symmetry point "
"or a line and a symmetry point from the sketch."));
}
@@ -6474,7 +6523,8 @@ void CmdSketcherConstrainSymmetric::applyConstraint(std::vector<SelIdPair> &selS
if (geom->getTypeId() == Part::GeomLineSegment::getClassTypeId()) {
if (GeoId1 == GeoId2 && GeoId2 == GeoId3) {
QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"),
QObject::tr("Cannot add a symmetry constraint between a line and its end points!"));
QObject::tr("Cannot add a symmetry constraint "
"between a line and its end points."));
return;
}
@@ -6489,7 +6539,8 @@ void CmdSketcherConstrainSymmetric::applyConstraint(std::vector<SelIdPair> &selS
}
else {
QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"),
QObject::tr("Select two points and a symmetry line, two points and a symmetry point "
QObject::tr("Select two points and a symmetry line, "
"two points and a symmetry point "
"or a line and a symmetry point from the sketch."));
}
@@ -6537,7 +6588,9 @@ CmdSketcherConstrainSnellsLaw::CmdSketcherConstrainSnellsLaw()
sAppModule = "Sketcher";
sGroup = QT_TR_NOOP("Sketcher");
sMenuText = QT_TR_NOOP("Constrain refraction (Snell's law')");
sToolTipText = QT_TR_NOOP("Create a refraction law (Snell's law) constraint between two endpoints of rays and an edge as an interface.");
sToolTipText = QT_TR_NOOP("Create a refraction law (Snell's law) "
"constraint between two endpoints of rays\n"
"and an edge as an interface.");
sWhatsThis = "Sketcher_ConstrainSnellsLaw";
sStatusTip = sToolTipText;
sPixmap = "Constraint_SnellsLaw";
@@ -6548,10 +6601,11 @@ CmdSketcherConstrainSnellsLaw::CmdSketcherConstrainSnellsLaw()
void CmdSketcherConstrainSnellsLaw::activated(int iMsg)
{
Q_UNUSED(iMsg);
QString strHelp = QObject::tr("Select two endpoints of lines to act as rays, and"
" an edge representing a boundary. The first"
" selected point corresponds to index n1, second"
" - to n2, and datum value sets the ratio n2/n1.",
QString strHelp = QObject::tr("Select two endpoints of lines to act as rays, "
"and an edge representing a boundary. "
"The first selected point corresponds "
"to index n1, second to n2, "
"and datum value sets the ratio n2/n1.",
"Constraint_SnellsLaw");
QString strError;
@@ -6563,7 +6617,8 @@ void CmdSketcherConstrainSnellsLaw::activated(int iMsg)
// only one sketch with its subelements are allowed to be selected
if (selection.size() != 1 || !selection[0].isObjectTypeOf(Sketcher::SketchObject::getClassTypeId())) {
strError = QObject::tr("Selected objects are not just geometry from one sketch.", dmbg);
strError = QObject::tr("Selected objects are not just geometry "
"from one sketch.", dmbg);
throw Base::ValueError("");
}
@@ -6594,14 +6649,14 @@ void CmdSketcherConstrainSnellsLaw::activated(int iMsg)
//a bunch of validity checks
if (areAllPointsOrSegmentsFixed(Obj, GeoId1, GeoId2, GeoId3) ) {
strError = QObject::tr("Cannot create constraint with external geometry only!!", dmbg);
strError = QObject::tr("Cannot create constraint with external geometry only.", dmbg);
throw Base::ValueError("");
}
if (!(isVertex(GeoId1,PosId1) && !isSimpleVertex(Obj, GeoId1, PosId1) &&
isVertex(GeoId2,PosId2) && !isSimpleVertex(Obj, GeoId2, PosId2) &&
isEdge(GeoId3,PosId3) )) {
strError = QObject::tr("Incompatible geometry is selected!", dmbg);
strError = QObject::tr("Incompatible geometry is selected.", dmbg);
throw Base::ValueError("");
};
@@ -6609,8 +6664,9 @@ void CmdSketcherConstrainSnellsLaw::activated(int iMsg)
if( geo && geo->getTypeId() == Part::GeomBSplineCurve::getClassTypeId() ){
// unsupported until normal to B-spline at any point implemented.
QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"),
QObject::tr("SnellsLaw on B-spline edge currently unsupported."));
QMessageBox::warning(Gui::getMainWindow(),
QObject::tr("Wrong selection"),
QObject::tr("SnellsLaw on B-spline edge is currently unsupported."));
return;
}
@@ -6688,8 +6744,9 @@ CmdSketcherConstrainInternalAlignment::CmdSketcherConstrainInternalAlignment()
{
sAppModule = "Sketcher";
sGroup = QT_TR_NOOP("Sketcher");
sMenuText = QT_TR_NOOP("Constrain InternalAlignment");
sToolTipText = QT_TR_NOOP("Constrains an element to be aligned with the internal geometry of another element");
sMenuText = QT_TR_NOOP("Constrain internal alignment");
sToolTipText = QT_TR_NOOP("Constrains an element to be aligned "
"with the internal geometry of another element");
sWhatsThis = "Sketcher_ConstrainInternalAlignment";
sStatusTip = sToolTipText;
sPixmap = "Constraint_InternalAlignment";
@@ -6705,8 +6762,10 @@ void CmdSketcherConstrainInternalAlignment::activated(int iMsg)
// only one sketch with its subelements are allowed to be selected
if (selection.size() != 1 || !selection[0].isObjectTypeOf(Sketcher::SketchObject::getClassTypeId())) {
QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"),
QObject::tr("Select at least one ellipse and one edge from the sketch."));
QMessageBox::warning(Gui::getMainWindow(),
QObject::tr("Wrong selection"),
QObject::tr("Select at least one ellipse "
"and one edge from the sketch."));
return;
}
@@ -6716,8 +6775,10 @@ void CmdSketcherConstrainInternalAlignment::activated(int iMsg)
// go through the selected subelements
if (SubNames.size() < 2) {
QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"),
QObject::tr("Select at least one ellipse and one edge from the sketch."));
QMessageBox::warning(Gui::getMainWindow(),
QObject::tr("Wrong selection"),
QObject::tr("Select at least one ellipse "
"and one edge from the sketch."));
return;
}
@@ -6782,7 +6843,9 @@ void CmdSketcherConstrainInternalAlignment::activated(int iMsg)
if(ellipseids.size()>1){
QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"),
QObject::tr("You cannot internally constrain an ellipse on other ellipse. Select only one ellipse."));
QObject::tr("You cannot internally constrain an ellipse "
"on another ellipse. "
"Select only one ellipse."));
return;
}
@@ -6831,13 +6894,16 @@ void CmdSketcherConstrainInternalAlignment::activated(int iMsg)
}
if(major && minor && focus1 && focus2) {
QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Nothing to constrain"),
QObject::tr("Currently all internal geometry of the ellipse is already exposed."));
QMessageBox::warning(Gui::getMainWindow(),
QObject::tr("Nothing to constrain"),
QObject::tr("Currently all internal geometrical elements "
"of the ellipse are already exposed."));
return;
}
if((!(focus1 && focus2) && pointids.size()>=1) || // if some element is missing and we are adding an element of that type
(!(major && minor) && lineids.size()>=1) ){
// if some element is missing and we are adding an element of that type
if((!(focus1 && focus2) && pointids.size() >= 1) ||
(!(major && minor) && lineids.size() >= 1) ){
openCommand("add internal alignment constraint");
@@ -6919,16 +6985,22 @@ void CmdSketcherConstrainInternalAlignment::activated(int iMsg)
tryAutoRecompute(Obj);
if(extra_elements){
QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Extra elements"),
QObject::tr("More elements than possible for the given ellipse were provided. These were ignored."));
QMessageBox::warning(Gui::getMainWindow(),
QObject::tr("Extra elements"),
QObject::tr("More elements than possible "
"for the given ellipse were provided. "
"These were ignored."));
}
// clear the selection (convenience)
getSelection().clearSelection();
}
else {
QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Extra elements"),
QObject::tr("More elements than possible for the given ellipse were provided. These were ignored."));
QMessageBox::warning(Gui::getMainWindow(),
QObject::tr("Extra elements"),
QObject::tr("More elements than possible "
"for the given ellipse were provided. "
"These were ignored."));
}
}
else if(geo->getTypeId() == Part::GeomArcOfEllipse::getClassTypeId()) {
@@ -6941,13 +7013,17 @@ void CmdSketcherConstrainInternalAlignment::activated(int iMsg)
if(arcsofellipseids.size()>1){
QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"),
QObject::tr("You cannot internally constrain an arc of ellipse on another arc of ellipse. Select only one arc of ellipse."));
QObject::tr("You cannot internally constrain an arc of ellipse "
"on another arc of ellipse. "
"Select only one arc of ellipse."));
return;
}
if(ellipseids.size()>0){
QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"),
QObject::tr("You cannot internally constrain an ellipse on an arc of ellipse. Select only one ellipse or arc of ellipse."));
QObject::tr("You cannot internally constrain an ellipse "
"on an arc of ellipse. "
"Select only one ellipse or arc of ellipse."));
return;
}
@@ -6996,13 +7072,16 @@ void CmdSketcherConstrainInternalAlignment::activated(int iMsg)
}
if(major && minor && focus1 && focus2) {
QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Nothing to constrain"),
QObject::tr("Currently all internal geometry of the arc of ellipse is already exposed."));
QMessageBox::warning(Gui::getMainWindow(),
QObject::tr("Nothing to constrain"),
QObject::tr("Currently all internal geometrical elements "
"of the ellipse are already exposed."));
return;
}
if((!(focus1 && focus2) && pointids.size()>=1) || // if some element is missing and we are adding an element of that type
(!(major && minor) && lineids.size()>=1) ){
// if some element is missing and we are adding an element of that type
if((!(focus1 && focus2) && pointids.size() >= 1) ||
(!(major && minor) && lineids.size() >= 1) ){
openCommand("add internal alignment constraint");
@@ -7084,27 +7163,37 @@ void CmdSketcherConstrainInternalAlignment::activated(int iMsg)
tryAutoRecompute(Obj);
if(extra_elements){
QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Extra elements"),
QObject::tr("More elements than possible for the given ellipse were provided. These were ignored."));
QMessageBox::warning(Gui::getMainWindow(),
QObject::tr("Extra elements"),
QObject::tr("More elements than possible "
"for the given ellipse were provided. "
"These were ignored."));
}
// clear the selection (convenience)
getSelection().clearSelection();
}
else {
QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Extra elements"),
QObject::tr("More elements than possible for the given arc of ellipse were provided. These were ignored."));
QMessageBox::warning(Gui::getMainWindow(),
QObject::tr("Extra elements"),
QObject::tr("More elements than possible "
"for the given arc of ellipse were provided. "
"These were ignored."));
}
}
else {
QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"),
QObject::tr("Currently internal geometry is only supported for ellipse or arc of ellipse. The last selected element must be an ellipse or an arc of ellipse."));
QMessageBox::warning(Gui::getMainWindow(),
QObject::tr("Wrong selection"),
QObject::tr("Currently internal geometry "
"is only supported for ellipse or arc of ellipse. "
"The last selected element must be an ellipse "
"or an arc of ellipse."));
}
}
bool CmdSketcherConstrainInternalAlignment::isActive(void)
{
return isCreateConstraintActive( getActiveGuiDocument() );
return isCreateConstraintActive(getActiveGuiDocument());
}
// ======================================================================================
@@ -7116,8 +7205,10 @@ CmdSketcherToggleDrivingConstraint::CmdSketcherToggleDrivingConstraint()
{
sAppModule = "Sketcher";
sGroup = QT_TR_NOOP("Sketcher");
sMenuText = QT_TR_NOOP("Toggle reference/driving constraint");
sToolTipText = QT_TR_NOOP("Toggles the toolbar or selected constraints to/from reference mode");
sMenuText = QT_TR_NOOP("Toggle driving/reference constraint");
sToolTipText = QT_TR_NOOP("Set the toolbar, "
"or the selected constraints,\n"
"into driving or reference mode");
sWhatsThis = "Sketcher_ToggleDrivingConstraint";
sStatusTip = sToolTipText;
sPixmap = "Sketcher_ToggleConstraint";
@@ -7198,7 +7289,7 @@ void CmdSketcherToggleDrivingConstraint::activated(int iMsg)
}
// undo command open
openCommand("Toggle driving from/to non-driving");
openCommand("Toggle constraint to driving/reference");
int successful=SubNames.size();
// go through the selected subelements
@@ -7240,8 +7331,9 @@ CmdSketcherToggleActiveConstraint::CmdSketcherToggleActiveConstraint()
{
sAppModule = "Sketcher";
sGroup = QT_TR_NOOP("Sketcher");
sMenuText = QT_TR_NOOP("Toggle activate/deactivate constraint");
sToolTipText = QT_TR_NOOP("Toggles activate/deactivate state for selected constraints");
sMenuText = QT_TR_NOOP("Activate/deactivate constraint");
sToolTipText = QT_TR_NOOP("Activates or deactivates "
"the selected constraints");
sWhatsThis = "Sketcher_ToggleActiveConstraint";
sStatusTip = sToolTipText;
sPixmap = "Sketcher_ToggleActiveConstraint";
@@ -7263,8 +7355,9 @@ void CmdSketcherToggleActiveConstraint::activated(int iMsg)
// only one sketch with its subelements are allowed to be selected
if (selection.size() != 1 || !selection[0].isObjectTypeOf(Sketcher::SketchObject::getClassTypeId())) {
QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"),
QObject::tr("Select constraint(s) from the sketch."));
QMessageBox::warning(Gui::getMainWindow(),
QObject::tr("Wrong selection"),
QObject::tr("Select constraints from the sketch."));
return;
}
@@ -7273,13 +7366,14 @@ void CmdSketcherToggleActiveConstraint::activated(int iMsg)
// get the needed lists and objects
const std::vector<std::string> &SubNames = selection[0].getSubNames();
if (SubNames.empty()) {
QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"),
QObject::tr("Select constraint(s) from the sketch."));
QMessageBox::warning(Gui::getMainWindow(),
QObject::tr("Wrong selection"),
QObject::tr("Select constraints from the sketch."));
return;
}
// undo command open
openCommand("Active/Deactivate constraints");
openCommand("Activate/Deactivate constraint");
int successful=SubNames.size();

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

@@ -3975,7 +3975,7 @@ void CmdSketcherCompCreateConic::languageChange()
ellipseByCenter->setToolTip(QApplication::translate("Sketcher_CreateEllipseByCenter","Create an ellipse by center, major radius and point"));
ellipseByCenter->setStatusTip(QApplication::translate("Sketcher_CreateEllipseByCenter","Create an ellipse by center, major radius and point"));
QAction* ellipseBy3Points = a[1];
ellipseBy3Points->setText(QApplication::translate("CmdSketcherCompCreateConic","Ellipse by Periapsis, apoapsis, minor radius"));
ellipseBy3Points->setText(QApplication::translate("CmdSketcherCompCreateConic","Ellipse by periapsis, apoapsis, minor radius"));
ellipseBy3Points->setToolTip(QApplication::translate("Sketcher_CreateEllipseBy3Points","Create a ellipse by periapsis, apoapsis, and minor radius"));
ellipseBy3Points->setStatusTip(QApplication::translate("Sketcher_CreateEllipseBy3Points","Create a ellipse by periapsis, apoapsis, and minor radius"));
QAction* arcofellipse = a[2];

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

@@ -6397,7 +6397,7 @@ void ViewProviderSketch::deleteSelected()
if(SubNames.size()>0) {
App::Document* doc = getSketchObject()->getDocument();
doc->openTransaction("delete sketch geometry");
doc->openTransaction("Delete sketch geometry");
onDelete(SubNames);