From 77e02ddae45107ea78b66e8570c724de8d78f535 Mon Sep 17 00:00:00 2001 From: Thomas Krijnen Date: Fri, 31 May 2019 14:31:31 +0200 Subject: [PATCH] Remove all references to _newclass from wrapper code --- src/ifcwrap/IfcGeomWrapper.i | 96 ++++++++++++++++------------------- src/ifcwrap/IfcParseWrapper.i | 83 ++++++++++++++---------------- 2 files changed, 82 insertions(+), 97 deletions(-) diff --git a/src/ifcwrap/IfcGeomWrapper.i b/src/ifcwrap/IfcGeomWrapper.i index 157f4c6c45..be0d37ae39 100644 --- a/src/ifcwrap/IfcGeomWrapper.i +++ b/src/ifcwrap/IfcGeomWrapper.i @@ -197,13 +197,12 @@ struct ShapeRTTI : public boost::static_visitor %extend IfcGeom::Representation::Triangulation { %pythoncode %{ - if _newclass: - # Hide the getters with read-only property implementations - id = property(id) - faces = property(faces) - edges = property(edges) - material_ids = property(material_ids) - materials = property(materials) + # Hide the getters with read-only property implementations + id = property(id) + faces = property(faces) + edges = property(edges) + material_ids = property(material_ids) + materials = property(materials) %} }; @@ -211,91 +210,82 @@ struct ShapeRTTI : public boost::static_visitor // would appear before templated getter functions are defined. %extend IfcGeom::Representation::Triangulation { %pythoncode %{ - if _newclass: - # Hide the getters with read-only property implementations - verts = property(verts) - normals = property(normals) + # Hide the getters with read-only property implementations + verts = property(verts) + normals = property(normals) %} }; %extend IfcGeom::Representation::Triangulation { %pythoncode %{ - if _newclass: - # Hide the getters with read-only property implementations - verts = property(verts) - normals = property(normals) + # Hide the getters with read-only property implementations + verts = property(verts) + normals = property(normals) %} }; %extend IfcGeom::Representation::Serialization { %pythoncode %{ - if _newclass: - # Hide the getters with read-only property implementations - id = property(id) - brep_data = property(brep_data) - surface_styles = property(surface_styles) + # Hide the getters with read-only property implementations + id = property(id) + brep_data = property(brep_data) + surface_styles = property(surface_styles) %} }; %extend IfcGeom::Element { %pythoncode %{ - if _newclass: - # Hide the getters with read-only property implementations - id = property(id) - parent_id = property(parent_id) - name = property(name) - type = property(type) - guid = property(guid) - context = property(context) - unique_id = property(unique_id) - transformation = property(transformation) + # Hide the getters with read-only property implementations + id = property(id) + parent_id = property(parent_id) + name = property(name) + type = property(type) + guid = property(guid) + context = property(context) + unique_id = property(unique_id) + transformation = property(transformation) %} }; %extend IfcGeom::TriangulationElement { %pythoncode %{ - if _newclass: - # Hide the getters with read-only property implementations - geometry = property(geometry) + # Hide the getters with read-only property implementations + geometry = property(geometry) %} }; %extend IfcGeom::SerializedElement { %pythoncode %{ - if _newclass: - # Hide the getters with read-only property implementations - geometry = property(geometry) + # Hide the getters with read-only property implementations + geometry = property(geometry) %} }; %extend IfcGeom::Material { %pythoncode %{ - if _newclass: - # Hide the getters with read-only property implementations - has_diffuse = property(hasDiffuse) - has_specular = property(hasSpecular) - has_transparency = property(hasTransparency) - has_specularity = property(hasSpecularity) - diffuse = property(diffuse) - specular = property(specular) - transparency = property(transparency) - specularity = property(specularity) - name = property(name) + # Hide the getters with read-only property implementations + has_diffuse = property(hasDiffuse) + has_specular = property(hasSpecular) + has_transparency = property(hasTransparency) + has_specularity = property(hasSpecularity) + diffuse = property(diffuse) + specular = property(specular) + transparency = property(transparency) + specularity = property(specularity) + name = property(name) %} }; %extend IfcGeom::Transformation { %pythoncode %{ - if _newclass: - # Hide the getters with read-only property implementations - matrix = property(matrix) + # Hide the getters with read-only property implementations + matrix = property(matrix) %} }; %extend IfcGeom::Matrix { %pythoncode %{ - if _newclass: - # Hide the getters with read-only property implementations - data = property(data) + # Hide the getters with read-only property implementations + data = property(data) %} }; diff --git a/src/ifcwrap/IfcParseWrapper.i b/src/ifcwrap/IfcParseWrapper.i index 2119d5d29f..3790333553 100644 --- a/src/ifcwrap/IfcParseWrapper.i +++ b/src/ifcwrap/IfcParseWrapper.i @@ -99,9 +99,8 @@ private: } %pythoncode %{ - if _newclass: - # Hide the getters with read-only property implementations - header = property(header) + # Hide the getters with read-only property implementations + header = property(header) %} } @@ -346,62 +345,58 @@ private: %extend IfcParse::IfcSpfHeader { %pythoncode %{ - if _newclass: - # Hide the getters with read-only property implementations - file_description = property(file_description) - file_name = property(file_name) - file_schema = property(file_schema) + # Hide the getters with read-only property implementations + file_description = property(file_description) + file_name = property(file_name) + file_schema = property(file_schema) %} }; %extend IfcParse::FileDescription { %pythoncode %{ - if _newclass: - # Hide the getters with read-write property implementations - __swig_getmethods__["description"] = description - __swig_setmethods__["description"] = description - description = property(description, description) - __swig_getmethods__["implementation_level"] = implementation_level - __swig_setmethods__["implementation_level"] = implementation_level - implementation_level = property(implementation_level, implementation_level) + # Hide the getters with read-write property implementations + __swig_getmethods__["description"] = description + __swig_setmethods__["description"] = description + description = property(description, description) + __swig_getmethods__["implementation_level"] = implementation_level + __swig_setmethods__["implementation_level"] = implementation_level + implementation_level = property(implementation_level, implementation_level) %} }; %extend IfcParse::FileName { %pythoncode %{ - if _newclass: - # Hide the getters with read-write property implementations - __swig_getmethods__["name"] = name - __swig_setmethods__["name"] = name - name = property(name, name) - __swig_getmethods__["time_stamp"] = time_stamp - __swig_setmethods__["time_stamp"] = time_stamp - time_stamp = property(time_stamp, time_stamp) - __swig_getmethods__["author"] = author - __swig_setmethods__["author"] = author - author = property(author, author) - __swig_getmethods__["organization"] = organization - __swig_setmethods__["organization"] = organization - organization = property(organization, organization) - __swig_getmethods__["preprocessor_version"] = preprocessor_version - __swig_setmethods__["preprocessor_version"] = preprocessor_version - preprocessor_version = property(preprocessor_version, preprocessor_version) - __swig_getmethods__["originating_system"] = originating_system - __swig_setmethods__["originating_system"] = originating_system - originating_system = property(originating_system, originating_system) - __swig_getmethods__["authorization"] = authorization - __swig_setmethods__["authorization"] = authorization - authorization = property(authorization, authorization) + # Hide the getters with read-write property implementations + __swig_getmethods__["name"] = name + __swig_setmethods__["name"] = name + name = property(name, name) + __swig_getmethods__["time_stamp"] = time_stamp + __swig_setmethods__["time_stamp"] = time_stamp + time_stamp = property(time_stamp, time_stamp) + __swig_getmethods__["author"] = author + __swig_setmethods__["author"] = author + author = property(author, author) + __swig_getmethods__["organization"] = organization + __swig_setmethods__["organization"] = organization + organization = property(organization, organization) + __swig_getmethods__["preprocessor_version"] = preprocessor_version + __swig_setmethods__["preprocessor_version"] = preprocessor_version + preprocessor_version = property(preprocessor_version, preprocessor_version) + __swig_getmethods__["originating_system"] = originating_system + __swig_setmethods__["originating_system"] = originating_system + originating_system = property(originating_system, originating_system) + __swig_getmethods__["authorization"] = authorization + __swig_setmethods__["authorization"] = authorization + authorization = property(authorization, authorization) %} }; %extend IfcParse::FileSchema { %pythoncode %{ - if _newclass: - # Hide the getters with read-write property implementations - __swig_getmethods__["schema_identifiers"] = schema_identifiers - __swig_setmethods__["schema_identifiers"] = schema_identifiers - schema_identifiers = property(schema_identifiers, schema_identifiers) + # Hide the getters with read-write property implementations + __swig_getmethods__["schema_identifiers"] = schema_identifiers + __swig_setmethods__["schema_identifiers"] = schema_identifiers + schema_identifiers = property(schema_identifiers, schema_identifiers) %} };