Sketch: [5/5] Fix up files after splitting SketchObject.cpp
Remove stale includes and make other adjustments for compilation.
This commit is contained in:
pjcreath
@@ -68,6 +68,10 @@ SET(Features_SRCS
|
||||
SolverGeometryExtension.h
|
||||
SketchObject.cpp
|
||||
SketchObject.h
|
||||
SketchObjectGeometry.cpp
|
||||
SketchObjectExternal.cpp
|
||||
SketchObjectConstraints.cpp
|
||||
SketchObjectOperations.cpp
|
||||
SketchAnalysis.h
|
||||
SketchAnalysis.cpp
|
||||
Analyse.h
|
||||
|
||||
@@ -23,85 +23,31 @@
|
||||
***************************************************************************/
|
||||
|
||||
#include <algorithm>
|
||||
#include <cmath>
|
||||
#include <cstddef>
|
||||
#include <limits>
|
||||
#include <vector>
|
||||
|
||||
#include <BRepAdaptor_Curve.hxx>
|
||||
#include <BRepAdaptor_Surface.hxx>
|
||||
#include <Mod/Part/App/FCBRepAlgoAPI_Section.h>
|
||||
#include <BRepBuilderAPI_MakeEdge.hxx>
|
||||
#include <BRepBuilderAPI_MakeFace.hxx>
|
||||
#include <BRepBuilderAPI_MakeVertex.hxx>
|
||||
#include <BRepMesh_IncrementalMesh.hxx>
|
||||
#include <BRepOffsetAPI_NormalProjection.hxx>
|
||||
#include <BRepTools_WireExplorer.hxx>
|
||||
#include <BRep_Tool.hxx>
|
||||
#include <ElCLib.hxx>
|
||||
#include <GCPnts_AbscissaPoint.hxx>
|
||||
#include <GC_MakeArcOfCircle.hxx>
|
||||
#include <GC_MakeCircle.hxx>
|
||||
#include <GeomAPI_ProjectPointOnCurve.hxx>
|
||||
#include <GeomAPI_ProjectPointOnSurf.hxx>
|
||||
#include <GeomConvert.hxx>
|
||||
#include <GeomConvert_BSplineCurveKnotSplitting.hxx>
|
||||
#include <GeomLProp_CLProps.hxx>
|
||||
#include <Geom_BSplineCurve.hxx>
|
||||
#include <Geom_Circle.hxx>
|
||||
#include <Geom_Ellipse.hxx>
|
||||
#include <Geom_Hyperbola.hxx>
|
||||
#include <Geom_Line.hxx>
|
||||
#include <Geom_Parabola.hxx>
|
||||
#include <Geom_Plane.hxx>
|
||||
#include <Geom_TrimmedCurve.hxx>
|
||||
#include <Standard_Version.hxx>
|
||||
#include <TColStd_Array1OfInteger.hxx>
|
||||
#include <TopExp.hxx>
|
||||
#include <TopExp_Explorer.hxx>
|
||||
#include <TopTools_IndexedMapOfShape.hxx>
|
||||
#include <TopoDS.hxx>
|
||||
#include <TopoDS_Edge.hxx>
|
||||
#include <TopoDS_Face.hxx>
|
||||
#include <TopoDS_Shape.hxx>
|
||||
#include <gp_Ax3.hxx>
|
||||
#include <gp_Circ.hxx>
|
||||
#include <gp_Elips.hxx>
|
||||
#include <gp_Hypr.hxx>
|
||||
#include <gp_Parab.hxx>
|
||||
#include <gp_Pln.hxx>
|
||||
|
||||
#include <boost/algorithm/string.hpp>
|
||||
#include <boost/algorithm/string/predicate.hpp>
|
||||
#include <boost/geometry/geometries/register/point.hpp>
|
||||
#include <boost/iostreams/device/array.hpp>
|
||||
#include <boost/iostreams/stream.hpp>
|
||||
#include <boost/range/adaptor/map.hpp>
|
||||
#include <boost/geometry.hpp>
|
||||
|
||||
#include <HLRAlgo_Projector.hxx>
|
||||
#include <HLRBRep_Algo.hxx>
|
||||
#include <HLRBRep_HLRToShape.hxx>
|
||||
|
||||
#include <App/Application.h>
|
||||
#include <App/Document.h>
|
||||
#include <App/ElementNamingUtils.h>
|
||||
#include <App/Expression.h>
|
||||
#include <App/ExpressionParser.h>
|
||||
#include <App/FeaturePythonPyImp.h>
|
||||
#include <App/IndexedName.h>
|
||||
#include <App/MappedName.h>
|
||||
#include <App/ObjectIdentifier.h>
|
||||
#include <App/Datums.h>
|
||||
#include <App/Part.h>
|
||||
#include <Base/Console.h>
|
||||
#include <Base/Reader.h>
|
||||
#include <Base/Tools.h>
|
||||
#include <Base/Vector3D.h>
|
||||
#include <Base/Writer.h>
|
||||
#include <Mod/Part/App/BodyBase.h>
|
||||
#include <Mod/Part/App/PartPyCXX.h>
|
||||
#include <Mod/Part/App/DatumFeature.h>
|
||||
#include <Mod/Part/App/GeometryMigrationExtension.h>
|
||||
#include <Mod/Part/App/TopoShapeOpCode.h>
|
||||
#include <Mod/Part/App/WireJoiner.h>
|
||||
@@ -111,10 +57,7 @@
|
||||
#include "GeoEnum.h"
|
||||
#include "SketchObject.h"
|
||||
#include "SketchObjectPy.h"
|
||||
#include "SketchGeometry.h"
|
||||
#include "SolverGeometryExtension.h"
|
||||
#include "ExternalGeometryFacade.h"
|
||||
#include <Mod/Part/App/Datums.h>
|
||||
|
||||
|
||||
#undef DEBUG
|
||||
@@ -711,6 +654,7 @@ void SketchObject::generateId(const Part::Geometry* geo)
|
||||
FC_TRACE("found " << found.front());
|
||||
preReturn(found.front());
|
||||
}
|
||||
// clang-format off
|
||||
|
||||
int SketchObject::setTextAndFont(int ConstrId, std::string& newText, std::string& newFont, bool isHeight, bool isConstruction)
|
||||
{
|
||||
@@ -842,10 +786,6 @@ int SketchObject::setGeometry(int GeoId, const Part::Geometry *geo) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
namespace {
|
||||
|
||||
} // anonymous namespace
|
||||
|
||||
bool SketchObject::evaluateSupport()
|
||||
{
|
||||
// returns false if the shape is broken, null or non-planar
|
||||
@@ -855,10 +795,6 @@ bool SketchObject::evaluateSupport()
|
||||
return true;
|
||||
}
|
||||
|
||||
namespace {
|
||||
|
||||
}
|
||||
|
||||
bool SketchObject::isInGroup(int geoId, bool includeHandle) const
|
||||
{
|
||||
const std::vector<Sketcher::Constraint*>& vals = Constraints.getValues();
|
||||
@@ -1637,6 +1573,7 @@ void SketchObject::migrateSketch()
|
||||
)
|
||||
);
|
||||
}
|
||||
// clang-format off
|
||||
|
||||
App::DocumentObject *SketchObject::getSubObject(
|
||||
const char *subname, PyObject **pyObj,
|
||||
|
||||
@@ -24,97 +24,22 @@
|
||||
|
||||
#include <algorithm>
|
||||
#include <cmath>
|
||||
#include <cstddef>
|
||||
#include <limits>
|
||||
#include <vector>
|
||||
|
||||
#include <BRepAdaptor_Curve.hxx>
|
||||
#include <BRepAdaptor_Surface.hxx>
|
||||
#include <Mod/Part/App/FCBRepAlgoAPI_Section.h>
|
||||
#include <BRepBuilderAPI_MakeEdge.hxx>
|
||||
#include <BRepBuilderAPI_MakeFace.hxx>
|
||||
#include <BRepBuilderAPI_MakeVertex.hxx>
|
||||
#include <BRepMesh_IncrementalMesh.hxx>
|
||||
#include <BRepOffsetAPI_NormalProjection.hxx>
|
||||
#include <BRepTools_WireExplorer.hxx>
|
||||
#include <BRep_Tool.hxx>
|
||||
#include <ElCLib.hxx>
|
||||
#include <GCPnts_AbscissaPoint.hxx>
|
||||
#include <GC_MakeArcOfCircle.hxx>
|
||||
#include <GC_MakeCircle.hxx>
|
||||
#include <GeomAPI_ProjectPointOnCurve.hxx>
|
||||
#include <GeomAPI_ProjectPointOnSurf.hxx>
|
||||
#include <GeomConvert.hxx>
|
||||
#include <GeomConvert_BSplineCurveKnotSplitting.hxx>
|
||||
#include <GeomLProp_CLProps.hxx>
|
||||
#include <Geom_BSplineCurve.hxx>
|
||||
#include <Geom_Circle.hxx>
|
||||
#include <Geom_Ellipse.hxx>
|
||||
#include <Geom_Hyperbola.hxx>
|
||||
#include <Geom_Line.hxx>
|
||||
#include <Geom_Parabola.hxx>
|
||||
#include <Geom_Plane.hxx>
|
||||
#include <Geom_TrimmedCurve.hxx>
|
||||
#include <Standard_Version.hxx>
|
||||
#include <TColStd_Array1OfInteger.hxx>
|
||||
#include <TopExp.hxx>
|
||||
#include <TopExp_Explorer.hxx>
|
||||
#include <TopTools_IndexedMapOfShape.hxx>
|
||||
#include <TopoDS.hxx>
|
||||
#include <TopoDS_Edge.hxx>
|
||||
#include <TopoDS_Face.hxx>
|
||||
#include <TopoDS_Shape.hxx>
|
||||
#include <gp_Ax3.hxx>
|
||||
#include <gp_Circ.hxx>
|
||||
#include <gp_Elips.hxx>
|
||||
#include <gp_Hypr.hxx>
|
||||
#include <gp_Parab.hxx>
|
||||
#include <gp_Pln.hxx>
|
||||
|
||||
#include <boost/algorithm/string.hpp>
|
||||
#include <boost/algorithm/string/predicate.hpp>
|
||||
#include <boost/geometry/geometries/register/point.hpp>
|
||||
#include <boost/iostreams/device/array.hpp>
|
||||
#include <boost/iostreams/stream.hpp>
|
||||
#include <boost/range/adaptor/map.hpp>
|
||||
#include <boost/geometry.hpp>
|
||||
|
||||
#include <HLRAlgo_Projector.hxx>
|
||||
#include <HLRBRep_Algo.hxx>
|
||||
#include <HLRBRep_HLRToShape.hxx>
|
||||
#include <QCoreApplication>
|
||||
|
||||
#include <App/Application.h>
|
||||
#include <App/Document.h>
|
||||
#include <App/ElementNamingUtils.h>
|
||||
#include <App/Expression.h>
|
||||
#include <App/ExpressionParser.h>
|
||||
#include <App/FeaturePythonPyImp.h>
|
||||
#include <App/IndexedName.h>
|
||||
#include <App/MappedName.h>
|
||||
#include <App/ObjectIdentifier.h>
|
||||
#include <App/Datums.h>
|
||||
#include <App/Part.h>
|
||||
#include <Base/Console.h>
|
||||
#include <Base/Reader.h>
|
||||
#include <Base/Tools.h>
|
||||
#include <Base/Vector3D.h>
|
||||
#include <Base/Writer.h>
|
||||
#include <Mod/Part/App/BodyBase.h>
|
||||
#include <Mod/Part/App/PartPyCXX.h>
|
||||
#include <Mod/Part/App/DatumFeature.h>
|
||||
#include <Mod/Part/App/GeometryMigrationExtension.h>
|
||||
#include <Mod/Part/App/TopoShapeOpCode.h>
|
||||
#include <Mod/Part/App/WireJoiner.h>
|
||||
|
||||
#include <memory>
|
||||
|
||||
#include "GeoEnum.h"
|
||||
#include "SketchObject.h"
|
||||
#include "SketchObjectPy.h"
|
||||
#include "SketchGeometry.h"
|
||||
#include "SolverGeometryExtension.h"
|
||||
#include "ExternalGeometryFacade.h"
|
||||
#include <Mod/Part/App/Datums.h>
|
||||
|
||||
|
||||
#undef DEBUG
|
||||
@@ -123,11 +48,8 @@
|
||||
// clang-format off
|
||||
using namespace Sketcher;
|
||||
using namespace Base;
|
||||
namespace sp = std::placeholders;
|
||||
namespace bio = boost::iostreams;
|
||||
|
||||
namespace bg = boost::geometry;
|
||||
namespace bgi = boost::geometry::index;
|
||||
FC_LOG_LEVEL_INIT("Sketch", true, true)
|
||||
|
||||
int SketchObject::hasConflicts() const
|
||||
{
|
||||
@@ -260,7 +182,6 @@ int SketchObject::solve(bool updateGeoAfterSolving /*=true*/)
|
||||
|
||||
return err;
|
||||
}
|
||||
// clang-format off
|
||||
|
||||
int SketchObject::setDatum(int ConstrId, double Datum)
|
||||
{
|
||||
@@ -894,7 +815,6 @@ int SketchObject::deleteAllConstraints(DeleteOptions options)
|
||||
|
||||
return 0;
|
||||
}
|
||||
// clang-format off
|
||||
|
||||
void SketchObject::addGeometryState(const Constraint* cstr) const
|
||||
{
|
||||
@@ -1452,6 +1372,7 @@ int SketchObject::transferConstraints(
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
// clang-format off
|
||||
|
||||
std::unique_ptr<Constraint> SketchObject::createConstraint(
|
||||
Sketcher::ConstraintType constrType, int firstGeoId, Sketcher::PointPos firstPos,
|
||||
@@ -1538,6 +1459,7 @@ void SketchObject::changeConstraintAfterDeletingGeo(Constraint* constr,
|
||||
}
|
||||
}
|
||||
|
||||
// clang-format on
|
||||
std::optional<size_t> findPieceContainingPoint(
|
||||
const SketchObject* obj,
|
||||
const Part::Geometry* geo,
|
||||
@@ -2794,3 +2716,4 @@ int SketchObject::renameConstraint(int GeoId, std::string name)
|
||||
}
|
||||
return -1;
|
||||
}
|
||||
// clang-format on
|
||||
|
||||
@@ -24,9 +24,6 @@
|
||||
|
||||
#include <algorithm>
|
||||
#include <cmath>
|
||||
#include <cstddef>
|
||||
#include <limits>
|
||||
#include <vector>
|
||||
|
||||
#include <BRepAdaptor_Curve.hxx>
|
||||
#include <BRepAdaptor_Surface.hxx>
|
||||
@@ -34,14 +31,11 @@
|
||||
#include <BRepBuilderAPI_MakeEdge.hxx>
|
||||
#include <BRepBuilderAPI_MakeFace.hxx>
|
||||
#include <BRepBuilderAPI_MakeVertex.hxx>
|
||||
#include <BRepMesh_IncrementalMesh.hxx>
|
||||
#include <BRepOffsetAPI_NormalProjection.hxx>
|
||||
#include <BRepTools_WireExplorer.hxx>
|
||||
#include <BRep_Tool.hxx>
|
||||
#include <ElCLib.hxx>
|
||||
#include <GCPnts_AbscissaPoint.hxx>
|
||||
#include <GC_MakeArcOfCircle.hxx>
|
||||
#include <GC_MakeCircle.hxx>
|
||||
#include <GeomAPI_ProjectPointOnCurve.hxx>
|
||||
#include <GeomAPI_ProjectPointOnSurf.hxx>
|
||||
#include <GeomConvert.hxx>
|
||||
@@ -55,11 +49,8 @@
|
||||
#include <Geom_Parabola.hxx>
|
||||
#include <Geom_Plane.hxx>
|
||||
#include <Geom_TrimmedCurve.hxx>
|
||||
#include <Standard_Version.hxx>
|
||||
#include <TColStd_Array1OfInteger.hxx>
|
||||
#include <TopExp.hxx>
|
||||
#include <TopExp_Explorer.hxx>
|
||||
#include <TopTools_IndexedMapOfShape.hxx>
|
||||
#include <TopoDS.hxx>
|
||||
#include <TopoDS_Edge.hxx>
|
||||
#include <TopoDS_Face.hxx>
|
||||
@@ -71,48 +62,31 @@
|
||||
#include <gp_Parab.hxx>
|
||||
#include <gp_Pln.hxx>
|
||||
|
||||
#include <boost/algorithm/string.hpp>
|
||||
#include <boost/algorithm/string/predicate.hpp>
|
||||
#include <boost/geometry/geometries/register/point.hpp>
|
||||
#include <boost/iostreams/device/array.hpp>
|
||||
#include <boost/iostreams/stream.hpp>
|
||||
#include <boost/range/adaptor/map.hpp>
|
||||
#include <boost/geometry.hpp>
|
||||
|
||||
#include <HLRAlgo_Projector.hxx>
|
||||
#include <HLRBRep_Algo.hxx>
|
||||
#include <HLRBRep_HLRToShape.hxx>
|
||||
|
||||
#include <App/Application.h>
|
||||
#include <App/Document.h>
|
||||
#include <App/ElementNamingUtils.h>
|
||||
#include <App/Expression.h>
|
||||
#include <App/ExpressionParser.h>
|
||||
#include <App/FeaturePythonPyImp.h>
|
||||
#include <App/IndexedName.h>
|
||||
#include <App/MappedName.h>
|
||||
#include <App/ObjectIdentifier.h>
|
||||
#include <App/Datums.h>
|
||||
#include <App/Part.h>
|
||||
#include <Base/Console.h>
|
||||
#include <Base/Reader.h>
|
||||
#include <Base/Tools.h>
|
||||
#include <Base/Vector3D.h>
|
||||
#include <Base/Writer.h>
|
||||
#include <Mod/Part/App/BodyBase.h>
|
||||
#include <Mod/Part/App/PartPyCXX.h>
|
||||
#include <Mod/Part/App/DatumFeature.h>
|
||||
#include <Mod/Part/App/GeometryMigrationExtension.h>
|
||||
#include <Mod/Part/App/TopoShapeOpCode.h>
|
||||
#include <Mod/Part/App/WireJoiner.h>
|
||||
|
||||
#include <memory>
|
||||
|
||||
#include "GeoEnum.h"
|
||||
#include "SketchObject.h"
|
||||
#include "SketchObjectPy.h"
|
||||
#include "SketchGeometry.h"
|
||||
#include "SolverGeometryExtension.h"
|
||||
#include "ExternalGeometryFacade.h"
|
||||
#include <Mod/Part/App/Datums.h>
|
||||
|
||||
@@ -123,11 +97,8 @@
|
||||
// clang-format off
|
||||
using namespace Sketcher;
|
||||
using namespace Base;
|
||||
namespace sp = std::placeholders;
|
||||
namespace bio = boost::iostreams;
|
||||
|
||||
namespace bg = boost::geometry;
|
||||
namespace bgi = boost::geometry::index;
|
||||
FC_LOG_LEVEL_INIT("Sketch", true, true)
|
||||
|
||||
void SketchObject::initExternalGeo() {
|
||||
std::vector<Part::Geometry *> geos;
|
||||
@@ -399,6 +370,7 @@ bool SketchObject::isCarbonCopyAllowed(App::Document* pDoc, App::DocumentObject*
|
||||
return true;
|
||||
}
|
||||
|
||||
// clang-format on
|
||||
int SketchObject::carbonCopy(App::DocumentObject* pObj, bool construction)
|
||||
{
|
||||
using std::numbers::pi;
|
||||
@@ -1017,9 +989,7 @@ void SketchObject::delExternalPrivate(const std::set<long>& ids, bool removeRef)
|
||||
Constraints.setValues(std::move(newConstraints));
|
||||
acceptGeometry(); // This may need to be refactored into OnChanged for ExternalGeometry.
|
||||
}
|
||||
// clang-format off
|
||||
|
||||
// clang-format on
|
||||
int SketchObject::delAllExternal()
|
||||
{
|
||||
int count = 0; // the remaining count of the detached external geometry
|
||||
@@ -1302,7 +1272,8 @@ Part::Geometry* projectLine(const BRepAdaptor_Curve& curve, const Handle(Geom_Pl
|
||||
return line;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
} // anonymous namespace
|
||||
|
||||
static Part::Geometry *fitArcs(std::vector<std::unique_ptr<Part::Geometry> > &arcs,
|
||||
const gp_Pnt &P1,
|
||||
@@ -2317,7 +2288,8 @@ void processFace (const Rotation& invRot,
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
} // anonymous namespace
|
||||
|
||||
void SketchObject::rebuildExternalGeometry(std::optional<ExternalToAdd> extToAdd)
|
||||
{
|
||||
@@ -2974,3 +2946,4 @@ std::string SketchObject::getGeometryReference(int GeoId) const {
|
||||
}
|
||||
return ref;
|
||||
}
|
||||
// clang-format on
|
||||
|
||||
@@ -24,97 +24,27 @@
|
||||
|
||||
#include <algorithm>
|
||||
#include <cmath>
|
||||
#include <cstddef>
|
||||
#include <limits>
|
||||
#include <vector>
|
||||
|
||||
#include <BRepAdaptor_Curve.hxx>
|
||||
#include <BRepAdaptor_Surface.hxx>
|
||||
#include <Mod/Part/App/FCBRepAlgoAPI_Section.h>
|
||||
#include <BRepBuilderAPI_MakeEdge.hxx>
|
||||
#include <BRepBuilderAPI_MakeFace.hxx>
|
||||
#include <BRepBuilderAPI_MakeVertex.hxx>
|
||||
#include <BRepMesh_IncrementalMesh.hxx>
|
||||
#include <BRepOffsetAPI_NormalProjection.hxx>
|
||||
#include <BRepTools_WireExplorer.hxx>
|
||||
#include <BRep_Tool.hxx>
|
||||
#include <ElCLib.hxx>
|
||||
#include <GCPnts_AbscissaPoint.hxx>
|
||||
#include <GC_MakeArcOfCircle.hxx>
|
||||
#include <GC_MakeCircle.hxx>
|
||||
#include <GeomAPI_ProjectPointOnCurve.hxx>
|
||||
#include <GeomAPI_ProjectPointOnSurf.hxx>
|
||||
#include <GeomConvert.hxx>
|
||||
#include <GeomConvert_BSplineCurveKnotSplitting.hxx>
|
||||
#include <GeomLProp_CLProps.hxx>
|
||||
#include <Geom_BSplineCurve.hxx>
|
||||
#include <Geom_Circle.hxx>
|
||||
#include <Geom_Ellipse.hxx>
|
||||
#include <Geom_Hyperbola.hxx>
|
||||
#include <Geom_Line.hxx>
|
||||
#include <Geom_Parabola.hxx>
|
||||
#include <Geom_Plane.hxx>
|
||||
#include <Geom_TrimmedCurve.hxx>
|
||||
#include <Standard_Version.hxx>
|
||||
#include <TColStd_Array1OfInteger.hxx>
|
||||
#include <TopExp.hxx>
|
||||
#include <TopExp_Explorer.hxx>
|
||||
#include <TopTools_IndexedMapOfShape.hxx>
|
||||
#include <TopoDS.hxx>
|
||||
#include <TopoDS_Edge.hxx>
|
||||
#include <TopoDS_Face.hxx>
|
||||
#include <TopoDS_Shape.hxx>
|
||||
#include <gp_Ax3.hxx>
|
||||
#include <gp_Circ.hxx>
|
||||
#include <gp_Elips.hxx>
|
||||
#include <gp_Hypr.hxx>
|
||||
#include <gp_Parab.hxx>
|
||||
#include <gp_Pln.hxx>
|
||||
|
||||
#include <boost/algorithm/string.hpp>
|
||||
#include <boost/algorithm/string/predicate.hpp>
|
||||
#include <boost/geometry/geometries/register/point.hpp>
|
||||
#include <boost/iostreams/device/array.hpp>
|
||||
#include <boost/iostreams/stream.hpp>
|
||||
#include <boost/range/adaptor/map.hpp>
|
||||
#include <boost/geometry.hpp>
|
||||
|
||||
#include <HLRAlgo_Projector.hxx>
|
||||
#include <HLRBRep_Algo.hxx>
|
||||
#include <HLRBRep_HLRToShape.hxx>
|
||||
|
||||
#include <App/Application.h>
|
||||
#include <App/Document.h>
|
||||
#include <App/ElementNamingUtils.h>
|
||||
#include <App/Expression.h>
|
||||
#include <App/ExpressionParser.h>
|
||||
#include <App/FeaturePythonPyImp.h>
|
||||
#include <App/IndexedName.h>
|
||||
#include <App/MappedName.h>
|
||||
#include <App/ObjectIdentifier.h>
|
||||
#include <App/Datums.h>
|
||||
#include <App/Part.h>
|
||||
#include <Base/Console.h>
|
||||
#include <Base/Reader.h>
|
||||
#include <Base/Tools.h>
|
||||
#include <Base/Vector3D.h>
|
||||
#include <Base/Writer.h>
|
||||
#include <Mod/Part/App/BodyBase.h>
|
||||
#include <Mod/Part/App/PartPyCXX.h>
|
||||
#include <Mod/Part/App/DatumFeature.h>
|
||||
#include <Mod/Part/App/GeometryMigrationExtension.h>
|
||||
#include <Mod/Part/App/TopoShapeOpCode.h>
|
||||
#include <Mod/Part/App/WireJoiner.h>
|
||||
|
||||
#include <memory>
|
||||
|
||||
#include "GeoEnum.h"
|
||||
#include "SketchObject.h"
|
||||
#include "SketchObjectPy.h"
|
||||
#include "SketchGeometry.h"
|
||||
#include "SolverGeometryExtension.h"
|
||||
#include "ExternalGeometryFacade.h"
|
||||
#include <Mod/Part/App/Datums.h>
|
||||
|
||||
|
||||
#undef DEBUG
|
||||
@@ -123,11 +53,6 @@
|
||||
// clang-format off
|
||||
using namespace Sketcher;
|
||||
using namespace Base;
|
||||
namespace sp = std::placeholders;
|
||||
namespace bio = boost::iostreams;
|
||||
|
||||
namespace bg = boost::geometry;
|
||||
namespace bgi = boost::geometry::index;
|
||||
|
||||
Base::Vector3d SketchObject::getPoint(const Part::Geometry *geo, PointPos PosId)
|
||||
{
|
||||
@@ -432,7 +357,6 @@ int SketchObject::delGeometriesExclusiveList(const std::vector<int>& GeoIds, Del
|
||||
|
||||
return 0;
|
||||
}
|
||||
// clang-format off
|
||||
|
||||
int SketchObject::deleteAllGeometry(DeleteOptions options)
|
||||
{
|
||||
@@ -1636,7 +1560,6 @@ void SketchObject::getGeometryWithDependentParameters(
|
||||
geometrymap.emplace_back(geoid, Sketcher::PointPos::start);
|
||||
}
|
||||
}
|
||||
// clang-format off
|
||||
|
||||
void SketchObject::getGeoVertexIndex(int VertexId, int& GeoId, PointPos& PosId) const
|
||||
{
|
||||
@@ -1836,3 +1759,4 @@ int SketchObject::getGeometryId(int GeoId, long& id) const
|
||||
|
||||
return 0;
|
||||
}
|
||||
// clang-format on
|
||||
|
||||
@@ -24,97 +24,17 @@
|
||||
|
||||
#include <algorithm>
|
||||
#include <cmath>
|
||||
#include <cstddef>
|
||||
#include <limits>
|
||||
#include <vector>
|
||||
|
||||
#include <BRepAdaptor_Curve.hxx>
|
||||
#include <BRepAdaptor_Surface.hxx>
|
||||
#include <Mod/Part/App/FCBRepAlgoAPI_Section.h>
|
||||
#include <BRepBuilderAPI_MakeEdge.hxx>
|
||||
#include <BRepBuilderAPI_MakeFace.hxx>
|
||||
#include <BRepBuilderAPI_MakeVertex.hxx>
|
||||
#include <BRepMesh_IncrementalMesh.hxx>
|
||||
#include <BRepOffsetAPI_NormalProjection.hxx>
|
||||
#include <BRepTools_WireExplorer.hxx>
|
||||
#include <BRep_Tool.hxx>
|
||||
#include <ElCLib.hxx>
|
||||
#include <GCPnts_AbscissaPoint.hxx>
|
||||
#include <GC_MakeArcOfCircle.hxx>
|
||||
#include <GC_MakeCircle.hxx>
|
||||
#include <GeomAPI_ProjectPointOnCurve.hxx>
|
||||
#include <GeomAPI_ProjectPointOnSurf.hxx>
|
||||
#include <GeomConvert.hxx>
|
||||
#include <GeomConvert_BSplineCurveKnotSplitting.hxx>
|
||||
#include <GeomLProp_CLProps.hxx>
|
||||
#include <Geom_BSplineCurve.hxx>
|
||||
#include <Geom_Circle.hxx>
|
||||
#include <Geom_Ellipse.hxx>
|
||||
#include <Geom_Hyperbola.hxx>
|
||||
#include <Geom_Line.hxx>
|
||||
#include <Geom_Parabola.hxx>
|
||||
#include <Geom_Plane.hxx>
|
||||
#include <Geom_TrimmedCurve.hxx>
|
||||
#include <Standard_Version.hxx>
|
||||
#include <TColStd_Array1OfInteger.hxx>
|
||||
#include <TopExp.hxx>
|
||||
#include <TopExp_Explorer.hxx>
|
||||
#include <TopTools_IndexedMapOfShape.hxx>
|
||||
#include <TopoDS.hxx>
|
||||
#include <TopoDS_Edge.hxx>
|
||||
#include <TopoDS_Face.hxx>
|
||||
#include <TopoDS_Shape.hxx>
|
||||
#include <gp_Ax3.hxx>
|
||||
#include <gp_Circ.hxx>
|
||||
#include <gp_Elips.hxx>
|
||||
#include <gp_Hypr.hxx>
|
||||
#include <gp_Parab.hxx>
|
||||
#include <gp_Pln.hxx>
|
||||
|
||||
#include <boost/algorithm/string.hpp>
|
||||
#include <boost/algorithm/string/predicate.hpp>
|
||||
#include <boost/geometry/geometries/register/point.hpp>
|
||||
#include <boost/iostreams/device/array.hpp>
|
||||
#include <boost/iostreams/stream.hpp>
|
||||
#include <boost/range/adaptor/map.hpp>
|
||||
#include <boost/geometry.hpp>
|
||||
|
||||
#include <HLRAlgo_Projector.hxx>
|
||||
#include <HLRBRep_Algo.hxx>
|
||||
#include <HLRBRep_HLRToShape.hxx>
|
||||
|
||||
#include <App/Application.h>
|
||||
#include <App/Document.h>
|
||||
#include <App/ElementNamingUtils.h>
|
||||
#include <App/Expression.h>
|
||||
#include <App/ExpressionParser.h>
|
||||
#include <App/FeaturePythonPyImp.h>
|
||||
#include <App/IndexedName.h>
|
||||
#include <App/MappedName.h>
|
||||
#include <App/ObjectIdentifier.h>
|
||||
#include <App/Datums.h>
|
||||
#include <App/Part.h>
|
||||
#include <Base/Console.h>
|
||||
#include <Base/Reader.h>
|
||||
#include <Base/Tools.h>
|
||||
#include <Base/Vector3D.h>
|
||||
#include <Base/Writer.h>
|
||||
#include <Mod/Part/App/BodyBase.h>
|
||||
#include <Mod/Part/App/PartPyCXX.h>
|
||||
#include <Mod/Part/App/DatumFeature.h>
|
||||
#include <Mod/Part/App/GeometryMigrationExtension.h>
|
||||
#include <Mod/Part/App/TopoShapeOpCode.h>
|
||||
#include <Mod/Part/App/WireJoiner.h>
|
||||
|
||||
#include <memory>
|
||||
|
||||
#include "GeoEnum.h"
|
||||
#include "SketchObject.h"
|
||||
#include "SketchObjectPy.h"
|
||||
#include "SketchGeometry.h"
|
||||
#include "SolverGeometryExtension.h"
|
||||
#include "ExternalGeometryFacade.h"
|
||||
#include <Mod/Part/App/Datums.h>
|
||||
|
||||
|
||||
#undef DEBUG
|
||||
@@ -123,11 +43,6 @@
|
||||
// clang-format off
|
||||
using namespace Sketcher;
|
||||
using namespace Base;
|
||||
namespace sp = std::placeholders;
|
||||
namespace bio = boost::iostreams;
|
||||
|
||||
namespace bg = boost::geometry;
|
||||
namespace bgi = boost::geometry::index;
|
||||
|
||||
int SketchObject::moveGeometries(const std::vector<GeoElementId>& geoEltIds, const Base::Vector3d& toPoint, bool relative,
|
||||
bool updateGeoBeforeMoving)
|
||||
@@ -1164,6 +1079,7 @@ int SketchObject::split(int GeoId, const Base::Vector3d& point)
|
||||
|
||||
return 0;
|
||||
}
|
||||
// clang-format off
|
||||
|
||||
int SketchObject::join(
|
||||
int geoId1,
|
||||
@@ -2578,6 +2494,7 @@ int SketchObject::addCopy(
|
||||
|
||||
return Geometry.getSize() - 1;
|
||||
}
|
||||
// clang-format off
|
||||
|
||||
bool SketchObject::convertToNURBS(int GeoId)
|
||||
{
|
||||
@@ -3099,3 +3016,4 @@ bool SketchObject::insertBSplineKnot(int GeoId, double param, int multiplicity)
|
||||
|
||||
return true;
|
||||
}
|
||||
// clang-format on
|
||||
|
||||
Reference in New Issue
Block a user