Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-08-19 19:54:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Wrap more classes into ifcopenshell:: namespace

Browse Source
This commit is contained in:
Thomas Krijnen
2026-08-08 13:58:39 +02:00
parent 2c47c9d4fa
commit 02481b3247
149 changed files with 678 additions and 627 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ifcwrap/IfcGeomWrapper.i
+13 -13
View File
@@ -730,20 +730,20 @@ struct shape_rtti : public boost::static_visitor<PyObject*>
// I couldn't get the vector<string> typemap to be applied when %extending Iterator constructor.
// anyway it does not matter as SWIG generates C code without actual constructors
ifcopenshell::geom::iterator* construct_iterator(const std::string& geometry_library, ifcopenshell::geom::settings settings, ifcopenshell::file* file, int num_threads, logger* logger = nullptr) {
::logger& logger_ = logger_or_root(logger);
ifcopenshell::geom::iterator* construct_iterator(const std::string& geometry_library, ifcopenshell::geom::settings settings, ifcopenshell::file* file, int num_threads, ifcopenshell::logger* logger = nullptr) {
ifcopenshell::logger& logger_ = ifcopenshell::logger_or_root(logger);
return new ifcopenshell::geom::iterator(ifcopenshell::geom::kernels::construct(file, geometry_library, settings), settings, file, num_threads, logger_);
}
ifcopenshell::geom::iterator* construct_iterator_with_include_exclude(const std::string& geometry_library, ifcopenshell::geom::settings settings, ifcopenshell::file* file, std::vector<std::string> elems, bool include, int num_threads, logger* logger = nullptr) {
::logger& logger_ = logger_or_root(logger);
ifcopenshell::geom::iterator* construct_iterator_with_include_exclude(const std::string& geometry_library, ifcopenshell::geom::settings settings, ifcopenshell::file* file, std::vector<std::string> elems, bool include, int num_threads, ifcopenshell::logger* logger = nullptr) {
ifcopenshell::logger& logger_ = ifcopenshell::logger_or_root(logger);
std::set<std::string> elems_set(elems.begin(), elems.end());
ifcopenshell::geom::entity_filter ef{ include, false, elems_set };
return new ifcopenshell::geom::iterator(ifcopenshell::geom::kernels::construct(file, geometry_library, settings), settings, file, {ef}, num_threads, logger_);
}
ifcopenshell::geom::iterator* construct_iterator_with_include_exclude_globalid(const std::string& geometry_library, ifcopenshell::geom::settings settings, ifcopenshell::file* file, std::vector<std::string> elems, bool include, int num_threads, logger* logger = nullptr) {
::logger& logger_ = logger_or_root(logger);
ifcopenshell::geom::iterator* construct_iterator_with_include_exclude_globalid(const std::string& geometry_library, ifcopenshell::geom::settings settings, ifcopenshell::file* file, std::vector<std::string> elems, bool include, int num_threads, ifcopenshell::logger* logger = nullptr) {
ifcopenshell::logger& logger_ = ifcopenshell::logger_or_root(logger);
std::set<std::string> elems_set(elems.begin(), elems.end());
ifcopenshell::geom::attribute_filter af;
af.attribute_name = "GlobalId";
@@ -752,8 +752,8 @@ struct shape_rtti : public boost::static_visitor<PyObject*>
return new ifcopenshell::geom::iterator(ifcopenshell::geom::kernels::construct(file, geometry_library, settings), settings, file, {af}, num_threads, logger_);
}
ifcopenshell::geom::iterator* construct_iterator_with_include_exclude_id(const std::string& geometry_library, ifcopenshell::geom::settings settings, ifcopenshell::file* file, std::vector<int> elems, bool include, int num_threads, logger* logger = nullptr) {
::logger& logger_ = logger_or_root(logger);
ifcopenshell::geom::iterator* construct_iterator_with_include_exclude_id(const std::string& geometry_library, ifcopenshell::geom::settings settings, ifcopenshell::file* file, std::vector<int> elems, bool include, int num_threads, ifcopenshell::logger* logger = nullptr) {
ifcopenshell::logger& logger_ = ifcopenshell::logger_or_root(logger);
std::set<int> elems_set(elems.begin(), elems.end());
ifcopenshell::geom::instance_id_filter af(include, false, elems_set);
return new ifcopenshell::geom::iterator(ifcopenshell::geom::kernels::construct(file, geometry_library, settings), settings, file, {af}, num_threads, logger_);
@@ -1077,12 +1077,12 @@ ifcopenshell::geom::taxonomy::item::ptr try_upcast(PyObject* obj0, swig_type_inf
%}
%inline %{
static std::variant<ifcopenshell::geom::element*, ifcopenshell::geom::Representation::representation*, ifcopenshell::geom::transformation*> create_shape(ifcopenshell::geom::settings& settings, const express::base& instance, const express::base& representation, const char* const geometry_library="opencascade", logger* logger = nullptr) {
return helper_fn_create_shape(logger_or_root(logger), geometry_library, settings, instance, representation);
static std::variant<ifcopenshell::geom::element*, ifcopenshell::geom::Representation::representation*, ifcopenshell::geom::transformation*> create_shape(ifcopenshell::geom::settings& settings, const express::base& instance, const express::base& representation, const char* const geometry_library="opencascade", ifcopenshell::logger* logger = nullptr) {
return helper_fn_create_shape(ifcopenshell::logger_or_root(logger), geometry_library, settings, instance, representation);
}
// Manual definition of overload without representation argument
static std::variant<ifcopenshell::geom::element*, ifcopenshell::geom::Representation::representation*, ifcopenshell::geom::transformation*> create_shape(ifcopenshell::geom::settings& settings, const express::base& instance, const char* const geometry_library="opencascade", logger* logger = nullptr) {
static std::variant<ifcopenshell::geom::element*, ifcopenshell::geom::Representation::representation*, ifcopenshell::geom::transformation*> create_shape(ifcopenshell::geom::settings& settings, const express::base& instance, const char* const geometry_library="opencascade", ifcopenshell::logger* logger = nullptr) {
return create_shape(settings, instance, express::base(), geometry_library, logger);
}
%}
@@ -1342,9 +1342,9 @@ ifcopenshell::geom::taxonomy::item::ptr try_upcast(PyObject* obj0, swig_type_inf
}
}
std::vector<svgfill::polygon_2> arrange_polygons(svgfill::arrange_polygon_settings settings, const std::vector<svgfill::polygon_2>& polygons, logger* logger = nullptr) {
std::vector<svgfill::polygon_2> arrange_polygons(svgfill::arrange_polygon_settings settings, const std::vector<svgfill::polygon_2>& polygons, ifcopenshell::logger* logger = nullptr) {
std::vector<svgfill::polygon_2> r;
if (svgfill::arrange_polygons(settings, polygons, r, logger_or_root(logger))) {
if (svgfill::arrange_polygons(settings, polygons, r, ifcopenshell::logger_or_root(logger))) {
return r;
} else {
throw std::runtime_error("Failed to arrange polygons");
src/ifcwrap/IfcParseWrapper.i
+11 -11
View File
@@ -291,8 +291,8 @@ private:
return new ifcopenshell::file(ifcopenshell::schema_by_name(schema));
}
static ifcopenshell::file* create_uninitialized(logger* logger=nullptr) {
return new ifcopenshell::file(ifcopenshell::uninitialized_tag{}, logger_or_root(logger));
static ifcopenshell::file* create_uninitialized(ifcopenshell::logger* logger=nullptr) {
return new ifcopenshell::file(ifcopenshell::uninitialized_tag{}, ifcopenshell::logger_or_root(logger));
}
std::vector<express::base> _get_inverse(const express::base& e) {
@@ -991,10 +991,10 @@ from .entity_instance import entity_instance_mixin
%newobject stream_from_string;
%inline %{
ifcopenshell::file* open(const std::string& fn, bool readonly=false, logger* logger=nullptr) {
ifcopenshell::file* open(const std::string& fn, bool readonly=false, ifcopenshell::logger* logger=nullptr) {
ifcopenshell::file* f;
Py_BEGIN_ALLOW_THREADS;
f = new ifcopenshell::file(fn, ifcopenshell::FT_AUTODETECT, readonly, logger_or_root(logger));
f = new ifcopenshell::file(fn, ifcopenshell::FT_AUTODETECT, readonly, ifcopenshell::logger_or_root(logger));
Py_END_ALLOW_THREADS;
return f;
}
@@ -1152,7 +1152,7 @@ from .entity_instance import entity_instance_mixin
static std::stringstream ifcopenshell_log_stream;
%}
%init %{
::logger::root().set_output(0, &ifcopenshell_log_stream);
ifcopenshell::logger::root().set_output(0, &ifcopenshell_log_stream);
%}
%inline %{
std::string get_log() {
@@ -1161,20 +1161,20 @@ from .entity_instance import entity_instance_mixin
return log;
}
void turn_on_detailed_logging() {
::logger::root().set_output(&std::cout, &std::cout);
::logger::root().verbosity(::logger::LOG_DEBUG);
ifcopenshell::logger::root().set_output(&std::cout, &std::cout);
ifcopenshell::logger::root().verbosity(ifcopenshell::logger::LOG_DEBUG);
}
void turn_off_detailed_logging() {
::logger::root().set_output(0, &ifcopenshell_log_stream);
::logger::root().verbosity(::logger::LOG_WARNING);
ifcopenshell::logger::root().set_output(0, &ifcopenshell_log_stream);
ifcopenshell::logger::root().verbosity(ifcopenshell::logger::LOG_WARNING);
}
void set_log_format_json() {
ifcopenshell_log_stream.str("");
::logger::root().output_format(::logger::FMT_JSON);
ifcopenshell::logger::root().output_format(ifcopenshell::logger::FMT_JSON);
}
void set_log_format_text() {
ifcopenshell_log_stream.str("");
::logger::root().output_format(::logger::FMT_PLAIN);
ifcopenshell::logger::root().output_format(ifcopenshell::logger::FMT_PLAIN);
}
%}