Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-08-05 23:41:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

svgfill as plug-in

Browse Source
This commit is contained in:
Thomas Krijnen
2026-05-09 21:03:55 +02:00
parent 2eb2d65710
commit fde502daa1
7 changed files with 50 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ifcwrap/CMakeLists.txt
+7 -8
View File
@@ -64,10 +64,6 @@ INCLUDE_DIRECTORIES(BEFORE ${CMAKE_CURRENT_SOURCE_DIR})
SET(CMAKE_SWIG_FLAGS ${SWIG_DEFINES})
if (WITH_CGAL)
set(LIBSVGFILL svgfill)
endif()
SET_SOURCE_FILES_PROPERTIES(IfcPython.i PROPERTIES CPLUSPLUS ON)
# Rebuild on changes in other .i files.
SET_PROPERTY(
@@ -120,6 +116,9 @@ else()
endif()
target_link_libraries(ifcopenshell_wrapper PRIVATE Python::Module)
if(WITH_CGAL)
target_sources(ifcopenshell_wrapper PRIVATE ../svgfill/src/linework_processing_facade.cpp)
endif()
if(WITH_ROCKSDB)
target_link_libraries(ifcopenshell_wrapper PRIVATE document_serializer_rdb)
endif()
@@ -144,9 +143,9 @@ if (WASM_BUILD)
PRIVATE "SHELL:-s EXPORTED_FUNCTIONS=_PyInit__ifcopenshell_wrapper -s SIDE_MODULE=2" -O1
)
endif()
target_link_libraries(ifcopenshell_wrapper PRIVATE IfcGeom IfcParse ${Boost_LIBRARIES} ${LIBSVGFILL})
if(schema_libraries OR kernel_libraries OR tree_libraries OR mapping_libraries OR geometry_serializer_libraries OR document_serializer_libraries)
add_dependencies(ifcopenshell_wrapper ${schema_libraries} ${kernel_libraries} ${tree_libraries} ${mapping_libraries} ${geometry_serializer_libraries} ${document_serializer_libraries})
target_link_libraries(ifcopenshell_wrapper PRIVATE IfcGeom IfcParse ${Boost_LIBRARIES})
if(schema_libraries OR kernel_libraries OR tree_libraries OR mapping_libraries OR geometry_serializer_libraries OR document_serializer_libraries OR linework_processing_libraries)
add_dependencies(ifcopenshell_wrapper ${schema_libraries} ${kernel_libraries} ${tree_libraries} ${mapping_libraries} ${geometry_serializer_libraries} ${document_serializer_libraries} ${linework_processing_libraries})
endif()
if(NOT WIN32)
SET_INSTALL_RPATHS(ifcopenshell_wrapper "${IFCDIRS};${OCC_LIBRARY_DIR}")
@@ -221,7 +220,7 @@ IF(Python_Interpreter_FOUND OR PYTHON_MODULE_INSTALL_DIR)
${mapping_libraries}
${geometry_serializer_libraries}
${document_serializer_libraries}
${LIBSVGFILL}
${linework_processing_libraries}
plugin
)
src/plugin/plugin.cpp
+2
View File
@@ -77,6 +77,8 @@ namespace {
return "geometry_serializer";
case ifcopenshell::plugin::kind::opencascade_geometry_ifc_writer:
return "opencascade_geometry_ifc_writer";
case ifcopenshell::plugin::kind::linework_processing:
return "linework_processing";
default:
return "unknown";
}
src/plugin/plugin.h
+2 -1
View File
@@ -40,7 +40,8 @@ enum class kind {
tree,
document_serializer,
geometry_serializer,
opencascade_geometry_ifc_writer
opencascade_geometry_ifc_writer,
linework_processing
};
struct PLUGIN_API abi_info {
src/svgfill/CMakeLists.txt
+11 -5
View File
@@ -46,14 +46,18 @@ endif()
include_directories(${Boost_INCLUDE_DIRS} ${SVGPP_INCLUDE})
file(GLOB LIB_H_FILES src/*.h)
file(GLOB LIB_CPP_FILES src/svgfill.cpp src/arrange_polygons.cpp)
file(GLOB LIB_CPP_FILES src/svgfill.cpp src/arrange_polygons.cpp src/svgfill_plugin.cpp)
set(LIB_SRC_FILES ${LIB_H_FILES} ${LIB_CPP_FILES})
add_library(svgfill ${LIB_SRC_FILES})
target_link_libraries(svgfill ${Boost_LIBRARIES} ${BCRYPT_LIBRARIES} LibXml2::LibXml2 IFCOPENSHELL_CGAL)
if(BUILD_SHARED_LIBS)
target_compile_definitions(svgfill PUBLIC IFC_SHARED_BUILD)
add_library(svgfill SHARED ${LIB_SRC_FILES})
target_compile_definitions(svgfill PRIVATE BOOST_DLL_USE_STD_FS)
if(NOT WASM_BUILD)
target_link_libraries(svgfill PRIVATE plugin)
endif()
target_link_libraries(svgfill PRIVATE ${Boost_LIBRARIES} ${BCRYPT_LIBRARIES} LibXml2::LibXml2 IFCOPENSHELL_CGAL)
target_compile_definitions(svgfill PUBLIC IFC_SHARED_BUILD)
set_target_properties(svgfill PROPERTIES PUBLIC_HEADER "${LIB_H_FILES}")
set_target_properties(svgfill PROPERTIES OUTPUT_NAME "ifcopenshell.geometry.svgfill")
ifcopenshell_wasm_plugin_link_options(svgfill ifcopenshell_register_linework_processing_plugin_v1)
add_executable(svgfill_exe src/main.cpp)
target_link_libraries(svgfill_exe svgfill)
@@ -69,6 +73,8 @@ if(WIN32)
target_link_options(svgfill_exe PRIVATE "/NOIMPLIB")
endif()
set(linework_processing_libraries svgfill PARENT_SCOPE)
install(
TARGETS svgfill_exe svgfill
EXPORT ${IFCOPENSHELL_EXPORT_TARGETS}
src/svgfill/src/svgfill.cpp
+26 -12
View File
@@ -19,6 +19,7 @@
****************************************************************************/
#include "svgfill.h"
#include "linework_processing_plugin.h"
#include <libxml/parser.h>
@@ -615,23 +616,32 @@ std::string svgfill::polygons_to_svg(const std::vector<polygon_2>& polygons, boo
return polygons_to_svg(pps, random_color);
}
svgfill::abstract_arrangement* svgfill::create_arrangement(solver s) {
if (s == CARTESIAN_DOUBLE) {
return new cgal_arrangement<CGAL::Cartesian<double>>;
} else if (s == CARTESIAN_QUOTIENT) {
return new cgal_arrangement<CGAL::Cartesian<CGAL::Quotient<CGAL::MP_Float>>>;
} else if (s == FILTERED_CARTESIAN_QUOTIENT) {
return new cgal_arrangement<CGAL::Filtered_kernel<CGAL::Cartesian<CGAL::Quotient<CGAL::MP_Float>>>>;
} else if (s == EXACT_PREDICATES) {
return new cgal_arrangement<CGAL::Epick>;
} else if (s == EXACT_CONSTRUCTIONS) {
return new cgal_arrangement<CGAL::Epeck>;
}
return nullptr;
}
void svgfill::destroy_arrangement(abstract_arrangement* arrangement) {
delete arrangement;
}
void svgfill::context::add(const std::vector<line_segment_2>& segments) {
segments_.insert(segments_.end(), segments.begin(), segments.end());
}
bool svgfill::context::build() {
if (solver_ == CARTESIAN_DOUBLE) {
arr_ = new cgal_arrangement<CGAL::Cartesian<double>>;
} else if (solver_ == CARTESIAN_QUOTIENT) {
arr_ = new cgal_arrangement<CGAL::Cartesian<CGAL::Quotient<CGAL::MP_Float>>>;
} else if (solver_ == FILTERED_CARTESIAN_QUOTIENT) {
arr_ = new cgal_arrangement<CGAL::Filtered_kernel<CGAL::Cartesian<CGAL::Quotient<CGAL::MP_Float>>>>;
} else if (solver_ == EXACT_PREDICATES) {
arr_ = new cgal_arrangement<CGAL::Epick>;
} else if (solver_ == EXACT_CONSTRUCTIONS) {
arr_ = new cgal_arrangement<CGAL::Epeck>;
}
return (*arr_)(eps_, segments_, progress_);
arr_ = create_arrangement(solver_);
return arr_ && (*arr_)(eps_, segments_, progress_);
}
void svgfill::context::merge(const std::vector<int>& edge_indices) {
@@ -643,3 +653,7 @@ void svgfill::context::write(std::vector<std::vector<polygon_2>>& p) {
arr_->write(polygons, progress_);
p.push_back(polygons);
}
svgfill::context::~context() {
destroy_arrangement(arr_);
}
src/svgfill/src/svgfill.h
+1 -3
View File
@@ -105,9 +105,7 @@ namespace svgfill {
size_t num_faces() { return arr_->num_faces(); }
size_t delete_same_facet_edge_pairs() { return arr_->delete_same_facet_edge_pairs(); }
~context() {
delete arr_;
}
~context();
};
SVGFILL_API bool svg_to_line_segments(const std::string& data, const std::optional<std::string>& class_name, std::vector<std::vector<line_segment_2>>& segments);
win/build-all-win.py
+1 -1
View File
@@ -216,7 +216,7 @@ def archive_executables() -> None:
roots = {file}
# IfcOpenShell plugins are loaded by name at runtime, so dumpbin cannot discover them.
# svgfill does not require plugins.
# svgfill links its provider plugin directly, so dumpbin can discover that dependency.
if not file.name.lower().startswith("svgfill"):
roots.update(ifc_runtime_plugins)
for plugin in ifc_runtime_plugins: