diff --git a/src/Mod/Assembly/App/opendcm/core/clustergraph.hpp b/src/Mod/Assembly/App/opendcm/core/clustergraph.hpp index e8dd08ab11..55e2c32b48 100644 --- a/src/Mod/Assembly/App/opendcm/core/clustergraph.hpp +++ b/src/Mod/Assembly/App/opendcm/core/clustergraph.hpp @@ -260,7 +260,7 @@ public: /** * @brief The property bundle for GlobalEdges * - * A local edge in a cluster can hold multiple global ones. Therefor we need an extra bundle for + * A local edge in a cluster can hold multiple global ones. Therefore we need an extra bundle for * the GlobalEdges. This bundle holds the objects which are added to that global edge and its identifier. * Note that global edges don't have properties, these are only for local ones. **/ @@ -950,7 +950,7 @@ public: * @brief recreate the internal index maps for edges and vertices * * Quite many boost graph algorithms need the indices for vertices and edges which are provided by property - * maps. As we use list, and not vector, as underlaying storage we don't get that property for free and + * maps. As we use list, and not vector, as underlying storage we don't get that property for free and * need to create it ourself. To ease that procedure the internal property vertex_index_prop and edge_index_prop * can be used as property maps and can be initialized by calling this function. * diff --git a/src/Mod/Assembly/App/opendcm/core/geometry.hpp b/src/Mod/Assembly/App/opendcm/core/geometry.hpp index 8c5f723c02..b31f50f4d9 100644 --- a/src/Mod/Assembly/App/opendcm/core/geometry.hpp +++ b/src/Mod/Assembly/App/opendcm/core/geometry.hpp @@ -101,15 +101,15 @@ struct basic_geometry : public bg { typedef mpl::vector0<> sub_stack; }; -//build up stacked geometry. these are geometrys which can be splitted into multiple basic geometries. For +//build up stacked geometry. these are geometries which can be split into multiple basic geometries. For //example lines can be splittet into a point and a direction. Make sure you order the basic geometry in a -//sensible rotation/translation manner. Remember: geometrie is first rotated, than translated. Therefore +//sensible rotation/translation manner. Remember: geometry is first rotated, than translated. Therefore //everything that gets rotated and translated needs to be first, than the rotation only stuff, then the //untransformed. For a line this would be template struct stacked2_geometry { - //be sure we only stack base geometrys + //be sure we only stack base geometries BOOST_MPL_ASSERT((boost::is_base_of< bg, T1 >)); BOOST_MPL_ASSERT((boost::is_base_of< bg, T2 >)); @@ -123,7 +123,7 @@ struct stacked2_geometry { template struct stacked3_geometry { - //be sure we only stack base geometrys + //be sure we only stack base geometries BOOST_MPL_ASSERT((boost::is_base_of< bg, T1 >)); BOOST_MPL_ASSERT((boost::is_base_of< bg, T2 >)); BOOST_MPL_ASSERT((boost::is_base_of< bg, T3 >)); diff --git a/src/Mod/Assembly/App/opendcm/core/property.hpp b/src/Mod/Assembly/App/opendcm/core/property.hpp index 81f7ccad4a..ad441f91c0 100644 --- a/src/Mod/Assembly/App/opendcm/core/property.hpp +++ b/src/Mod/Assembly/App/opendcm/core/property.hpp @@ -66,11 +66,11 @@ namespace dcm { * object by assigning. If not, the data object can be uncopyable and it should be used by * retrieving its reference with get-methods. * - * Propertys are further designed to fit in the concept of compile-time modularisation. To allow the extension - * of all data-holding entities with new data types, propertys store their own purpose. That's + * Properties are further designed to fit in the concept of compile-time modularisation. To allow the extension + * of all data-holding entities with new data types, properties store their own purpose. That's * done by extending the property struct with a second typedef which is named kind and which specifies of which * kind the property is. That means, that this typedef defines when the property shall be used and for which - * context it is designed for. Depending on the propertys kind, it will be added to different places inside the dcm. + * context it is designed for. Depending on the properties kind, it will be added to different places inside the dcm. * A property of kind @ref vertex_property will added to vertices, a property of kind @ref object_property to all * objects and so on. * @@ -151,7 +151,7 @@ struct cluster_property {}; *@brief Identifier for general object properties * * A property with this struct as 'kind' type will be added to all existing objects, no matter of individual - * type. Use this only for general, sharable properties. To add a property to a single object, use its + * type. Use this only for general, shareable properties. To add a property to a single object, use its * type as 'kind'. **/ struct object_property {}; @@ -357,7 +357,7 @@ struct is_object_property : boost::is_same {} * Boost graph algorithms use property maps as generic storage for process data. In most cases the user * needs to provide these maps. The simplest way is to create them on the stack right before their * usage. If, however, the stored information is of use and one wants to store it permanently, this way - * is not practical. Therefor vertex and edge properties were introduced, they allow to store arbitrary + * is not practical. Therefore vertex and edge properties were introduced, they allow to store arbitrary * information at their entity. To use this in combination with boost graph algorithms, this class can * be used to expose vertex and edge properties as propertie maps to the boost algorithms. All process * information is then stored permanently at the relevant position. @@ -414,7 +414,7 @@ struct PropertyOwner { /** * @brief Access properties * - * Returns a reference to the propertys actual value. The property type has to be owned by this class, + * Returns a reference to the properties actual value. The property type has to be owned by this class, * which means it needs to be in the typelist that was given as template parameter to this class. * @tparam Prop property type which should be accessed * @return Prop::type& a reference to the properties actual value. diff --git a/src/Mod/Assembly/App/opendcm/module3d/imp/clustermath_imp.hpp b/src/Mod/Assembly/App/opendcm/module3d/imp/clustermath_imp.hpp index c4c8b648d4..ac2ab4a691 100644 --- a/src/Mod/Assembly/App/opendcm/module3d/imp/clustermath_imp.hpp +++ b/src/Mod/Assembly/App/opendcm/module3d/imp/clustermath_imp.hpp @@ -529,7 +529,7 @@ void ClusterMath::applyClusterScale(Scalar scale, bool isFixed) { m_transform*=typename Kernel::Transform3D::Scaling(1./(scale*SKALEFAKTOR)); m_ssrTransform*=typename Kernel::Transform3D::Scaling(1./(scale*SKALEFAKTOR)); typename Kernel::DiffTransform3D diff(m_transform); - //now calculate the scaled geometrys + //now calculate the scaled geometries typedef typename std::vector::iterator iter; for(iter it = m_geometry.begin(); it != m_geometry.end(); it++) { (*it)->recalculate(diff); diff --git a/src/Mod/Assembly/App/opendcm/module3d/imp/solver_imp.hpp b/src/Mod/Assembly/App/opendcm/module3d/imp/solver_imp.hpp index b6032835ba..af1d95b100 100644 --- a/src/Mod/Assembly/App/opendcm/module3d/imp/solver_imp.hpp +++ b/src/Mod/Assembly/App/opendcm/module3d/imp/solver_imp.hpp @@ -277,7 +277,7 @@ void SystemSolver::solveCluster(std::shared_ptr cluster, Sys& sys) //initialise the system with now known size Mes mes(cluster, params, constraints); - //iterate all geometrys again and set the needed maps + //iterate all geometries again and set the needed maps it = boost::vertices(*cluster); for(; it.first != it.second; it.first++) { diff --git a/src/Mod/Assembly/App/opendcm/moduleShape3d/generator.hpp b/src/Mod/Assembly/App/opendcm/moduleShape3d/generator.hpp index 4dd4e57ec1..8b2eede601 100644 --- a/src/Mod/Assembly/App/opendcm/moduleShape3d/generator.hpp +++ b/src/Mod/Assembly/App/opendcm/moduleShape3d/generator.hpp @@ -155,7 +155,7 @@ struct segment3D { if(base::m_shape->getGeometryType() == dcm::tag::weight::segment::value) { - //link the line geometrie to our shape + //link the line geometry to our shape std::shared_ptr g1 = base::m_system->createGeometry3D(); base::append(g1); g1->template linkTo(base::m_shape,0);