Skip to content

Commit

Permalink
Merge pull request FreeCAD#15509 from bgbsww/bgbsww-toponamingSaveRes…
Browse files Browse the repository at this point in the history
…tore8

Toponaming:  Bring in ExportGeo and refmaps
  • Loading branch information
chennes committed Jul 27, 2024
2 parents 61c964c + 8948505 commit 58b3d02
Show file tree
Hide file tree
Showing 8 changed files with 2,082 additions and 298 deletions.
10 changes: 4 additions & 6 deletions src/Mod/Part/App/TopoShapeExpansion.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4783,12 +4783,10 @@ TopoShape& TopoShape::makeElementRefine(const TopoShape& shape, const char* op,
return {};

std::vector<Data::IndexedName> res;
int type = shape.shapeType();
for(;;) {
if(--type < 0)
break;
const char *shapetype = shapeName((TopAbs_ShapeEnum)type).c_str();
for(int idx : findAncestors(shape.getShape(), (TopAbs_ShapeEnum)type))

for (int type = shape.shapeType() - 1; type >= 0; type--) {
const char* shapetype = shapeName((TopAbs_ShapeEnum)type).c_str();
for (int idx : findAncestors(shape.getShape(), (TopAbs_ShapeEnum)type))
res.emplace_back(shapetype, idx);
}
return res;
Expand Down
16 changes: 16 additions & 0 deletions src/Mod/Sketcher/App/PreCompiled.h
Original file line number Diff line number Diff line change
Expand Up @@ -43,23 +43,38 @@
#include <QDateTime>

// Boost
#include <boost/algorithm/string.hpp>
#include <boost/algorithm/string/predicate.hpp>
#include <boost/algorithm/string/regex.hpp>
#include <boost/format.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/uuid/uuid_io.hpp>
#include <boost_geometry.hpp>

// OpenCasCade
#include <BRepAdaptor_Curve.hxx>
#include <BRepAdaptor_Surface.hxx>
#include <BRepAlgoAPI_Section.hxx>
#include <BRepBuilderAPI_MakeEdge.hxx>
#include <BRepBuilderAPI_MakeFace.hxx>
#include <BRepBuilderAPI_MakeVertex.hxx>
#include <BRepBuilderAPI_MakeWire.hxx>
#include <BRepMesh_IncrementalMesh.hxx>
#include <BRepOffsetAPI_NormalProjection.hxx>
#include <BRepTools_WireExplorer.hxx>
#include <BRep_Builder.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_BSplineCurveKnotSplitting.hxx>
#include <GeomLProp_CLProps.hxx>
#include <Geom_BSplineCurve.hxx>
#include <Geom_Circle.hxx>
#include <Geom_Ellipse.hxx>
Expand All @@ -74,6 +89,7 @@
#include <TColStd_Array1OfInteger.hxx>
#include <TopExp.hxx>
#include <TopExp_Explorer.hxx>
#include <TopTools_IndexedMapOfShape.hxx>
#include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>
#include <TopoDS.hxx>
#include <TopoDS_Compound.hxx>
Expand Down
Loading

0 comments on commit 58b3d02

Please sign in to comment.