From cbf717f317995175c350e74f33d004274c385ab2 Mon Sep 17 00:00:00 2001 From: wmayer Date: Wed, 28 Dec 2016 14:22:42 +0100 Subject: [PATCH] fix whitespaces --- src/Mod/Part/App/ParabolaPyImp.cpp | 27 +++++++------ src/Mod/Sketcher/App/Sketch.h | 8 ++-- src/Mod/Sketcher/App/planegcs/Constraints.h | 4 +- src/Mod/Sketcher/App/planegcs/GCS.h | 8 ++-- src/Mod/Sketcher/Gui/CommandConstraints.cpp | 43 ++++++++++----------- src/Mod/Sketcher/Gui/CommandCreateGeo.cpp | 8 ++-- src/Mod/Sketcher/Gui/Workbench.cpp | 2 +- 7 files changed, 48 insertions(+), 52 deletions(-) diff --git a/src/Mod/Part/App/ParabolaPyImp.cpp b/src/Mod/Part/App/ParabolaPyImp.cpp index e9686cddf..883503905 100644 --- a/src/Mod/Part/App/ParabolaPyImp.cpp +++ b/src/Mod/Part/App/ParabolaPyImp.cpp @@ -25,7 +25,7 @@ #ifndef _PreComp_ # include # include -#include +# include #endif #include @@ -80,23 +80,22 @@ int ParabolaPy::PyInit(PyObject* args, PyObject* kwds) PyObject *pV1, *pV2, *pV3; if (PyArg_ParseTupleAndKeywords(args, kwds, "O!O!O!", keywords_ssc, &(Base::VectorPy::Type), &pV1, - &(Base::VectorPy::Type), &pV2, + &(Base::VectorPy::Type), &pV2, &(Base::VectorPy::Type), &pV3)) { Base::Vector3d focus = static_cast(pV1)->value(); Base::Vector3d center = static_cast(pV2)->value(); - Base::Vector3d normal = static_cast(pV3)->value(); - - Base::Vector3d xvect = focus-center; + Base::Vector3d normal = static_cast(pV3)->value(); + + Base::Vector3d xvect = focus-center; - // set the geometry - gp_Pnt p1(center.x,center.y,center.z); - gp_Dir norm(normal.x,normal.y,normal.z); - gp_Dir xdiroce(xvect.x,xvect.y,xvect.z); - - gp_Ax2 xdir(p1, norm, xdiroce); - - gce_MakeParab mc(xdir, (Standard_Real) xvect.Length()); - + // set the geometry + gp_Pnt p1(center.x,center.y,center.z); + gp_Dir norm(normal.x,normal.y,normal.z); + gp_Dir xdiroce(xvect.x,xvect.y,xvect.z); + + gp_Ax2 xdir(p1, norm, xdiroce); + + gce_MakeParab mc(xdir, (Standard_Real) xvect.Length()); if (!mc.IsDone()) { PyErr_SetString(PartExceptionOCCError, gce_ErrorStatusText(mc.Status())); return -1; diff --git a/src/Mod/Sketcher/App/Sketch.h b/src/Mod/Sketcher/App/Sketch.h index 77c06fc86..7ff73c9cd 100644 --- a/src/Mod/Sketcher/App/Sketch.h +++ b/src/Mod/Sketcher/App/Sketch.h @@ -339,7 +339,7 @@ public: Ellipse = 5, // 1 Point(mid), 5 Parameters(x,y,r1,r2,phi) phi=angle xaxis of elipse with respect of sketch xaxis ArcOfEllipse = 6, ArcOfHyperbola = 7, - ArcOfParabola = 8 + ArcOfParabola = 8 }; float SolveTime; @@ -385,9 +385,9 @@ protected: std::vector Arcs; std::vector Circles; std::vector Ellipses; - std::vector ArcsOfEllipse; - std::vector ArcsOfHyperbola; - std::vector ArcsOfParabola; + std::vector ArcsOfEllipse; + std::vector ArcsOfHyperbola; + std::vector ArcsOfParabola; bool isInitMove; bool isFine; diff --git a/src/Mod/Sketcher/App/planegcs/Constraints.h b/src/Mod/Sketcher/App/planegcs/Constraints.h index 31e993fa8..12f7c042e 100644 --- a/src/Mod/Sketcher/App/planegcs/Constraints.h +++ b/src/Mod/Sketcher/App/planegcs/Constraints.h @@ -66,8 +66,8 @@ namespace GCS CurveValue = 20, PointOnHyperbola = 21, InternalAlignmentPoint2Hyperbola = 22, - PointOnParabola = 23, - EqualFocalDistance = 24 + PointOnParabola = 23, + EqualFocalDistance = 24 }; enum InternalAlignmentType { diff --git a/src/Mod/Sketcher/App/planegcs/GCS.h b/src/Mod/Sketcher/App/planegcs/GCS.h index 1ff077801..7674e8a85 100644 --- a/src/Mod/Sketcher/App/planegcs/GCS.h +++ b/src/Mod/Sketcher/App/planegcs/GCS.h @@ -182,11 +182,11 @@ namespace GCS int addConstraintPointOnCircle(Point &p, Circle &c, int tagId=0); int addConstraintPointOnEllipse(Point &p, Ellipse &e, int tagId=0); int addConstraintPointOnHyperbolicArc(Point &p, ArcOfHyperbola &e, int tagId=0); - int addConstraintPointOnParabolicArc(Point &p, ArcOfParabola &e, int tagId=0); + int addConstraintPointOnParabolicArc(Point &p, ArcOfParabola &e, int tagId=0); int addConstraintArcOfEllipseRules(ArcOfEllipse &a, int tagId=0); int addConstraintCurveValue(Point &p, Curve &a, double *u, int tagId=0); int addConstraintArcOfHyperbolaRules(ArcOfHyperbola &a, int tagId=0); - int addConstraintArcOfParabolaRules(ArcOfParabola &a, int tagId=0); + int addConstraintArcOfParabolaRules(ArcOfParabola &a, int tagId=0); int addConstraintPointOnArc(Point &p, Arc &a, int tagId=0); int addConstraintPerpendicularLine2Arc(Point &p1, Point &p2, Arc &a, int tagId=0); @@ -213,7 +213,7 @@ namespace GCS int addConstraintEqualRadii(ArcOfHyperbola &a1, ArcOfHyperbola &a2, int tagId=0); int addConstraintEqualRadius(Circle &c1, Arc &a2, int tagId=0); int addConstraintEqualRadius(Arc &a1, Arc &a2, int tagId=0); - int addConstraintEqualFocus(ArcOfParabola &a1, ArcOfParabola &a2, int tagId=0); + int addConstraintEqualFocus(ArcOfParabola &a1, ArcOfParabola &a2, int tagId=0); int addConstraintP2PSymmetric(Point &p1, Point &p2, Line &l, int tagId=0); int addConstraintP2PSymmetric(Point &p1, Point &p2, Point &p, int tagId=0); int addConstraintSnellsLaw(Curve &ray1, Curve &ray2, @@ -232,7 +232,7 @@ namespace GCS int addConstraintInternalAlignmentHyperbolaMajorDiameter(Hyperbola &e, Point &p1, Point &p2, int tagId=0); int addConstraintInternalAlignmentHyperbolaMinorDiameter(Hyperbola &e, Point &p1, Point &p2, int tagId=0); int addConstraintInternalAlignmentHyperbolaFocus(Hyperbola &e, Point &p1, int tagId=0); - int addConstraintInternalAlignmentParabolaFocus(Parabola &e, Point &p1, int tagId=0); + int addConstraintInternalAlignmentParabolaFocus(Parabola &e, Point &p1, int tagId=0); double calculateAngleViaPoint(Curve &crv1, Curve &crv2, Point &p); double calculateAngleViaPoint(Curve &crv1, Curve &crv2, Point &p1, Point &p2); diff --git a/src/Mod/Sketcher/Gui/CommandConstraints.cpp b/src/Mod/Sketcher/Gui/CommandConstraints.cpp index b1cfc047b..84165edd4 100644 --- a/src/Mod/Sketcher/Gui/CommandConstraints.cpp +++ b/src/Mod/Sketcher/Gui/CommandConstraints.cpp @@ -2013,11 +2013,11 @@ void CmdSketcherConstrainPerpendicular::activated(int iMsg) if( geo1->getTypeId() == Part::GeomEllipse::getClassTypeId() || geo1->getTypeId() == Part::GeomArcOfEllipse::getClassTypeId() || geo1->getTypeId() == Part::GeomArcOfHyperbola::getClassTypeId() || - geo1->getTypeId() == Part::GeomArcOfParabola::getClassTypeId() ) { + geo1->getTypeId() == Part::GeomArcOfParabola::getClassTypeId() ) { Base::Vector3d center; Base::Vector3d majdir; - Base::Vector3d focus; + Base::Vector3d focus; double majord = 0; double minord = 0; double phi = 0; @@ -2030,8 +2030,8 @@ void CmdSketcherConstrainPerpendicular::activated(int iMsg) minord=ellipse->getMinorRadius(); majdir=ellipse->getMajorAxisDir(); phi=atan2(majdir.y, majdir.x); - } else - if( geo1->getTypeId() == Part::GeomArcOfEllipse::getClassTypeId() ){ + } + else if( geo1->getTypeId() == Part::GeomArcOfEllipse::getClassTypeId() ){ const Part::GeomArcOfEllipse *aoe = static_cast(geo1); center=aoe->getCenter(); @@ -2040,23 +2040,21 @@ void CmdSketcherConstrainPerpendicular::activated(int iMsg) majdir=aoe->getMajorAxisDir(); phi=atan2(majdir.y, majdir.x); } - else - if( geo1->getTypeId() == Part::GeomArcOfHyperbola::getClassTypeId() ){ - const Part::GeomArcOfHyperbola *aoh = static_cast(geo1); - - center=aoh->getCenter(); - majord=aoh->getMajorRadius(); - minord=aoh->getMinorRadius(); - majdir=aoh->getMajorAxisDir(); - phi=atan2(majdir.y, majdir.x); - } - else - if( geo1->getTypeId() == Part::GeomArcOfParabola::getClassTypeId() ){ - const Part::GeomArcOfParabola *aop = static_cast(geo1); - - center=aop->getCenter(); - focus=aop->getFocus(); - } + else if( geo1->getTypeId() == Part::GeomArcOfHyperbola::getClassTypeId() ){ + const Part::GeomArcOfHyperbola *aoh = static_cast(geo1); + + center=aoh->getCenter(); + majord=aoh->getMajorRadius(); + minord=aoh->getMinorRadius(); + majdir=aoh->getMajorAxisDir(); + phi=atan2(majdir.y, majdir.x); + } + else if( geo1->getTypeId() == Part::GeomArcOfParabola::getClassTypeId() ){ + const Part::GeomArcOfParabola *aop = static_cast(geo1); + + center=aop->getCenter(); + focus=aop->getFocus(); + } const Part::GeomLineSegment *line = static_cast(geo2); @@ -2076,8 +2074,7 @@ void CmdSketcherConstrainPerpendicular::activated(int iMsg) PoO = point1 + direction / 2; } - else - { + else { Base::Vector3d direction=point1-center; double tapprox=atan2(direction.y,direction.x)-phi; // we approximate the eccentric anomally by the polar diff --git a/src/Mod/Sketcher/Gui/CommandCreateGeo.cpp b/src/Mod/Sketcher/Gui/CommandCreateGeo.cpp index aac9ec8dd..dbbdb6198 100644 --- a/src/Mod/Sketcher/Gui/CommandCreateGeo.cpp +++ b/src/Mod/Sketcher/Gui/CommandCreateGeo.cpp @@ -4222,16 +4222,16 @@ void CmdSketcherCompCreateConic::updateAction(int mode) a[0]->setIcon(Gui::BitmapFactory().pixmap("Sketcher_CreateEllipse")); a[1]->setIcon(Gui::BitmapFactory().pixmap("Sketcher_CreateEllipse_3points")); a[2]->setIcon(Gui::BitmapFactory().pixmap("Sketcher_Elliptical_Arc")); - a[3]->setIcon(Gui::BitmapFactory().pixmap("Sketcher_Hyperbolic_Arc")); - a[4]->setIcon(Gui::BitmapFactory().pixmap("Sketcher_Parabolic_Arc")); + a[3]->setIcon(Gui::BitmapFactory().pixmap("Sketcher_Hyperbolic_Arc")); + a[4]->setIcon(Gui::BitmapFactory().pixmap("Sketcher_Parabolic_Arc")); getAction()->setIcon(a[index]->icon()); break; case Construction: a[0]->setIcon(Gui::BitmapFactory().pixmap("Sketcher_CreateEllipse_Constr")); a[1]->setIcon(Gui::BitmapFactory().pixmap("Sketcher_CreateEllipse_3points_Constr")); a[2]->setIcon(Gui::BitmapFactory().pixmap("Sketcher_Elliptical_Arc_Constr")); - a[3]->setIcon(Gui::BitmapFactory().pixmap("Sketcher_Hyperbolic_Arc_Constr")); - a[4]->setIcon(Gui::BitmapFactory().pixmap("Sketcher_Parabolic_Arc_Constr")); + a[3]->setIcon(Gui::BitmapFactory().pixmap("Sketcher_Hyperbolic_Arc_Constr")); + a[4]->setIcon(Gui::BitmapFactory().pixmap("Sketcher_Parabolic_Arc_Constr")); getAction()->setIcon(a[index]->icon()); break; } diff --git a/src/Mod/Sketcher/Gui/Workbench.cpp b/src/Mod/Sketcher/Gui/Workbench.cpp index 42928aac8..7943a0121 100644 --- a/src/Mod/Sketcher/Gui/Workbench.cpp +++ b/src/Mod/Sketcher/Gui/Workbench.cpp @@ -141,7 +141,7 @@ inline void SketcherAddWorkspaceArcs(Gui::MenuItem& geom){ << "Sketcher_CreateEllipseBy3Points" << "Sketcher_CreateArcOfEllipse" << "Sketcher_CreateArcOfHyperbola" - << "Sketcher_CreateArcOfParabola"; + << "Sketcher_CreateArcOfParabola"; } template <> inline void SketcherAddWorkspaceArcs(Gui::ToolBarItem& geom){