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

consistently use term 'B-spline' in the sketcher GUI

Browse Source
This commit is contained in:
wmayer
2017-04-12 09:37:58 +02:00
parent 10ce910c03
commit c2e83c7818
3 changed files with 42 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2453,9 +2453,9 @@ void CmdSketcherConstrainPointOnObject::activated(int iMsg)
const Part::Geometry *geom = Obj->getGeometry(curves[iCrv].GeoId);
if( geom && geom->getTypeId() == Part::GeomBSplineCurve::getClassTypeId() ){
// unsupported until normal to BSpline at any point implemented.
// unsupported until normal to B-spline at any point implemented.
QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"),
QObject::tr("Point on BSpline edge currently unsupported."));
QObject::tr("Point on B-spline edge currently unsupported."));
continue;
}
@@ -2522,9 +2522,9 @@ void CmdSketcherConstrainPointOnObject::applyConstraint(std::vector<SelIdPair> &
const Part::Geometry *geom = Obj->getGeometry(GeoIdCrv);
if( geom && geom->getTypeId() == Part::GeomBSplineCurve::getClassTypeId() ){
// unsupported until normal to BSpline at any point implemented.
// unsupported until normal to B-spline at any point implemented.
QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"),
QObject::tr("Point on BSpline edge currently unsupported."));
QObject::tr("Point on B-spline edge currently unsupported."));
abortCommand();
return;
@@ -3451,7 +3451,7 @@ void CmdSketcherConstrainPerpendicular::activated(int iMsg)
return;
}
// This code supports simple bspline endpoint perp to any other geometric curve
// This code supports simple B-spline endpoint perp to any other geometric curve
const Part::Geometry *geom1 = Obj->getGeometry(GeoId1);
const Part::Geometry *geom2 = Obj->getGeometry(GeoId2);
@@ -3463,8 +3463,8 @@ void CmdSketcherConstrainPerpendicular::activated(int iMsg)
std::swap(GeoId1,GeoId2);
std::swap(PosId1,PosId2);
}
// GeoId1 is the bspline now
} // end of code supports simple bspline endpoint tangency
// GeoId1 is the B-spline now
} // end of code supports simple B-spline endpoint tangency
openCommand("add perpendicular constraint");
Gui::Command::doCommand(
@@ -3497,9 +3497,9 @@ void CmdSketcherConstrainPerpendicular::activated(int iMsg)
const Part::Geometry *geom2 = Obj->getGeometry(GeoId2);
if( geom2 && geom2->getTypeId() == Part::GeomBSplineCurve::getClassTypeId() ){
// unsupported until normal to BSpline at any point implemented.
// unsupported until normal to B-spline at any point implemented.
QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"),
QObject::tr("Perpendicular to BSpline edge currently unsupported."));
QObject::tr("Perpendicular to B-spline edge currently unsupported."));
return;
}
@@ -3536,9 +3536,9 @@ void CmdSketcherConstrainPerpendicular::activated(int iMsg)
if (geo1->getTypeId() == Part::GeomBSplineCurve::getClassTypeId() ||
geo2->getTypeId() == Part::GeomBSplineCurve::getClassTypeId()){
// unsupported until tangent to BSpline at any point implemented.
// unsupported until tangent to B-spline at any point implemented.
QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"),
QObject::tr("Perpendicular to BSpline edge currently unsupported."));
QObject::tr("Perpendicular to B-spline edge currently unsupported."));
return;
}
@@ -3722,9 +3722,9 @@ void CmdSketcherConstrainPerpendicular::applyConstraint(std::vector<SelIdPair> &
if (geo1->getTypeId() == Part::GeomBSplineCurve::getClassTypeId() ||
geo2->getTypeId() == Part::GeomBSplineCurve::getClassTypeId()){
// unsupported until tangent to BSpline at any point implemented.
// unsupported until tangent to B-spline at any point implemented.
QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"),
QObject::tr("Perpendicular to BSpline edge currently unsupported."));
QObject::tr("Perpendicular to B-spline edge currently unsupported."));
return;
}
@@ -4117,7 +4117,7 @@ void CmdSketcherConstrainTangent::activated(int iMsg)
return;
}
// This code supports simple bspline endpoint tangency to any other geometric curve
// This code supports simple B-spline endpoint tangency to any other geometric curve
const Part::Geometry *geom1 = Obj->getGeometry(GeoId1);
const Part::Geometry *geom2 = Obj->getGeometry(GeoId2);
@@ -4129,8 +4129,8 @@ void CmdSketcherConstrainTangent::activated(int iMsg)
std::swap(GeoId1,GeoId2);
std::swap(PosId1,PosId2);
}
// GeoId1 is the bspline now
} // end of code supports simple bspline endpoint tangency
// GeoId1 is the B-spline now
} // end of code supports simple B-spline endpoint tangency
openCommand("add tangent constraint");
Gui::Command::doCommand(
@@ -4163,9 +4163,9 @@ void CmdSketcherConstrainTangent::activated(int iMsg)
const Part::Geometry *geom2 = Obj->getGeometry(GeoId2);
if( geom2 && geom2->getTypeId() == Part::GeomBSplineCurve::getClassTypeId() ){
// unsupported until tangent to BSpline at any point implemented.
// unsupported until tangent to B-spline at any point implemented.
QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"),
QObject::tr("Tangency to BSpline edge currently unsupported."));
QObject::tr("Tangency to B-spline edge currently unsupported."));
return;
}
@@ -4193,9 +4193,9 @@ void CmdSketcherConstrainTangent::activated(int iMsg)
( geom1->getTypeId() == Part::GeomBSplineCurve::getClassTypeId() ||
geom2->getTypeId() == Part::GeomBSplineCurve::getClassTypeId() )){
// unsupported until tangent to BSpline at any point implemented.
// unsupported until tangent to B-spline at any point implemented.
QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"),
QObject::tr("Tangency to BSpline edge currently unsupported."));
QObject::tr("Tangency to B-spline edge currently unsupported."));
return;
}
@@ -4337,9 +4337,9 @@ void CmdSketcherConstrainTangent::applyConstraint(std::vector<SelIdPair> &selSeq
( geom1->getTypeId() == Part::GeomBSplineCurve::getClassTypeId() ||
geom2->getTypeId() == Part::GeomBSplineCurve::getClassTypeId() )){
// unsupported until tangent to BSpline at any point implemented.
// unsupported until tangent to B-spline at any point implemented.
QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"),
QObject::tr("Tangency to BSpline edge currently unsupported."));
QObject::tr("Tangency to B-spline edge currently unsupported."));
return;
}
@@ -4482,7 +4482,7 @@ void CmdSketcherConstrainTangent::applyConstraint(std::vector<SelIdPair> &selSeq
return;
}
// This code supports simple bspline endpoint tangency to any other geometric curve
// This code supports simple B-spline endpoint tangency to any other geometric curve
const Part::Geometry *geom1 = Obj->getGeometry(GeoId1);
const Part::Geometry *geom2 = Obj->getGeometry(GeoId2);
@@ -4494,8 +4494,8 @@ void CmdSketcherConstrainTangent::applyConstraint(std::vector<SelIdPair> &selSeq
std::swap(GeoId1,GeoId2);
std::swap(PosId1,PosId2);
}
// GeoId1 is the bspline now
} // end of code supports simple bspline endpoint tangency
// GeoId1 is the B-spline now
} // end of code supports simple B-spline endpoint tangency
openCommand("add tangent constraint");
Gui::Command::doCommand(
@@ -5677,7 +5677,7 @@ void CmdSketcherConstrainEqual::activated(int iMsg)
if(geo->getTypeId() == Part::GeomBSplineCurve::getClassTypeId()) {
// unsupported as they are generally hereogeneus shapes
QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"),
QObject::tr("Equality for BSpline edge currently unsupported."));
QObject::tr("Equality for B-spline edge currently unsupported."));
return;
}
@@ -6137,9 +6137,9 @@ void CmdSketcherConstrainSnellsLaw::activated(int iMsg)
const Part::Geometry *geo = Obj->getGeometry(GeoId3);
if( geo && geo->getTypeId() == Part::GeomBSplineCurve::getClassTypeId() ){
// unsupported until normal to BSpline at any point implemented.
// unsupported until normal to B-spline at any point implemented.
QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"),
QObject::tr("SnellsLaw on BSpline edge currently unsupported."));
QObject::tr("SnellsLaw on B-spline edge currently unsupported."));
return;
}

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

@@ -1143,7 +1143,7 @@ public:
}
virtual void quit(void) {
// We must see if we need to create a BSpline before cancelling everything
// We must see if we need to create a B-spline before cancelling everything
// and now just like any other Handler,
ParameterGrp::handle hGrp = App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/Preferences/Mod/Sketcher");
@@ -4601,7 +4601,7 @@ public:
currentgeoid++;
// Constraint pole circles to bspline.
// Constraint pole circles to B-spline.
std::stringstream cstream;
cstream << "conList = []\n";
@@ -4678,7 +4678,7 @@ public:
}
virtual void quit(void) {
// We must see if we need to create a BSpline before cancelling everything
// We must see if we need to create a B-spline before cancelling everything
// and now just like any other Handler,
ParameterGrp::handle hGrp = App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/Preferences/Mod/Sketcher");
@@ -4686,7 +4686,7 @@ public:
bool continuousMode = hGrp->GetBool("ContinuousCreationMode",true);
if (CurrentConstraint > 1) {
// create bspline from existing poles
// create B-spline from existing poles
Mode=STATUS_CLOSE;
EditCurve.pop_back();
this->releaseButton(Base::Vector2d(0.f,0.f));
@@ -4833,7 +4833,7 @@ CmdSketcherCompCreateBSpline::CmdSketcherCompCreateBSpline()
}
/**
* @brief Instantiates the bspline handler when the bspline command activated
* @brief Instantiates the B-spline handler when the B-spline command activated
* @param int iMsg
*/
void CmdSketcherCompCreateBSpline::activated(int iMsg)

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

@@ -98,7 +98,7 @@ void ShowRestoreInformationLayer(SketcherGui::ViewProviderSketch* vp, char * vis
vp->showRestoreInformationLayer();
}
// Show/Hide BSpline degree
// Show/Hide B-spline degree
DEF_STD_CMD_A(CmdSketcherBSplineDegree);
CmdSketcherBSplineDegree::CmdSketcherBSplineDegree()
@@ -132,7 +132,7 @@ bool CmdSketcherBSplineDegree::isActive(void)
return isSketcherBSplineActive( getActiveGuiDocument(), false );
}
// Show/Hide BSpline polygon
// Show/Hide B-spline polygon
DEF_STD_CMD_A(CmdSketcherBSplinePolygon);
CmdSketcherBSplinePolygon::CmdSketcherBSplinePolygon()
@@ -166,7 +166,7 @@ bool CmdSketcherBSplinePolygon::isActive(void)
return isSketcherBSplineActive( getActiveGuiDocument(), false );
}
// Show/Hide BSpline comb
// Show/Hide B-spline comb
DEF_STD_CMD_A(CmdSketcherBSplineComb);
CmdSketcherBSplineComb::CmdSketcherBSplineComb()
@@ -567,7 +567,7 @@ void CmdSketcherIncreaseKnotMultiplicity::activated(int iMsg)
applied = true;
// Warning: GeoId list might have changed as the consequence of deleting pole circles and
// particularly bspline GeoID might have changed.
// particularly B-spline GeoID might have changed.
}
catch (const Base::Exception& e) {
@@ -586,12 +586,12 @@ void CmdSketcherIncreaseKnotMultiplicity::activated(int iMsg)
if(notaknot){
QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"),
QObject::tr("None of the selected elements is a knot of a bspline"));
QObject::tr("None of the selected elements is a knot of a B-spline"));
}
if(applied)
{
// find new geoid for bspline as GeoId might have changed
// find new geoid for B-spline as GeoId might have changed
const std::vector< Part::Geometry * > &gvals = Obj->getInternalGeometry();
int ngeoid = 0;
@@ -721,7 +721,7 @@ void CmdSketcherDecreaseKnotMultiplicity::activated(int iMsg)
applied = true;
// Warning: GeoId list might have changed as the consequence of deleting pole circles and
// particularly bspline GeoID might have changed.
// particularly B-spline GeoID might have changed.
}
catch (const Base::Exception& e) {
@@ -739,12 +739,12 @@ void CmdSketcherDecreaseKnotMultiplicity::activated(int iMsg)
if(notaknot){
QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"),
QObject::tr("None of the selected elements is a knot of a bspline"));
QObject::tr("None of the selected elements is a knot of a B-spline"));
}
if(applied)
{
// find new geoid for bspline as GeoId might have changed
// find new geoid for B-spline as GeoId might have changed
const std::vector< Part::Geometry * > &gvals = Obj->getInternalGeometry();
int ngeoid = 0;