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

Merge pull request #14176 from mosfet80/cleanmodPart

Browse Source 
[mod:part] clean code
This commit is contained in:
Chris Hennes
2025-03-17 11:13:19 -05:00
committed by GitHub
parent d2a55a0f17 6f40ad5325
commit b2862ceaba
1 changed files with 5 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/Mod/Sketcher/App/SketchObject.cpp
View File

@@ -324,7 +324,6 @@ static bool inline checkSmallEdge(const Part::TopoShape &s) {
}
void SketchObject::buildShape() {
// Shape.setValue(solvedSketch.toShape());
// We use the following instead to map element names
std::vector<Part::TopoShape> shapes;
@@ -4521,7 +4520,6 @@ bool SketchObject::isExternalAllowed(App::Document* pDoc, App::DocumentObject* p
// Note: Checking for the body of the support doesn't work when the support are the three base
// planes
// App::DocumentObject *support = this->AttachmentSupport.getValue();
Part::BodyBase* body_this = Part::BodyBase::findBodyOf(this);
Part::BodyBase* body_obj = Part::BodyBase::findBodyOf(pObj);
App::Part* part_this = App::Part::getPartOfObject(this);
@@ -4594,7 +4592,6 @@ bool SketchObject::isCarbonCopyAllowed(App::Document* pDoc, App::DocumentObject*
// Note: Checking for the body of the support doesn't work when the support are the three base
// planes
// App::DocumentObject *support = this->AttachmentSupport.getValue();
Part::BodyBase* body_this = Part::BodyBase::findBodyOf(this);
Part::BodyBase* body_obj = Part::BodyBase::findBodyOf(pObj);
App::Part* part_this = App::Part::getPartOfObject(this);
@@ -4685,8 +4682,7 @@ bool SketchObject::isCarbonCopyAllowed(App::Document* pDoc, App::DocumentObject*
}
int SketchObject::addSymmetric(const std::vector<int>& geoIdList, int refGeoId,
Sketcher::PointPos refPosId /*=Sketcher::PointPos::none*/,
bool addSymmetryConstraints /*= false*/)
Sketcher::PointPos refPosId , bool addSymmetryConstraints )
{
// no need to check input data validity as this is an sketchobject managed operation.
Base::StateLocker lock(managedoperation, true);
@@ -4728,7 +4724,7 @@ int SketchObject::addSymmetric(const std::vector<int>& geoIdList, int refGeoId,
continue;
}
if (constr->Second == GeoEnum::GeoUndef /*&& constr->Third == GeoEnum::GeoUndef*/) {
if (constr->Second == GeoEnum::GeoUndef ){
if (refIsAxisAligned) {
// in this case we want to keep the Vertical, Horizontal constraints
// DistanceX ,and DistanceY constraints should also be possible to keep in
@@ -5246,8 +5242,6 @@ std::vector<Part::Geometry*> SketchObject::getSymmetric(const std::vector<int>&
else if (geosym->is<Part::GeomArcOfParabola>()) {
auto* geosymaoe = static_cast<Part::GeomArcOfParabola*>(geosym);
Base::Vector3d cp = geosymaoe->getCenter();
/*double df= geosymaoe->getFocal();*/
Base::Vector3d f1 = geosymaoe->getFocus();
Base::Vector3d sf1 = f1 + 2.0 * (refpoint - f1);
@@ -5291,9 +5285,8 @@ std::vector<Part::Geometry*> SketchObject::getSymmetric(const std::vector<int>&
}
int SketchObject::addCopy(const std::vector<int>& geoIdList, const Base::Vector3d& displacement,
bool moveonly /*=false*/, bool clone /*=false*/, int csize /*=2*/,
int rsize /*=1*/, bool constraindisplacement /*= false*/,
double perpscale /*= 1.0*/)
bool moveonly , bool clone , int csize , int rsize , bool constraindisplacement ,
double perpscale )
{
// no need to check input data validity as this is an sketchobject managed operation.
Base::StateLocker lock(managedoperation, true);
@@ -8539,7 +8532,6 @@ void processEdge2(TopoDS_Edge& projEdge, std::vector<std::unique_ptr<Part::Geome
gp_Pnt P1 = projCurve.Value(projCurve.FirstParameter());
gp_Pnt P2 = projCurve.Value(projCurve.LastParameter());
// gp_Dir normal = e.Axis().Direction();
gp_Dir normal = gp_Dir(0, 0, 1);
gp_Ax2 xdirref(p, normal);
@@ -9075,10 +9067,6 @@ std::vector<TopoDS_Shape> projectShape(const TopoDS_Shape& inShape, const gp_Ax3
res.push_back(hlrToShape.Rg1LineVCompound());
}
/*if (!hlrToShape.RgNLineVCompound().IsNull()) {
res.push_back(hlrToShape.RgNLineVCompound());
}*/ // we don't need the seams.
if (!hlrToShape.OutLineVCompound().IsNull()) {
res.push_back(hlrToShape.OutLineVCompound());
}
@@ -9095,10 +9083,6 @@ std::vector<TopoDS_Shape> projectShape(const TopoDS_Shape& inShape, const gp_Ax3
res.push_back(hlrToShape.Rg1LineHCompound());
}
/*if (!hlrToShape.RgNLineHCompound().IsNull()) {
res.push_back(hlrToShape.RgNLineHCompound());
}*/
if (!hlrToShape.OutLineHCompound().IsNull()) {
res.push_back(hlrToShape.OutLineHCompound());
}
@@ -11224,7 +11208,7 @@ int SketchObject::port_reversedExternalArcs(bool justAnalyze)
// no need to check input data validity as this is an sketchobject managed operation.
Base::StateLocker lock(managedoperation, true);
int cntToBeAffected = 0;//==cntSuccess+cntFail
int cntToBeAffected = 0;
const std::vector<Constraint*>& vals = this->Constraints.getValues();
std::vector<Constraint*> newVals(vals);// modifiable copy of pointers array
@@ -11253,7 +11237,6 @@ int SketchObject::port_reversedExternalArcs(bool justAnalyze)
if (geoId <= GeoEnum::RefExt
&& (posId == Sketcher::PointPos::start || posId == Sketcher::PointPos::end)) {
// we are dealing with a link to an endpoint of external geom
// Part::Geometry* g = this->ExternalGeo[-geoId - 1];
Part::Geometry* g = this->ExternalGeo[-geoId - 1];
if (g->is<Part::GeomArcOfCircle>()) {
const Part::GeomArcOfCircle* segm =