Merge 'master' branch into 'V9_dev' branch.

[modules/smesh.git] / src / StdMeshers / StdMeshers_CompositeSegment_1D.cxx

diff --git a/src/StdMeshers/StdMeshers_CompositeSegment_1D.cxx b/src/StdMeshers/StdMeshers_CompositeSegment_1D.cxx
index 3d04f7aac72630c7ef146c881c7b6ebd8c04eda5..aa3f460a4ce0d4a4ada50855217f3f906b7e5fbc 100644 (file)
--- a/src/StdMeshers/StdMeshers_CompositeSegment_1D.cxx
+++ b/src/StdMeshers/StdMeshers_CompositeSegment_1D.cxx
@@ -20,7 +20,7 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
-//  SMESH SMESH : implementaion of SMESH idl descriptions
+//  SMESH SMESH : implementation of SMESH idl descriptions
 //  File   : StdMeshers_CompositeSegment_1D.cxx
 //  Module : SMESH
 //
@@ -126,7 +126,7 @@ namespace {
      * \brief Restore nodes on internal vertices of a complex side
      * \param event - algo_event or compute_event itself (of SMESH_subMesh)
      * \param eventType - ALGO_EVENT or COMPUTE_EVENT (of SMESH_subMesh)
-     * \param subMesh - the submesh where the event occures
+     * \param subMesh - the submesh where the event occurs
      * \param data - listener data stored in the subMesh
      * \param hyp - hypothesis, if eventType is algo_event
      */
@@ -243,11 +243,9 @@ namespace {
 //=============================================================================
 
 StdMeshers_CompositeSegment_1D::StdMeshers_CompositeSegment_1D(int         hypId,
-                                                               int         studyId,
                                                                SMESH_Gen * gen)
-  :StdMeshers_Regular_1D(hypId, studyId, gen)
+  :StdMeshers_Regular_1D(hypId, gen)
 {
-  MESSAGE("StdMeshers_CompositeSegment_1D::StdMeshers_CompositeSegment_1D");
   _name = AlgoName();
 }
 
@@ -375,7 +373,7 @@ bool StdMeshers_CompositeSegment_1D::Compute(SMESH_Mesh &         aMesh,
   if ( side->NbEdges() < 2 )
     return StdMeshers_Regular_1D::Compute( aMesh, aShape );
 
-  // update segment lenght computed by StdMeshers_AutomaticLength
+  // update segment length computed by StdMeshers_AutomaticLength
   const list <const SMESHDS_Hypothesis * > & hyps = GetUsedHypothesis(aMesh, aShape);
   if ( !hyps.empty() ) {
     StdMeshers_AutomaticLength * autoLenHyp = const_cast<StdMeshers_AutomaticLength *>