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

fix whitespaces

Browse Source
This commit is contained in:
wmayer 2016-12-28 14:22:42 +01:00
parent 7496eeef18
commit cbf717f317
7 changed files with 48 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Mod/Part/App/ParabolaPyImp.cpp
View File

@ -25,7 +25,7 @@
#ifndef _PreComp_ #ifndef _PreComp_
# include <Geom_Parabola.hxx> # include <Geom_Parabola.hxx>
# include <gp_Parab.hxx> # include <gp_Parab.hxx>
#include <gce_MakeParab.hxx> # include <gce_MakeParab.hxx>
#endif #endif
#include <Base/VectorPy.h> #include <Base/VectorPy.h>
@ -96,7 +96,6 @@ int ParabolaPy::PyInit(PyObject* args, PyObject* kwds)
gp_Ax2 xdir(p1, norm, xdiroce); gp_Ax2 xdir(p1, norm, xdiroce);
gce_MakeParab mc(xdir, (Standard_Real) xvect.Length()); gce_MakeParab mc(xdir, (Standard_Real) xvect.Length());
if (!mc.IsDone()) { if (!mc.IsDone()) {
PyErr_SetString(PartExceptionOCCError, gce_ErrorStatusText(mc.Status())); PyErr_SetString(PartExceptionOCCError, gce_ErrorStatusText(mc.Status()));
return -1; return -1;

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

@ -2030,8 +2030,8 @@ void CmdSketcherConstrainPerpendicular::activated(int iMsg)
minord=ellipse->getMinorRadius(); minord=ellipse->getMinorRadius();
majdir=ellipse->getMajorAxisDir(); majdir=ellipse->getMajorAxisDir();
phi=atan2(majdir.y, majdir.x); 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<const Part::GeomArcOfEllipse *>(geo1); const Part::GeomArcOfEllipse *aoe = static_cast<const Part::GeomArcOfEllipse *>(geo1);
center=aoe->getCenter(); center=aoe->getCenter();
@ -2040,8 +2040,7 @@ void CmdSketcherConstrainPerpendicular::activated(int iMsg)
majdir=aoe->getMajorAxisDir(); majdir=aoe->getMajorAxisDir();
phi=atan2(majdir.y, majdir.x); phi=atan2(majdir.y, majdir.x);
} }
else else if( geo1->getTypeId() == Part::GeomArcOfHyperbola::getClassTypeId() ){
if( geo1->getTypeId() == Part::GeomArcOfHyperbola::getClassTypeId() ){
const Part::GeomArcOfHyperbola *aoh = static_cast<const Part::GeomArcOfHyperbola *>(geo1); const Part::GeomArcOfHyperbola *aoh = static_cast<const Part::GeomArcOfHyperbola *>(geo1);
center=aoh->getCenter(); center=aoh->getCenter();
@ -2050,8 +2049,7 @@ void CmdSketcherConstrainPerpendicular::activated(int iMsg)
majdir=aoh->getMajorAxisDir(); majdir=aoh->getMajorAxisDir();
phi=atan2(majdir.y, majdir.x); phi=atan2(majdir.y, majdir.x);
} }
else else if( geo1->getTypeId() == Part::GeomArcOfParabola::getClassTypeId() ){
if( geo1->getTypeId() == Part::GeomArcOfParabola::getClassTypeId() ){
const Part::GeomArcOfParabola *aop = static_cast<const Part::GeomArcOfParabola *>(geo1); const Part::GeomArcOfParabola *aop = static_cast<const Part::GeomArcOfParabola *>(geo1);
center=aop->getCenter(); center=aop->getCenter();
@ -2076,8 +2074,7 @@ void CmdSketcherConstrainPerpendicular::activated(int iMsg)
PoO = point1 + direction / 2; PoO = point1 + direction / 2;
} }
else else {
{
Base::Vector3d direction=point1-center; Base::Vector3d direction=point1-center;
double tapprox=atan2(direction.y,direction.x)-phi; // we approximate the eccentric anomally by the polar double tapprox=atan2(direction.y,direction.x)-phi; // we approximate the eccentric anomally by the polar