diff --git a/src/blenderbim/docs/users/git_support.rst b/src/blenderbim/docs/users/git_support.rst index 97bbfb80a1..cda05aee46 100644 --- a/src/blenderbim/docs/users/git_support.rst +++ b/src/blenderbim/docs/users/git_support.rst @@ -147,7 +147,7 @@ changes don't directly conflict. When two branches have diverged, merging an IFC model requires *conflict resolution* (because added entities may inadvertently reuse the same Step-IDs), this means that data on one side or the other may be rewritten by BlenderBIM in -order to accomodate both sets of changes. ie. the merge process is +order to accommodate both sets of changes. ie. the merge process is *asymmetrical*. BlenderBIM privileges data in the remote `origin/main` branch over the local working branch, similarly it privileges data in the local `main` branch over any other local working branch. The practical result of this is diff --git a/src/ifcconvert/IfcConvert.cpp b/src/ifcconvert/IfcConvert.cpp index 6faa5d135d..cd23d6c22e 100644 --- a/src/ifcconvert/IfcConvert.cpp +++ b/src/ifcconvert/IfcConvert.cpp @@ -942,7 +942,7 @@ int main(int argc, char** argv) { if (!tmp_context_iterator.initialize()) { /// @todo It would be nice to know and print separate error prints for a case where we found no entities /// and for a case we found no entities that satisfy our filtering criteria. - Logger::Notice("No geometrical elements found or none succesfully converted"); + Logger::Notice("No geometrical elements found or none successfully converted"); serializer.reset(); IfcUtil::path::delete_file(IfcUtil::path::to_utf8(output_temp_filename)); write_log(!quiet); @@ -994,7 +994,7 @@ int main(int argc, char** argv) { if (context_iterator && !context_iterator->initialize()) { /// @todo It would be nice to know and print separate error prints for a case where we found no entities /// and for a case we found no entities that satisfy our filtering criteria. - Logger::Notice("No geometrical elements found or none succesfully converted"); + Logger::Notice("No geometrical elements found or none successfully converted"); serializer.reset(); IfcUtil::path::delete_file(IfcUtil::path::to_utf8(output_temp_filename)); write_log(!quiet); diff --git a/src/ifcconvert/validate_wall_connectivity.cpp b/src/ifcconvert/validate_wall_connectivity.cpp index 7a41fd78e7..3e55a783f0 100644 --- a/src/ifcconvert/validate_wall_connectivity.cpp +++ b/src/ifcconvert/validate_wall_connectivity.cpp @@ -182,7 +182,7 @@ void fix_wallconnectivity(IfcParse::IfcFile& f, bool no_progress, bool quiet, bo if (rels_encounted.find(rel) == rels_encounted.end()) { auto x = (IfcUtil::IfcBaseEntity*)((IfcUtil::IfcBaseEntity*)rel)->get_value("RelatingElement"); auto y = (IfcUtil::IfcBaseEntity*)((IfcUtil::IfcBaseEntity*)rel)->get_value("RelatedElement"); - if (v.succesfully_processed.find(x) != v.succesfully_processed.end() && v.succesfully_processed.find(y) != v.succesfully_processed.end()) { + if (v.successfully_processed.find(x) != v.successfully_processed.end() && v.successfully_processed.find(y) != v.successfully_processed.end()) { Logger::Error("Connection for non-adjacent walls", rel); } } diff --git a/src/ifcconvert/validation_utils.h b/src/ifcconvert/validation_utils.h index a47a909755..0b9484df3c 100644 --- a/src/ifcconvert/validation_utils.h +++ b/src/ifcconvert/validation_utils.h @@ -176,7 +176,7 @@ struct remove_thickness { CGAL::Polygon_mesh_processing::triangulate_faces(polyhedron); CGAL::Polygon_mesh_processing::triangulate_faces(polyhedron2); - std::list non_degenerate, degenerate, longitudonal; + std::list non_degenerate, degenerate, longitudinal; std::set thin_sides; std::wcout << "ALL FACES:" << std::endl; @@ -243,20 +243,20 @@ struct remove_thickness { for (auto& f : non_degenerate) { if (thin_sides.find(f) == thin_sides.end()) { - longitudonal.push_back(f); + longitudinal.push_back(f); } } std::wcout << "LONGITUDONAL:" << std::endl; - for (auto& f : longitudonal) { + for (auto& f : longitudinal) { dump_facet(f); } - std::wcout << "faces " << faces(polyhedron).size() << "long " << longitudonal.size() << "thin " << thin_sides.size() << "non-degen " << non_degenerate.size() << std::endl; + std::wcout << "faces " << faces(polyhedron).size() << "long " << longitudinal.size() << "thin " << thin_sides.size() << "non-degen " << non_degenerate.size() << std::endl; cgal_shape_t enlarged_indiv_triangles; Build_Offset bo2; - bo2.input = longitudonal; + bo2.input = longitudinal; enlarged_indiv_triangles.delegate(bo2); { @@ -381,19 +381,19 @@ struct remove_thickness { // @todo choose connected / connected_opposing based on largest combined area of facets? - if (longitudonal.size() == 0) { - std::wcout << "no longitudonal faces detected :(" << std::endl; + if (longitudinal.size() == 0) { + std::wcout << "no longitudinal faces detected :(" << std::endl; return; } - auto connected = connected_faces(*longitudonal.begin(), thin_sides_degenerate); + auto connected = connected_faces(*longitudinal.begin(), thin_sides_degenerate); decltype(connected) connected_opposing; - for (auto& f : longitudonal) { + for (auto& f : longitudinal) { if (std::find(connected.begin(), connected.end(), f) == connected.end()) { connected_opposing = connected_faces(f, thin_sides_degenerate); - std::set longi(longitudonal.begin(), longitudonal.end()); + std::set longi(longitudinal.begin(), longitudinal.end()); std::set both_sides(connected.begin(), connected.end()); both_sides.insert(connected_opposing.begin(), connected_opposing.end()); @@ -429,7 +429,7 @@ struct intersection_validator { double total_minkowsky_time = 0.; double total_box_time = 0.; - std::set succesfully_processed; + std::set successfully_processed; intersection_validator(IfcParse::IfcFile& f, std::initializer_list entities, double eps, bool no_progress, bool quiet, bool stderr_progress) { @@ -504,7 +504,7 @@ struct intersection_validator { continue; } - succesfully_processed.insert(geom_object->product()); + successfully_processed.insert(geom_object->product()); nef = CGAL::minkowski_sum_3(nef, cube); std::clock_t minkowski_end = std::clock(); diff --git a/src/ifcgeom/kernels/opencascade/OpenCascadeKernel.cpp b/src/ifcgeom/kernels/opencascade/OpenCascadeKernel.cpp index bea99141eb..1b532a7aef 100644 --- a/src/ifcgeom/kernels/opencascade/OpenCascadeKernel.cpp +++ b/src/ifcgeom/kernels/opencascade/OpenCascadeKernel.cpp @@ -900,7 +900,7 @@ bool IfcGeom::OpenCascadeKernel::convert_openings(const IfcUtil::IfcBaseEntity* // typedef std::vector< std::vector > result_t; // endpoint_connections_t endpoint_connections; // -// // Find the semantic connections ot other wall elements when they are not connected 'AT_PATH' because +// // Find the semantic connections to other wall elements when they are not connected 'AT_PATH' because // // in that latter case no folds need to be made. // for (IfcSchema::IfcRelConnectsPathElements::list::it it = connections->begin(); it != connections->end(); ++it) { // IfcSchema::IfcRelConnectsPathElements* connection = *it; @@ -1020,7 +1020,7 @@ bool IfcGeom::OpenCascadeKernel::convert_openings(const IfcUtil::IfcBaseEntity* // // range. It's only a safeguard though, so can probably be approximated. // const double axis_length = own_axis_start.Distance(own_axis_end); // if (length_required > axis_length) { -// Logger::Warning("The wall axis is not long enough to accomodate the fold points"); +// Logger::Warning("The wall axis is not long enough to accommodate the fold points"); // return false; // } // @@ -1115,7 +1115,7 @@ bool IfcGeom::OpenCascadeKernel::convert_openings(const IfcUtil::IfcBaseEntity* // result_t::iterator result_vector = result.begin() + 1; // // // nb The first layer is never folded, because it corresponds -// // to one of the longitudonal faces of the wall. Hence the +1 +// // to one of the longitudinal faces of the wall. Hence the +1 // for (surfaces_t::const_iterator jt = surfaces.begin() + 1; jt != surfaces.end() - 1; ++jt, ++result_vector) { // layer_offset += *thickness++; // diff --git a/src/ifcgeom/kernels/opencascade/base_utils.cpp b/src/ifcgeom/kernels/opencascade/base_utils.cpp index ea0e19f862..ac19c47be8 100644 --- a/src/ifcgeom/kernels/opencascade/base_utils.cpp +++ b/src/ifcgeom/kernels/opencascade/base_utils.cpp @@ -609,7 +609,7 @@ bool IfcGeom::util::create_solid_from_faces(const TopTools_ListOfShape& face_lis bool has_shared_edges = false; TopTools_MapOfShape edge_set; - // In case there are wire interesections or failures in non-planar wire triangulations + // In case there are wire intersections or failures in non-planar wire triangulations // the idea is to let occt do an exhaustive search of edge partners. But we have not // found a case where this actually improves boolean ops later on. // if (!faceset_helper_ || !faceset_helper_->non_manifold()) { diff --git a/src/ifcgeom/kernels/opencascade/boolean_result.cpp b/src/ifcgeom/kernels/opencascade/boolean_result.cpp index 9891ce4599..8e81c5b46e 100644 --- a/src/ifcgeom/kernels/opencascade/boolean_result.cpp +++ b/src/ifcgeom/kernels/opencascade/boolean_result.cpp @@ -132,7 +132,7 @@ bool OpenCascadeKernel::convert_impl(const taxonomy::boolean_result::ptr br, Con double d; TopoDS_Shape result; util::fit_halfspace(a, S, result, d, tol * 1e3); - // #2665 we also set a precision-independent treshold, because in the boolean op routine + // #2665 we also set a precision-independent threshold, because in the boolean op routine // the working fuzziness might still be increased. if (d < tol * 20. || d < 0.00002) { Logger::Message(Logger::LOG_WARNING, "Halfspace subtraction yields unchanged volume:", c->instance); diff --git a/src/ifcgeom/kernels/opencascade/boolean_utils.cpp b/src/ifcgeom/kernels/opencascade/boolean_utils.cpp index cde875a07f..fead091b06 100644 --- a/src/ifcgeom/kernels/opencascade/boolean_utils.cpp +++ b/src/ifcgeom/kernels/opencascade/boolean_utils.cpp @@ -1202,9 +1202,9 @@ bool IfcGeom::util::boolean_operation(const boolean_settings& settings, const To } if (!success) { - PERF("boolean operation: manifoldness check excemption"); + PERF("boolean operation: manifoldness check exemption"); - // An excemption for the requirement to be manifold: When the cut operands have overlapping edge belonging to faces that do not overlap. + // An exemption for the requirement to be manifold: When the cut operands have overlapping edge belonging to faces that do not overlap. bool operands_nonmanifold = false; if (op == BOPAlgo_CUT) { TopTools_IndexedMapOfShape edges; @@ -1267,7 +1267,7 @@ bool IfcGeom::util::boolean_operation(const boolean_settings& settings, const To bool has_open_shells = false; if (op == BOPAlgo_CUT) { - PERF("boolean operation: open shell face adition check"); + PERF("boolean operation: open shell face addition check"); for (TopExp_Explorer exp(a, TopAbs_SHELL); exp.More(); exp.Next()) { if (!exp.Current().Closed()) { diff --git a/src/ifcgeom/kernels/opencascade/face.cpp b/src/ifcgeom/kernels/opencascade/face.cpp index 189df76a55..6dadf2b41b 100644 --- a/src/ifcgeom/kernels/opencascade/face.cpp +++ b/src/ifcgeom/kernels/opencascade/face.cpp @@ -61,7 +61,7 @@ bool OpenCascadeKernel::convert(const taxonomy::face::ptr face, TopoDS_Shape& re TopoDS_Shape surface_shape; if (!convert_shape(fs->FaceSurface(), surface_shape)) return false; - // FIXME: Assert this obtaines the only face + // FIXME: Assert this obtains the only face TopExp_Explorer exp(surface_shape, TopAbs_FACE); if (!exp.More()) return false; diff --git a/src/ifcgeom/kernels/opencascade/faceset_helper.cpp b/src/ifcgeom/kernels/opencascade/faceset_helper.cpp index 683a3c6d32..e518bc9ef6 100644 --- a/src/ifcgeom/kernels/opencascade/faceset_helper.cpp +++ b/src/ifcgeom/kernels/opencascade/faceset_helper.cpp @@ -66,7 +66,7 @@ IfcGeom::OpenCascadeKernel::faceset_helper::faceset_helper( // double bdiff = std::sqrt(box.SquareExtent()); // @todo the bounding box diagonal is not used (see above) - // because we're explicitly interested in the miminal + // because we're explicitly interested in the minimal // dimension of the element to limit the tolerance (for sheet- // like elements for example). But the way below is very // dependent on orientation due to the usage of the diff --git a/src/ifcgeom/kernels/opencascade/loop.cpp b/src/ifcgeom/kernels/opencascade/loop.cpp index 64f3f74a92..da117091cb 100644 --- a/src/ifcgeom/kernels/opencascade/loop.cpp +++ b/src/ifcgeom/kernels/opencascade/loop.cpp @@ -224,7 +224,7 @@ bool OpenCascadeKernel::convert(const taxonomy::loop::ptr loop, TopoDS_Wire& wir } if (converted_segments.Extent() == 0) { - Logger::Message(Logger::LOG_ERROR, "No segment succesfully converted:", loop->instance); + Logger::Message(Logger::LOG_ERROR, "No segment successfully converted:", loop->instance); return false; } diff --git a/src/ifcgeom/mapping/IfcCompositeCurve.cpp b/src/ifcgeom/mapping/IfcCompositeCurve.cpp index be5e723785..a94b2803af 100644 --- a/src/ifcgeom/mapping/IfcCompositeCurve.cpp +++ b/src/ifcgeom/mapping/IfcCompositeCurve.cpp @@ -163,7 +163,7 @@ taxonomy::ptr mapping::map_impl(const IfcSchema::IfcCompositeCurve* l, TopoDS_Wi } if (converted_segments.Extent() == 0) { - Logger::Message(Logger::LOG_ERROR, "No segment succesfully converted:", l); + Logger::Message(Logger::LOG_ERROR, "No segment successfully converted:", l); return false; } diff --git a/src/ifcgeom/mapping/IfcFace.cpp b/src/ifcgeom/mapping/IfcFace.cpp index 215b0f7c30..4cb049b681 100644 --- a/src/ifcgeom/mapping/IfcFace.cpp +++ b/src/ifcgeom/mapping/IfcFace.cpp @@ -91,7 +91,7 @@ taxonomy::ptr mapping::map_impl(const IfcSchema::IfcFace* l, TopoDS_Shape& resul TopoDS_Shape surface_shape; if (!convert_shape(fs->FaceSurface(), surface_shape)) return false; - // FIXME: Assert this obtaines the only face + // FIXME: Assert this obtains the only face TopExp_Explorer exp(surface_shape, TopAbs_FACE); if (!exp.More()) return false; diff --git a/src/ifcgeom/mapping/IfcTrimmedCurve.cpp b/src/ifcgeom/mapping/IfcTrimmedCurve.cpp index cc5d49596e..815b4d6484 100644 --- a/src/ifcgeom/mapping/IfcTrimmedCurve.cpp +++ b/src/ifcgeom/mapping/IfcTrimmedCurve.cpp @@ -113,7 +113,7 @@ taxonomy::ptr mapping::map_impl(const IfcSchema::IfcTrimmedCurve* inst) { // Fix from @sanderboer to compare using model tolerance, see #744 // Made dependent on radius, see #928 - // A good critereon for determining whether to take full curve + // A good criterion for determining whether to take full curve // or trimmed segment would be whether there are other curve segments or this // is the only one. boost::optional num_segments; @@ -170,7 +170,7 @@ taxonomy::ptr mapping::map_impl(const IfcSchema::IfcTrimmedCurve* inst) { TopoDS_Vertex v0, v1; TopExp::Vertices(e, v0, v1); e = TopoDS::Edge(BRepBuilderAPI_MakeEdge(v0, v1).Edge().Oriented(e.Orientation())); - Logger::Warning("Subsituted edge with linear approximation", l); + Logger::Warning("Substituted edge with linear approximation", l); } } diff --git a/src/ifcgeom/taxonomy.h b/src/ifcgeom/taxonomy.h index 80c684df3d..7ffa57816c 100644 --- a/src/ifcgeom/taxonomy.h +++ b/src/ifcgeom/taxonomy.h @@ -635,7 +635,7 @@ typedef item const* ptr; // @todo somehow account for the fact that curve in IFC can be trimmed curve, polyline and composite curve as well. item::ptr basis; - // @todo does this make sense? this is to accomodate for the fact that orientation is defined on both TrimmedCurve as well CompCurveSegment + // @todo does this make sense? this is to accommodate for the fact that orientation is defined on both TrimmedCurve as well CompCurveSegment boost::optional orientation_2; trimmed_curve() : basis(nullptr), orientation_2(true) {} diff --git a/src/ifcopenshell-python/ifcopenshell/api/style/assign_material_style.py b/src/ifcopenshell-python/ifcopenshell/api/style/assign_material_style.py index 921be2e1a3..bf2b54dfb5 100644 --- a/src/ifcopenshell-python/ifcopenshell/api/style/assign_material_style.py +++ b/src/ifcopenshell-python/ifcopenshell/api/style/assign_material_style.py @@ -37,7 +37,7 @@ class Usecase: style should be used. Typically this is the Model BODY context. :type context: ifcopenshell.entity_instance.entity_instance :param should_use_presentation_style_assignment: This is a technical - detail to accomodate a bug in Revit. This should always be left as + detail to accommodate a bug in Revit. This should always be left as the default of False, unless you are finding that colours aren't showing up in Revit. In that case, set it to True, but keep in mind that this is no longer a valid IFC. Blame Autodesk. diff --git a/src/ifcopenshell-python/ifcopenshell/api/style/assign_representation_styles.py b/src/ifcopenshell-python/ifcopenshell/api/style/assign_representation_styles.py index d8d787ec6d..b29075faf0 100644 --- a/src/ifcopenshell-python/ifcopenshell/api/style/assign_representation_styles.py +++ b/src/ifcopenshell-python/ifcopenshell/api/style/assign_representation_styles.py @@ -42,7 +42,7 @@ class Usecase: more items than styles, the last style is used. :type styles: list[ifcopenshell.entity_instance.entity_instance] :param should_use_presentation_style_assignment: This is a technical - detail to accomodate a bug in Revit. This should always be left as + detail to accommodate a bug in Revit. This should always be left as the default of False, unless you are finding that colours aren't showing up in Revit. In that case, set it to True, but keep in mind that this is no longer a valid IFC. Blame Autodesk. diff --git a/src/ifcparse/parse_ifcxml.cpp b/src/ifcparse/parse_ifcxml.cpp index aca972f589..922fb94091 100644 --- a/src/ifcparse/parse_ifcxml.cpp +++ b/src/ifcparse/parse_ifcxml.cpp @@ -230,7 +230,7 @@ Argument* parse_attribute_value(const IfcParse::parameter_type* ty, const std::s } if (v->isNull()) { - Logger::Error("Attribute '" + value + "' not succesfully parsed"); + Logger::Error("Attribute '" + value + "' not successfully parsed"); delete v; v = nullptr; }