diff --git a/src/examples/arbitrary_open_profile_def.cpp b/src/examples/arbitrary_open_profile_def.cpp index 20ae1bb561..45495736d5 100644 --- a/src/examples/arbitrary_open_profile_def.cpp +++ b/src/examples/arbitrary_open_profile_def.cpp @@ -33,8 +33,8 @@ #include "../ifcparse/IfcHierarchyHelper.h" typedef std::string S; -typedef IfcWrite::IfcGuidHelper guid; -boost::none_t const null = (static_cast(0)); +typedef IfcParse::IfcGlobalId guid; +boost::none_t const null = boost::none; static int i = 0; void create_product_from_item(IfcHierarchyHelper& file, IfcSchema::IfcRepresentationItem* item, const std::string& s) { @@ -43,16 +43,16 @@ void create_product_from_item(IfcHierarchyHelper& file, IfcSchema::IfcRepresenta file.addBuildingProduct(product); product->setOwnerHistory(file.getSingle()); - product->setObjectPlacement(file.addLocalPlacement(120 * i++)); + product->setObjectPlacement(file.addLocalPlacement(0, 120 * i++)); - IfcSchema::IfcRepresentation::list reps (new IfcTemplatedEntityList()); - IfcSchema::IfcRepresentationItem::list items (new IfcTemplatedEntityList()); + IfcSchema::IfcRepresentation::list::ptr reps (new IfcSchema::IfcRepresentation::list()); + IfcSchema::IfcRepresentationItem::list::ptr items (new IfcSchema::IfcRepresentationItem::list()); items->push(item); if (s == "GeometricSet") { IfcSchema::IfcGeometricSet* set = new IfcSchema::IfcGeometricSet(items->generalize()); file.addEntity(set); - items = IfcSchema::IfcRepresentationItem::list(new IfcTemplatedEntityList()); + items = IfcSchema::IfcRepresentationItem::list::ptr(new IfcSchema::IfcRepresentationItem::list()); items->push(set); } @@ -60,7 +60,7 @@ void create_product_from_item(IfcHierarchyHelper& file, IfcSchema::IfcRepresenta file.getSingle(), S("Body"), s, items); reps->push(rep); - IfcSchema::IfcProductDefinitionShape* shape = new IfcSchema::IfcProductDefinitionShape(0, 0, reps); + IfcSchema::IfcProductDefinitionShape* shape = new IfcSchema::IfcProductDefinitionShape(boost::none, boost::none, reps); file.addEntity(rep); file.addEntity(shape); @@ -109,11 +109,11 @@ void create_products_from_curve(IfcHierarchyHelper& file, IfcSchema::IfcBoundedC int main(int argc, char** argv) { const char filename[] = "IfcArbitraryOpenProfileDef.ifc"; IfcHierarchyHelper file; - file.filename(filename); + file.header().file_name().name(filename); double coords1[] = {-50.0, 0.0}; double coords2[] = { 50.0, 0.0}; - IfcSchema::IfcCartesianPoint::list points (new IfcTemplatedEntityList()); + IfcSchema::IfcCartesianPoint::list::ptr points (new IfcSchema::IfcCartesianPoint::list()); points->push(new IfcSchema::IfcCartesianPoint(std::vector(coords1, coords1+2))); points->push(new IfcSchema::IfcCartesianPoint(std::vector(coords2, coords2+2))); file.addEntities(points->generalize()); @@ -126,8 +126,8 @@ int main(int argc, char** argv) { file.addEntity(ellipse); IfcEntityList::ptr trim1(new IfcEntityList); IfcEntityList::ptr trim2(new IfcEntityList); - trim1->push(new IfcWrite::IfcSelectHelper( 0., Ifc2x3::Type::IfcParameterValue)); - trim2->push(new IfcWrite::IfcSelectHelper(180., Ifc2x3::Type::IfcParameterValue)); + trim1->push(new IfcSchema::IfcParameterValue( 0.)); + trim2->push(new IfcSchema::IfcParameterValue(180.)); IfcSchema::IfcTrimmedCurve* trim = new IfcSchema::IfcTrimmedCurve(ellipse, trim1, trim2, true, IfcSchema::IfcTrimmingPreference::IfcTrimmingPreference_PARAMETER); file.addEntity(trim); diff --git a/src/examples/composite_profile_def.cpp b/src/examples/composite_profile_def.cpp index 8e495e9231..5ff41a3b13 100644 --- a/src/examples/composite_profile_def.cpp +++ b/src/examples/composite_profile_def.cpp @@ -32,19 +32,19 @@ #include "../ifcparse/IfcHierarchyHelper.h" typedef std::string S; -typedef IfcWrite::IfcGuidHelper guid; -boost::none_t const null = (static_cast(0)); +typedef IfcParse::IfcGlobalId guid; +boost::none_t const null = boost::none; int main(int argc, char** argv) { const char filename[] = "IfcCompositeProfileDef.ifc"; IfcHierarchyHelper file; - file.filename(filename); + file.header().file_name().name(filename); double coords1[] = {100.0, 0.0}; double coords2[] = {200.0, 0.0}; double coords3[] = {300.0, 0.0}; - IfcSchema::IfcProfileDef::list profiles (new IfcTemplatedEntityList()); + IfcSchema::IfcProfileDef::list::ptr profiles (new IfcSchema::IfcProfileDef::list()); IfcSchema::IfcCartesianTransformationOperator2D* transform1 = new IfcSchema::IfcCartesianTransformationOperator2D(file.addDoublet(1, 0), file.addDoublet(0, -1), file.addDoublet(40, 0), null); IfcSchema::IfcCartesianTransformationOperator2D* transform2 = new IfcSchema::IfcCartesianTransformationOperator2D(file.addDoublet(0, -1), file.addDoublet(1, 0), file.addDoublet(40, 0), 0.3); @@ -98,15 +98,15 @@ int main(int argc, char** argv) { file.addEntity(composite); file.addEntity(solid); - IfcSchema::IfcRepresentation::list reps (new IfcTemplatedEntityList()); - IfcSchema::IfcRepresentationItem::list items (new IfcTemplatedEntityList()); + IfcSchema::IfcRepresentation::list::ptr reps (new IfcSchema::IfcRepresentation::list()); + IfcSchema::IfcRepresentationItem::list::ptr items (new IfcSchema::IfcRepresentationItem::list()); items->push(solid); IfcSchema::IfcShapeRepresentation* rep = new IfcSchema::IfcShapeRepresentation( file.getSingle(), S("Body"), S("SweptSolid"), items); reps->push(rep); - IfcSchema::IfcProductDefinitionShape* shape = new IfcSchema::IfcProductDefinitionShape(0, 0, reps); + IfcSchema::IfcProductDefinitionShape* shape = new IfcSchema::IfcProductDefinitionShape(boost::none, boost::none, reps); file.addEntity(rep); file.addEntity(shape); diff --git a/src/examples/csg_primitive.cpp b/src/examples/csg_primitive.cpp index d849a1cb22..190236ed6b 100644 --- a/src/examples/csg_primitive.cpp +++ b/src/examples/csg_primitive.cpp @@ -32,8 +32,8 @@ #include "../ifcparse/IfcHierarchyHelper.h" typedef std::string S; -typedef IfcWrite::IfcGuidHelper guid; -boost::none_t const null = (static_cast(0)); +typedef IfcParse::IfcGlobalId guid; +boost::none_t const null = boost::none; class Node { private: @@ -135,7 +135,7 @@ public: int main(int argc, char** argv) { const char filename[] = "IfcCsgPrimitive.ifc"; IfcHierarchyHelper file; - file.filename(filename); + file.header().file_name().name(filename); IfcSchema::IfcRepresentationItem* csg1 = Node::Box(8000.,6000.,3000.).subtract( Node::Box(7600.,5600.,2800.).move(200.,200.,200.) @@ -171,8 +171,8 @@ int main(int argc, char** argv) { product->setObjectPlacement(file.addLocalPlacement()); - IfcSchema::IfcRepresentation::list reps (new IfcTemplatedEntityList()); - IfcSchema::IfcRepresentationItem::list items (new IfcTemplatedEntityList()); + IfcSchema::IfcRepresentation::list::ptr reps (new IfcSchema::IfcRepresentation::list()); + IfcSchema::IfcRepresentationItem::list::ptr items (new IfcSchema::IfcRepresentationItem::list()); items->push(csg1); items->push(csg2); @@ -180,7 +180,7 @@ int main(int argc, char** argv) { file.getSingle(), S("Body"), S("CSG"), items); reps->push(rep); - IfcSchema::IfcProductDefinitionShape* shape = new IfcSchema::IfcProductDefinitionShape(0, 0, reps); + IfcSchema::IfcProductDefinitionShape* shape = new IfcSchema::IfcProductDefinitionShape(null, null, reps); file.addEntity(rep); file.addEntity(shape); diff --git a/src/examples/ellipse_pies.cpp b/src/examples/ellipse_pies.cpp index eeef6cc7f3..9994ca820d 100644 --- a/src/examples/ellipse_pies.cpp +++ b/src/examples/ellipse_pies.cpp @@ -32,8 +32,8 @@ #include "../ifcparse/IfcHierarchyHelper.h" typedef std::string S; -typedef IfcWrite::IfcGuidHelper guid; -boost::none_t const null = (static_cast(0)); +typedef IfcParse::IfcGlobalId guid; +boost::none_t const null = boost::none; typedef struct { double r1; @@ -58,7 +58,7 @@ void create_testcase_for(IfcHierarchyHelper& file, const EllipsePie& pie, Ifc2x3 Ifc2x3::IfcCartesianPoint* p2 = new Ifc2x3::IfcCartesianPoint(coords2); Ifc2x3::IfcCartesianPoint* p3 = new Ifc2x3::IfcCartesianPoint(coords3); - Ifc2x3::IfcCartesianPoint::list points(new IfcTemplatedEntityList()); + Ifc2x3::IfcCartesianPoint::list::ptr points(new Ifc2x3::IfcCartesianPoint::list()); points->push(p3); points->push(p1); points->push(p2); @@ -70,8 +70,8 @@ void create_testcase_for(IfcHierarchyHelper& file, const EllipsePie& pie, Ifc2x3 IfcEntityList::ptr trim1(new IfcEntityList); IfcEntityList::ptr trim2(new IfcEntityList); if (pref == Ifc2x3::IfcTrimmingPreference::IfcTrimmingPreference_PARAMETER) { - trim1->push(new IfcWrite::IfcSelectHelper(pie.t1, Ifc2x3::Type::IfcParameterValue)); - trim2->push(new IfcWrite::IfcSelectHelper(pie.t2, Ifc2x3::Type::IfcParameterValue)); + trim1->push(new Ifc2x3::IfcParameterValue(pie.t1)); + trim2->push(new Ifc2x3::IfcParameterValue(pie.t2)); } else { trim1->push(p2); trim2->push(p3); @@ -79,7 +79,7 @@ void create_testcase_for(IfcHierarchyHelper& file, const EllipsePie& pie, Ifc2x3 Ifc2x3::IfcTrimmedCurve* trim = new Ifc2x3::IfcTrimmedCurve(ellipse, trim1, trim2, true, pref); file.addEntity(trim); - Ifc2x3::IfcCompositeCurveSegment::list segments(new IfcTemplatedEntityList()); + Ifc2x3::IfcCompositeCurveSegment::list::ptr segments(new Ifc2x3::IfcCompositeCurveSegment::list()); Ifc2x3::IfcCompositeCurveSegment* s2 = new Ifc2x3::IfcCompositeCurveSegment(Ifc2x3::IfcTransitionCode::IfcTransitionCode_CONTINUOUS, true, trim); Ifc2x3::IfcPolyline* poly = new Ifc2x3::IfcPolyline(points); @@ -100,22 +100,22 @@ void create_testcase_for(IfcHierarchyHelper& file, const EllipsePie& pie, Ifc2x3 file.addBuildingProduct(product); product->setOwnerHistory(file.getSingle()); - product->setObjectPlacement(file.addLocalPlacement(200 * i++)); + product->setObjectPlacement(file.addLocalPlacement(0, 200 * i++)); IfcSchema::IfcExtrudedAreaSolid* solid = new IfcSchema::IfcExtrudedAreaSolid(profile, file.addPlacement3d(), file.addTriplet(0, 0, 1), 20.0); file.addEntity(solid); - IfcSchema::IfcRepresentation::list reps (new IfcTemplatedEntityList()); - IfcSchema::IfcRepresentationItem::list items (new IfcTemplatedEntityList()); + IfcSchema::IfcRepresentation::list::ptr reps (new IfcSchema::IfcRepresentation::list()); + IfcSchema::IfcRepresentationItem::list::ptr items (new IfcSchema::IfcRepresentationItem::list()); items->push(solid); IfcSchema::IfcShapeRepresentation* rep = new IfcSchema::IfcShapeRepresentation( file.getSingle(), S("Body"), S("SweptSolid"), items); reps->push(rep); - IfcSchema::IfcProductDefinitionShape* shape = new IfcSchema::IfcProductDefinitionShape(0, 0, reps); + IfcSchema::IfcProductDefinitionShape* shape = new IfcSchema::IfcProductDefinitionShape(boost::none, boost::none, reps); file.addEntity(rep); file.addEntity(shape);