All: Reformat according to new standard
This commit is contained in:
committed by
Kacper Donat
parent
eafd18dac0
commit
25c3ba7338
@@ -21,9 +21,8 @@
|
||||
***************************************************************************/
|
||||
|
||||
|
||||
|
||||
# include <BRepBuilderAPI_MakeFace.hxx>
|
||||
# include <gp_Pln.hxx>
|
||||
#include <BRepBuilderAPI_MakeFace.hxx>
|
||||
#include <gp_Pln.hxx>
|
||||
|
||||
|
||||
#include <Mod/Part/App/PartPyCXX.h>
|
||||
@@ -42,11 +41,12 @@ PROPERTY_SOURCE(PartDesign::CoordinateSystem, Part::Datum)
|
||||
CoordinateSystem::CoordinateSystem()
|
||||
{
|
||||
this->setAttacher(new AttachEngine3D);
|
||||
// Create a shape, which will be used by the Sketcher. Them main function is to avoid a dependency of
|
||||
// Sketcher on the PartDesign module
|
||||
BRepBuilderAPI_MakeFace builder(gp_Pln(gp_Pnt(0,0,0), gp_Dir(0,0,1)));
|
||||
if (!builder.IsDone())
|
||||
// Create a shape, which will be used by the Sketcher. Them main function is to avoid a
|
||||
// dependency of Sketcher on the PartDesign module
|
||||
BRepBuilderAPI_MakeFace builder(gp_Pln(gp_Pnt(0, 0, 0), gp_Dir(0, 0, 1)));
|
||||
if (!builder.IsDone()) {
|
||||
return;
|
||||
}
|
||||
Shape.setValue(builder.Shape());
|
||||
}
|
||||
|
||||
@@ -56,7 +56,7 @@ Base::Vector3d CoordinateSystem::getXAxis()
|
||||
{
|
||||
Base::Rotation rot = Placement.getValue().getRotation();
|
||||
Base::Vector3d normal;
|
||||
rot.multVec(Base::Vector3d(1,0,0), normal);
|
||||
rot.multVec(Base::Vector3d(1, 0, 0), normal);
|
||||
return normal;
|
||||
}
|
||||
|
||||
@@ -64,7 +64,7 @@ Base::Vector3d CoordinateSystem::getYAxis()
|
||||
{
|
||||
Base::Rotation rot = Placement.getValue().getRotation();
|
||||
Base::Vector3d normal;
|
||||
rot.multVec(Base::Vector3d(0,1,0), normal);
|
||||
rot.multVec(Base::Vector3d(0, 1, 0), normal);
|
||||
return normal;
|
||||
}
|
||||
|
||||
@@ -72,35 +72,46 @@ Base::Vector3d CoordinateSystem::getZAxis()
|
||||
{
|
||||
Base::Rotation rot = Placement.getValue().getRotation();
|
||||
Base::Vector3d normal;
|
||||
rot.multVec(Base::Vector3d(0,0,1), normal);
|
||||
rot.multVec(Base::Vector3d(0, 0, 1), normal);
|
||||
return normal;
|
||||
}
|
||||
|
||||
App::DocumentObject *CoordinateSystem::getSubObject(const char *subname,
|
||||
PyObject **pyObj, Base::Matrix4D *pmat, bool transform, int) const
|
||||
App::DocumentObject* CoordinateSystem::getSubObject(
|
||||
const char* subname,
|
||||
PyObject** pyObj,
|
||||
Base::Matrix4D* pmat,
|
||||
bool transform,
|
||||
int
|
||||
) const
|
||||
{
|
||||
if(pmat && transform)
|
||||
if (pmat && transform) {
|
||||
*pmat *= Placement.getValue().toMatrix();
|
||||
}
|
||||
|
||||
if(!pyObj)
|
||||
if (!pyObj) {
|
||||
return const_cast<CoordinateSystem*>(this);
|
||||
}
|
||||
|
||||
gp_Dir dir(0,0,1);
|
||||
if(subname) {
|
||||
if(strcmp(subname,"X")==0)
|
||||
dir = gp_Dir(1,0,0);
|
||||
else if(strcmp(subname,"Y")==0)
|
||||
dir = gp_Dir(0,1,0);
|
||||
gp_Dir dir(0, 0, 1);
|
||||
if (subname) {
|
||||
if (strcmp(subname, "X") == 0) {
|
||||
dir = gp_Dir(1, 0, 0);
|
||||
}
|
||||
else if (strcmp(subname, "Y") == 0) {
|
||||
dir = gp_Dir(0, 1, 0);
|
||||
}
|
||||
}
|
||||
|
||||
Base::PyGILStateLocker lock;
|
||||
PY_TRY {
|
||||
BRepBuilderAPI_MakeFace builder(gp_Pln(gp_Pnt(0,0,0), dir));
|
||||
PY_TRY
|
||||
{
|
||||
BRepBuilderAPI_MakeFace builder(gp_Pln(gp_Pnt(0, 0, 0), dir));
|
||||
Part::TopoShape ts(builder.Shape());
|
||||
if(pmat)
|
||||
ts.transformShape(*pmat,false,true);
|
||||
*pyObj = Py::new_reference_to(Part::shape2pyshape(ts));
|
||||
if (pmat) {
|
||||
ts.transformShape(*pmat, false, true);
|
||||
}
|
||||
*pyObj = Py::new_reference_to(Part::shape2pyshape(ts));
|
||||
return const_cast<CoordinateSystem*>(this);
|
||||
} PY_CATCH_OCC
|
||||
}
|
||||
PY_CATCH_OCC
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user