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

[TD]CosmeticEdge setters and getters

Browse Source
This commit is contained in:
WandererFan
2020-06-06 21:55:39 -04:00
committed by WandererFan
parent 476b19590b
commit 64a96e2216
6 changed files with 254 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Mod/TechDraw/App/Cosmetic.h
View File

@@ -120,7 +120,6 @@ protected:
//********** CosmeticEdge ******************************************************
//?? should this inherit BaseGeom or have a BaseGeom member?
class TechDrawExport CosmeticEdge : public Base::Persistence, public TechDraw::BaseGeom
{
TYPESYSTEM_HEADER();
@@ -147,7 +146,7 @@ public:
CosmeticEdge* copy(void) const;
CosmeticEdge* clone(void) const;
Base::Vector3d permaStart; //persistent unscaled start/end points in View coords?
Base::Vector3d permaStart; //persistent unscaled start/end points in View coords
Base::Vector3d permaEnd;
double permaRadius;
// void unscaleEnds(double scale);

38
src/Mod/TechDraw/App/CosmeticEdgePy.xml
View File

@@ -37,18 +37,32 @@
<!-- </Documentation>-->
<!-- <Parameter Name="Owner" Type="String"/>-->
<!-- </Attribute> -->
<!-- <Attribute Name="Start">-->
<!-- <Documentation>-->
<!-- <UserDocu>Gives the position of one end of this CosmeticEdge as vector.</UserDocu>-->
<!-- </Documentation>-->
<!-- <Parameter Name="Start" Type="Object"/>-->
<!-- </Attribute>-->
<!-- <Attribute Name="End">-->
<!-- <Documentation>-->
<!-- <UserDocu>Gives the position of one end of this CosmeticEdge as vector.</UserDocu>-->
<!-- </Documentation>-->
<!-- <Parameter Name="End" Type="Object"/>-->
<!-- </Attribute>-->
<Attribute Name="Start">
<Documentation>
<UserDocu>Gives the position of one end of this CosmeticEdge as vector.</UserDocu>
</Documentation>
<Parameter Name="Start" Type="Object"/>
</Attribute>
<Attribute Name="End">
<Documentation>
<UserDocu>Gives the position of one end of this CosmeticEdge as vector.</UserDocu>
</Documentation>
<Parameter Name="End" Type="Object"/>
</Attribute>
<Attribute Name="Center">
<Documentation>
<UserDocu>Gives the position of center point of this CosmeticEdge as vector.</UserDocu>
</Documentation>
<Parameter Name="Center" Type="Object"/>
</Attribute>
<Attribute Name="Radius">
<Documentation>
<UserDocu>Gives the radius of CosmeticEdge in mm.</UserDocu>
</Documentation>
<Parameter Name="Radius" Type="Object"/>
</Attribute>
<!-- <Attribute Name="Geometry">-->
<!-- <Documentation>-->
<!-- <UserDocu>The edge geometry for this CosmeticEdge.</UserDocu>-->

181
src/Mod/TechDraw/App/CosmeticEdgePyImp.cpp
View File

@@ -26,6 +26,11 @@
# include <boost/uuid/uuid_io.hpp>
#endif
#include <BRepBuilderAPI_MakeEdge.hxx>
#include <BRepAdaptor_Curve.hxx>
#include <gp_Circ.hxx>
#include <Geom_Circle.hxx>
#include <App/Material.h>
@@ -206,59 +211,135 @@ Py::String CosmeticEdgePy::getTag(void) const
// }
//}
//Py::Object CosmeticEdgePy::getStart(void) const
//{
// Base::Vector3d point = getCosmeticEdgePtr()->permaStart;
// point = DrawUtil::invertY(point);
// return Py::asObject(new Base::VectorPy(point));
//}
Py::Object CosmeticEdgePy::getStart(void) const
{
Base::Vector3d point = getCosmeticEdgePtr()->permaStart;
return Py::asObject(new Base::VectorPy(point));
}
//void CosmeticEdgePy::setStart(Py::Object arg)
//{
// PyObject* p = arg.ptr();
// if (PyObject_TypeCheck(p, &(Base::VectorPy::Type))) {
// Base::Vector3d point = static_cast<Base::VectorPy*>(p)->value();
// getCosmeticEdgePtr()->permaStart =
// DrawUtil::invertY(point);
// }
// else if (PyObject_TypeCheck(p, &PyTuple_Type)) {
// Base::Vector3d point = Base::getVectorFromTuple<double>(p);
// getCosmeticEdgePtr()->permaStart =
// DrawUtil::invertY(point);
// }
// else {
// std::string error = std::string("type must be 'Vector', not ");
// error += p->ob_type->tp_name;
// throw Py::TypeError(error);
// }
//}
void CosmeticEdgePy::setStart(Py::Object arg)
{
PyObject* p = arg.ptr();
Base::Vector3d pNew;
if (PyObject_TypeCheck(p, &(Base::VectorPy::Type))) {
pNew = static_cast<Base::VectorPy*>(p)->value();
}
else if (PyObject_TypeCheck(p, &PyTuple_Type)) {
pNew = Base::getVectorFromTuple<double>(p);
}
else {
std::string error = std::string("type must be 'Vector', not ");
error += p->ob_type->tp_name;
throw Py::TypeError(error);
}
//Py::Object CosmeticEdgePy::getEnd(void) const
//{
// Base::Vector3d point = getCosmeticEdgePtr()->permaEnd;
// point = DrawUtil::invertY(point);
// return Py::asObject(new Base::VectorPy(point));
//}
pNew = DrawUtil::invertY(pNew);
Base::Vector3d pEnd = getCosmeticEdgePtr()->permaEnd;
pEnd = DrawUtil::invertY(pEnd);
gp_Pnt gp1(pNew.x,pNew.y,pNew.z);
gp_Pnt gp2(pEnd.x,pEnd.y,pEnd.z);
TopoDS_Edge e = BRepBuilderAPI_MakeEdge(gp1, gp2);
auto oldGeom = getCosmeticEdgePtr()->m_geometry;
getCosmeticEdgePtr()->m_geometry = TechDraw::BaseGeom::baseFactory(e);
getCosmeticEdgePtr()->permaStart = pNew;
delete oldGeom;
}
//void CosmeticEdgePy::setEnd(Py::Object arg)
//{
// PyObject* p = arg.ptr();
// if (PyObject_TypeCheck(p, &(Base::VectorPy::Type))) {
// Base::Vector3d point = static_cast<Base::VectorPy*>(p)->value();
// getCosmeticEdgePtr()->permaEnd =
// DrawUtil::invertY(point);
// }
// else if (PyObject_TypeCheck(p, &PyTuple_Type)) {
// Base::Vector3d point = Base::getVectorFromTuple<double>(p);
// getCosmeticEdgePtr()->permaEnd =
// DrawUtil::invertY(point);
// }
// else {
// std::string error = std::string("type must be 'Vector', not ");
// error += p->ob_type->tp_name;
// throw Py::TypeError(error);
// }
//}
Py::Object CosmeticEdgePy::getEnd(void) const
{
Base::Vector3d point = getCosmeticEdgePtr()->permaEnd;
return Py::asObject(new Base::VectorPy(point));
}
void CosmeticEdgePy::setEnd(Py::Object arg)
{
PyObject* p = arg.ptr();
Base::Vector3d pNew;
if (PyObject_TypeCheck(p, &(Base::VectorPy::Type))) {
pNew = static_cast<Base::VectorPy*>(p)->value();
}
else if (PyObject_TypeCheck(p, &PyTuple_Type)) {
pNew = Base::getVectorFromTuple<double>(p);
}
else {
std::string error = std::string("type must be 'Vector', not ");
error += p->ob_type->tp_name;
throw Py::TypeError(error);
}
pNew = DrawUtil::invertY(pNew);
Base::Vector3d pStart = getCosmeticEdgePtr()->permaStart;
pStart = DrawUtil::invertY(pStart);
gp_Pnt gp1(pNew.x,pNew.y,pNew.z);
gp_Pnt gp2(pStart.x,pStart.y,pStart.z);
TopoDS_Edge e = BRepBuilderAPI_MakeEdge(gp2, gp1);
auto oldGeom = getCosmeticEdgePtr()->m_geometry;
getCosmeticEdgePtr()->m_geometry = TechDraw::BaseGeom::baseFactory(e);
getCosmeticEdgePtr()->permaEnd = pNew;
delete oldGeom;
}
Py::Object CosmeticEdgePy::getRadius(void) const
{
double r = getCosmeticEdgePtr()->permaRadius;
return Py::asObject(PyFloat_FromDouble(r));
}
void CosmeticEdgePy::setRadius(Py::Object arg)
{
//TODO: check if the edge has a radius attrib
PyObject* p = arg.ptr();
double r;
if (PyObject_TypeCheck(p, &PyFloat_Type)) {
r = PyFloat_AsDouble(p);
}
else if (PyObject_TypeCheck(p, &PyLong_Type)) {
r = (double) PyLong_AsLong(p);
}
else {
std::string error = std::string("type must be 'Float' or 'Int', not ");
error += p->ob_type->tp_name;
throw Py::TypeError(error);
}
getCosmeticEdgePtr()->permaRadius = r;
auto oldGeom = getCosmeticEdgePtr()->m_geometry;
getCosmeticEdgePtr()->m_geometry = new TechDraw::Circle(getCosmeticEdgePtr()->permaStart, r);
delete oldGeom;
}
Py::Object CosmeticEdgePy::getCenter(void) const
{
Base::Vector3d point = getCosmeticEdgePtr()->permaStart;
return Py::asObject(new Base::VectorPy(point));
}
void CosmeticEdgePy::setCenter(Py::Object arg)
{
PyObject* p = arg.ptr();
Base::Vector3d pNew;
if (PyObject_TypeCheck(p, &(Base::VectorPy::Type))) {
pNew = static_cast<Base::VectorPy*>(p)->value();
}
else if (PyObject_TypeCheck(p, &PyTuple_Type)) {
pNew = Base::getVectorFromTuple<double>(p);
}
else {
std::string error = std::string("type must be 'Vector', not ");
error += p->ob_type->tp_name;
throw Py::TypeError(error);
}
pNew = DrawUtil::invertY(pNew);
auto oldGeom = getCosmeticEdgePtr()->m_geometry;
TechDraw::Circle* oldCircle = dynamic_cast<TechDraw::Circle*>(oldGeom);
getCosmeticEdgePtr()->permaStart = pNew;
getCosmeticEdgePtr()->permaEnd = pNew;
getCosmeticEdgePtr()->permaRadius = oldCircle->radius;
getCosmeticEdgePtr()->m_geometry = new TechDraw::Circle(getCosmeticEdgePtr()->permaStart, oldCircle->radius);
delete oldGeom;
}
PyObject *CosmeticEdgePy::getCustomAttributes(const char* /*attr*/) const
{

33
src/Mod/TechDraw/App/DrawViewPartPyImp.cpp
View File

@@ -348,8 +348,8 @@ PyObject* DrawViewPartPy::makeCosmeticCircle(PyObject *args)
{
PyObject* pPnt1 = nullptr;
double radius = 5.0;
double angle1 = 0.0;
double angle2 = 360.0;
// double angle1 = 0.0;
// double angle2 = 360.0;
int style = LineFormat::getDefEdgeStyle();
double weight = LineFormat::getDefEdgeWidth();
App::Color defCol = LineFormat::getDefEdgeColor();
@@ -364,22 +364,13 @@ PyObject* DrawViewPartPy::makeCosmeticCircle(PyObject *args)
DrawViewPart* dvp = getDrawViewPartPtr();
Base::Vector3d pnt1 = DrawUtil::invertY(static_cast<Base::VectorPy*>(pPnt1)->value());
gp_Pnt loc(pnt1.x, pnt1.y, pnt1.z);
gp_Dir dir(0,0,1);
gp_Ax1 axis(loc, dir);
gp_Circ circle;
circle.SetAxis(axis);
circle.SetRadius(radius);
Handle(Geom_Circle) hCircle = new Geom_Circle (circle);
BRepBuilderAPI_MakeEdge aMakeEdge(hCircle, angle1*(M_PI/180), angle2*(M_PI/180));
TopoDS_Edge edge = aMakeEdge.Edge();
TechDraw::BaseGeom* bg = TechDraw::BaseGeom::baseFactory(edge);
TechDraw::BaseGeom* bg = new TechDraw::Circle(pnt1, radius);
std::string newTag = dvp->addCosmeticEdge(bg);
TechDraw::CosmeticEdge* ce = dvp->getCosmeticEdge(newTag);
if (ce != nullptr) {
ce->permaStart = pnt1;
ce->permaEnd = pnt1;
ce->permaRadius = radius;
ce->m_format.m_style = style;
ce->m_format.m_weight = weight;
if (pColor == nullptr) {
@@ -418,25 +409,13 @@ PyObject* DrawViewPartPy::makeCosmeticCircleArc(PyObject *args)
//from here on is almost duplicate of makeCosmeticCircle
DrawViewPart* dvp = getDrawViewPartPtr();
Base::Vector3d pnt1 = DrawUtil::invertY(static_cast<Base::VectorPy*>(pPnt1)->value());
gp_Pnt loc(pnt1.x, pnt1.y, pnt1.z);
gp_Dir dir(0,0,1);
gp_Ax1 axis(loc, dir);
gp_Circ circle;
circle.SetAxis(axis);
circle.SetRadius(radius); //full circle @ right loc
Handle(Geom_Circle) hCircle = new Geom_Circle (circle);
BRepBuilderAPI_MakeEdge aMakeEdge(hCircle, -angle2*(M_PI/180), -angle1*(M_PI/180)); //hack!
// right result, but ugly:
// Qt angles are cw, OCC angles are CCW
// Qt -y is up, OCC -y is down
TopoDS_Edge edge = aMakeEdge.Edge();
TechDraw::BaseGeom* bg = TechDraw::BaseGeom::baseFactory(edge);
TechDraw::BaseGeom* bg = new TechDraw::AOC(pnt1, radius, angle1, angle2);
std::string newTag = dvp->addCosmeticEdge(bg);
TechDraw::CosmeticEdge* ce = dvp->getCosmeticEdge(newTag);
if (ce != nullptr) {
ce->permaStart = pnt1;
ce->permaEnd = pnt1;
ce->permaRadius = radius;
ce->m_format.m_style = style;
ce->m_format.m_weight = weight;
if (pColor == nullptr) {

85
src/Mod/TechDraw/App/Geometry.cpp
View File

@@ -38,6 +38,7 @@
#include <Precision.hxx>
#include <GCPnts_AbscissaPoint.hxx>
#include <gce_MakeCirc.hxx>
#include <GC_MakeEllipse.hxx>
#include <GC_MakeArcOfCircle.hxx>
#include <gp_Lin.hxx>
#include <gp_Circ.hxx>
@@ -584,6 +585,25 @@ Ellipse::Ellipse(const TopoDS_Edge &e)
angle = xaxis.AngleWithRef(gp_Dir(1, 0, 0), gp_Dir(0, 0, -1));
}
Ellipse::Ellipse(Base::Vector3d c, double mnr, double mjr)
{
geomType = ELLIPSE;
center = c;
major = mjr;
minor = mnr;
angle = 0;
GC_MakeEllipse me(gp_Ax2(gp_Pnt(c.x,c.y,c.z), gp_Dir(0.0,0.0,1.0)),
major, minor);
if (!me.IsDone()) {
Base::Console().Message("G:Ellipse - failed to make Ellipse\n");
}
const Handle(Geom_Ellipse) gEllipse = me.Value();
BRepBuilderAPI_MakeEdge mkEdge(gEllipse, 0.0, 2 * M_PI);
if (mkEdge.IsDone()) {
occEdge = mkEdge.Edge();
}
}
AOE::AOE(const TopoDS_Edge &e) : Ellipse(e)
{
@@ -629,6 +649,27 @@ Circle::Circle(void)
center = Base::Vector3d(0.0, 0.0, 0.0);
}
Circle::Circle(Base::Vector3d c, double r)
{
geomType = CIRCLE;
radius = r;
center = c;
gp_Pnt loc(c.x, c.y, c.z);
gp_Dir dir(0,0,1);
gp_Ax1 axis(loc, dir);
gp_Circ circle;
circle.SetAxis(axis);
circle.SetRadius(r);
double angle1 = 0.0;
double angle2 = 360.0;
Handle(Geom_Circle) hCircle = new Geom_Circle (circle);
BRepBuilderAPI_MakeEdge aMakeEdge(hCircle, angle1*(M_PI/180), angle2*(M_PI/180));
TopoDS_Edge edge = aMakeEdge.Edge();
occEdge = edge;
}
Circle::Circle(const TopoDS_Edge &e)
{
geomType = CIRCLE; //center, radius
@@ -706,6 +747,50 @@ AOC::AOC(const TopoDS_Edge &e) : Circle(e)
}
}
AOC::AOC(Base::Vector3d c, double r, double sAng, double eAng) : Circle()
{
geomType = ARCOFCIRCLE;
radius = r;
center = c;
gp_Pnt loc(c.x, c.y, c.z);
gp_Dir dir(0,0,1);
gp_Ax1 axis(loc, dir);
gp_Circ circle;
circle.SetAxis(axis);
circle.SetRadius(r);
Handle(Geom_Circle) hCircle = new Geom_Circle (circle);
BRepBuilderAPI_MakeEdge aMakeEdge(hCircle, sAng*(M_PI/180), eAng*(M_PI/180));
TopoDS_Edge edge = aMakeEdge.Edge();
occEdge = edge;
BRepAdaptor_Curve adp(edge);
double f = adp.FirstParameter();
double l = adp.LastParameter();
gp_Pnt s = adp.Value(f);
gp_Pnt m = adp.Value((l+f)/2.0);
gp_Pnt ePt = adp.Value(l); //if start == end, it isn't an arc!
gp_Vec v1(m,s); //vector mid to start
gp_Vec v2(m,ePt); //vector mid to end
gp_Vec v3(0,0,1); //stdZ
double a = v3.DotCross(v1,v2); //error if v1 = v2?
startAngle = fmod(f,2.0*M_PI);
endAngle = fmod(l,2.0*M_PI);
cw = (a < 0) ? true: false;
largeArc = (fabs(l-f) > M_PI) ? true : false;
startPnt = Base::Vector3d(s.X(), s.Y(), s.Z());
endPnt = Base::Vector3d(ePt.X(), ePt.Y(), s.Z());
midPnt = Base::Vector3d(m.X(), m.Y(), s.Z());
if (edge.Orientation() == TopAbs_REVERSED) {
reversed = true;
}
}
AOC::AOC(void) : Circle()
{
geomType = ARCOFCIRCLE;

7
src/Mod/TechDraw/App/Geometry.h
View File

@@ -133,8 +133,9 @@ typedef std::vector<BaseGeom *> BaseGeomPtrVector; //obs?
class TechDrawExport Circle: public BaseGeom
{
public:
Circle(const TopoDS_Edge &e);
Circle(void);
Circle(const TopoDS_Edge &e);
Circle(Base::Vector3d center, double radius);
~Circle() = default;
public:
@@ -150,7 +151,8 @@ class TechDrawExport Circle: public BaseGeom
class TechDrawExport Ellipse: public BaseGeom
{
public:
Ellipse(const TopoDS_Edge &e);
Ellipse(const TopoDS_Edge &e);
Ellipse(Base::Vector3d c, double mnr, double mjr);
~Ellipse() = default;
public:
@@ -188,6 +190,7 @@ class TechDrawExport AOC: public Circle
{
public:
AOC(const TopoDS_Edge &e);
AOC(Base::Vector3d c, double r, double s, double e);
AOC(void);
~AOC() = default;