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

[TD]Lint/Tidy/Review comments applied

Browse Source
This commit is contained in:
wandererfan
2023-03-22 14:35:54 -04:00
committed by WandererFan
parent 68d739b061
commit 85216bd127
8 changed files with 43 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/Mod/TechDraw/App/DimensionReferences.cpp
View File

@@ -49,24 +49,26 @@ TopoDS_Shape ReferenceEntry::getGeometry() const
{
// Base::Console().Message("RE::getGeometry()\n");
if ( getObject()->isDerivedFrom(TechDraw::DrawViewPart::getClassTypeId()) ) {
TechDraw::DrawViewPart* dvp = static_cast<TechDraw::DrawViewPart*>(getObject());
auto dvp = static_cast<TechDraw::DrawViewPart*>(getObject());
std::string gType = geomType();
if (gType == "Vertex") {
auto vgeom = dvp->getVertex(getSubName());
return vgeom->getOCCVertex();
} else if (gType == "Edge") {
}
if (gType == "Edge") {
auto egeom = dvp->getEdge(getSubName());
return egeom->getOCCEdge();
} else if (gType == "Face") {
}
if (gType == "Face") {
auto fgeom = dvp->getFace(getSubName());
return fgeom->toOccFace();
}
//Base::Console().Message("RE::getGeometry - returns null shape! - gType: %s\n", gType.c_str());
return TopoDS_Shape();
return {};
}
Part::TopoShape shape = Part::Feature::getTopoShape(getObject());
App::GeoFeature* geoFeat = dynamic_cast<App::GeoFeature*>(getObject());
auto geoFeat = dynamic_cast<App::GeoFeature*>(getObject());
if (geoFeat) {
shape.setPlacement(geoFeat->globalPlacement());
}
@@ -102,7 +104,7 @@ App::DocumentObject* ReferenceEntry::getObject() const
return m_object;
}
Part::TopoShape ReferenceEntry::asTopoShape()
Part::TopoShape ReferenceEntry::asTopoShape() const
{
// Base::Console().Message("RE::asTopoShape()\n");
TopoDS_Shape geom = getGeometry();
@@ -110,37 +112,36 @@ Part::TopoShape ReferenceEntry::asTopoShape()
if (geom.ShapeType() == TopAbs_VERTEX) {
TopoDS_Vertex vert = TopoDS::Vertex(geom);
return asTopoShapeVertex(vert);
} else if (geom.ShapeType() == TopAbs_EDGE) {
}
if (geom.ShapeType() == TopAbs_EDGE) {
TopoDS_Edge edge = TopoDS::Edge(geom);
return asTopoShapeEdge(edge);
} else {
throw Base::RuntimeError("Dimension Reference has unsupported geometry");
}
return Part::TopoShape();
throw Base::RuntimeError("Dimension Reference has unsupported geometry");
}
Part::TopoShape ReferenceEntry::asTopoShapeVertex(TopoDS_Vertex vert)
Part::TopoShape ReferenceEntry::asTopoShapeVertex(TopoDS_Vertex& vert) const
{
Base::Vector3d point = DU::toVector3d(BRep_Tool::Pnt(vert));
if (!is3d()) {
TechDraw::DrawViewPart* dvp = static_cast<TechDraw::DrawViewPart*>(getObject());
auto dvp = static_cast<TechDraw::DrawViewPart*>(getObject());
point = point / dvp->getScale();
}
BRepBuilderAPI_MakeVertex mkVert(DU::togp_Pnt(point));
return Part::TopoShape(mkVert.Vertex());
return { mkVert.Vertex() };
}
Part::TopoShape ReferenceEntry::asTopoShapeEdge(TopoDS_Edge edge)
Part::TopoShape ReferenceEntry::asTopoShapeEdge(TopoDS_Edge &edge) const
{
// Base::Console().Message("RE::asTopoShapeEdge()\n");
TopoDS_Edge unscaledEdge = edge;
if (!is3d()) {
// 2d reference - projected and scaled. scale might have changed, so we need to unscale
TechDraw::DrawViewPart* dvp = static_cast<TechDraw::DrawViewPart*>(getObject());
auto dvp = static_cast<TechDraw::DrawViewPart*>(getObject());
TopoDS_Shape unscaledShape = TechDraw::scaleShape(edge, 1.0 / dvp->getScale());
unscaledEdge = TopoDS::Edge(unscaledShape);
}
return Part::TopoShape(unscaledEdge);
return { unscaledEdge };
}
std::string ReferenceEntry::geomType() const
@@ -155,9 +156,6 @@ bool ReferenceEntry::isWholeObject() const
bool ReferenceEntry::is3d() const
{
if ( getObject()->isDerivedFrom(TechDraw::DrawViewPart::getClassTypeId()) ) {
return false;
}
return true;
return !getObject()->isDerivedFrom(TechDraw::DrawViewPart::getClassTypeId());
}