Merge 'master' branch into 'V9_dev' branch.

doc/salome/examples/free_boundaries.py

@@ -19,7 +19,7 @@ for fi in range(len(faces)):
     fid = geompy.addToStudyInFather(cut, faces[fi], "Face %d" % (fi+1))
     isSuccess, closedWires, openWires = geompy.GetFreeBoundary(faces[fi])
     if isSuccess:
-        print("Check free boudaries in face %d: OK" % (fi+1))
+        print("Check free boundaries in face %d: OK" % (fi+1))
         print("-- Nb of closed boundaries = %d" % len(closedWires))
         for wi in range(len(closedWires)):
             wid = geompy.addToStudyInFather(faces[fi], closedWires[wi], "Closed wire %d" % (wi+1))
@@ -30,6 +30,6 @@ for fi in range(len(faces)):
             pass
         pass
     else:
-        print("Check free boudaries in face %d: KO" % (fi+1))
+        print("Check free boundaries in face %d: KO" % (fi+1))
         pass
     pass

doc/salome/gui/GEOM/input/annotation.doc

@@ -3,7 +3,7 @@
 \page annotation_page Shape annotation
 
 <b> Annotation </b> functionality allows showing in the viewer special user-defined text label connected to corresponding part of a CAD model with a line.
-Annotation text is always parallel to the screen and horizontal. It is is not zoomed or rotated when a 3D scene is zoomed or rotated by the user.
+Annotation text is always parallel to the screen and horizontal. It is not zoomed or rotated when a 3D scene is zoomed or rotated by the user.
 The annotation text is defined using UTF-8 encoding and thus support any Unicode characters.
 
 There are several algorithms for the annotation position calculation during the scene manipulations (panning, zooming, rotation):

doc/salome/gui/GEOM/input/archimede.doc

@@ -13,7 +13,7 @@ water-line of the object plunged into the water (in Z direction).
 \n <b>TUI Command:</b>
 <em>geompy.Archimede(Shape,Weight,WaterDensity,MeshingDeflection),</em>
  where \em Shape is a shape to put into the water, \em Weight is a weight of
-the shape, \em WaterDensity  is density of water, \em MeshingDeflection is a
+the shape, \em WaterDensity is density of water, \em MeshingDeflection is a
 deflection of the mesh, using to compute the section.
 \n <b>Arguments:</b> Name + 1 shape  + 3 values (Weight, Water Density
 & Meshing Deflection).

doc/salome/gui/GEOM/input/blocks_operations.doc

@@ -2,7 +2,7 @@
 
 \page blocks_operations_page Blocks Operations
 
-The solids built by blocks \ref  build_by_blocks_page can be
+The solids built by blocks \ref build_by_blocks_page can be
 processed with blocks transformation operations: 
 
 <ul>

doc/salome/gui/GEOM/input/check_self_intersections.doc

@@ -45,7 +45,7 @@ This operation allows quickly detecting self-interferences of the given shape us
 The algorithm works on the face level, i.e. it computes only face-to-face intersections. No additional intersection types are computed.
 
 This can be useful to detect all intersections between subshapes of type "surface" in an assembly.
-The result quality will depend on the tesselation quality. However, small deflection values can significantly decrease the performance of the algorithm.
+The result quality will depend on the tessellation quality. However, small deflection values can significantly decrease the performance of the algorithm.
 Nevertheless, the performance of Fast Intersect algorithm is much higher than that of the topological intersection.
 
 \image html measures13.png
@@ -53,7 +53,7 @@ Nevertheless, the performance of Fast Intersect algorithm is much higher than th
 In this dialog:
 
 - \b Object - the checked object. \b Selection button allows picking it in the viewer or in the object browser.
-- <b>Deflection coefficient</b> -  a linear deflection coefficient that defines the tesselation quality. If theDeflection <= 0, default deflection 0.001 is used.
+- <b>Deflection coefficient</b> -  a linear deflection coefficient that defines the tessellation quality. If theDeflection <= 0, default deflection 0.001 is used.
 - <b>Detect gaps with tolerance</b> specifies the distance between shapes used for detecting gaps:
      - if theTolerance <= 0, the algorithm detects intersections;
      - if theTolerance > 0, the algorithm detects gapss. 
@@ -67,7 +67,7 @@ If no interferences are selected, all of them are published in the study. Each i
 \n <b>TUI Command:</b> <em>geompy.CheckSelfIntersectionsFast(theShape, theDeflection, theTolerance),</em> \n
 where: \n
 \em theShape is the shape checked for validity. \n
-\em theDeflection that specifies the quality of tesselation. 
+\em theDeflection that specifies the quality of tessellation. 
 \em theTolerance Specifies the distance between shapes used for detecting gaps.
 
 See also a \ref tui_check_self_intersections_fast_page "TUI example".

doc/salome/gui/GEOM/input/creating_circle.doc

@@ -15,7 +15,7 @@ Radius)</em>
 \n <b>Arguments:</b> Name + 1 vertex (for the center) + 1 edge (for
 the direction) + Radius.
 
-\note By default it is presumed that the <b>Center Point</b> is located at the  Origin of the global
+\note By default it is presumed that the <b>Center Point</b> is located at the Origin of the global
 coordinate system, and the  \b Vector corresponds to OZ axis of the global
 coordinate system.
 

doc/salome/gui/GEOM/input/creating_explode.doc

@@ -8,7 +8,7 @@ select <b>New Entity > Explode</b>. This operation opens the
 
 \image html neo-obj1.png
 
-To create a list of  sub-shapes (vertices, edges, wires etc.) of the
+To create a list of sub-shapes (vertices, edges, wires etc.) of the
 given shape using the \b Explode operation, you need to define the <b>Main
 Object</b>, which will be exploded and the <b>Type of Sub-shapes</b> you wish to
 obtain from it.

doc/salome/gui/GEOM/input/creating_lcs.doc

@@ -8,7 +8,7 @@ To create a <b>Local Coordinate System</b> in the <b>Main Menu</b> select <b>New
 \n Firstly, you can define the values of X, Y, and Z coordinates of origin and the directions of X and Y axes directly in the menu.
 \n <b>TUI command:</b> <em>geompy.MakeMarker(OX, OY, OZ, XDX, XDY, XDZ,
 YDX, YDY, YDZ)</em>, where OX, OY, OZ are coordinates of the origin of
-LCS, XDX, XDY, XDZ is a vector of OX  direction of the LCS and YDX,
+LCS, XDX, XDY, XDZ is a vector of OX direction of the LCS and YDX,
 YDY, YDZ is a a vector of OY direction of the LCS.
 \n <b>Arguments:</b> Name + Coordinates of origin, X axis direction, Y axis direction.
 

doc/salome/gui/GEOM/input/creating_line.doc

@@ -9,7 +9,7 @@ There are 2 algorithms to create a \b Line in the 3D space.
 The Result of each operation will be a GEOM_Object (edge).
 
 \n Firstly you can define a \b Line by \b Point1 and \b Point2,
-which are the points through  which the \b Line passes.
+which are the points through which the \b Line passes.
 \n <b>TUI Command:</b> <em>geompy.MakeLineTwoPnt(Point1, Point2)</em>
 \n <b>Arguments:</b> Name + 2 vertices.
 
@@ -30,7 +30,7 @@ which are the points through  which the \b Line passes.
 \b NB! There is another way to create a line, which is currently
 accessible only via \b TUI commands.
 
-You can define a line  passing through the given \b Point and parallel
+You can define a line passing through the given \b Point and parallel
 to the given \b Vector.
 \n <b>TUI Command:</b> <em>geompy.MakeLine(Point, Vector)</em>
 

doc/salome/gui/GEOM/input/creating_plane.doc

@@ -8,7 +8,7 @@ Basic - > Plane</b>
 \n There are three algorithms to create a plane in the 3D space.
 \n The \b Result of each operation will be a GEOM_Object (face).
 
-\n Firstly, you can define a \b Plane by a \b Point through which  the
+\n Firstly, you can define a \b Plane by a \b Point through which the
 plane passes, a \b Vector giving a normal of the plane and a <b>Size
 of the Plane</b> (size of a side of quadrangle face, representing the
 plane).
@@ -19,7 +19,7 @@ the size of the plane).
 \image html plane1.png
 
 \n Secondly, you can define a \b Plane by three \b Points through
-which  the plane passes and a <b>Size of the Plane</b>.
+which the plane passes and a <b>Size of the Plane</b>.
 \n <b>TUI Command:</b> <em>geompy.MakePlaneThreePnt(Point1, Point2, Point3, TrimSize)</em>
 \n <b>Arguments:</b> Name + 3 vertices + 1 value (to define the size
 of the plane).

doc/salome/gui/GEOM/input/creating_polyline.doc

@@ -9,7 +9,7 @@ To create a <b>2D Polyline</b> select in the main menu  <b>New Entity -> Basic -
 \image html polyline_dlg.png
 
 A polyline represents a section or a set of sections. Each section is constructed from a sequence of 2D points
-connected  by either linear segments or an interpolation curve. Every section has its own attributes:
+connected by either linear segments or an interpolation curve. Every section has its own attributes:
 - \b Name, 
 - \b Type (Polyline or Spline),
 - \b Closed flag.

doc/salome/gui/GEOM/input/creating_sketcher.doc

@@ -2,7 +2,7 @@
 
 \page create_sketcher_page 2D Sketcher
 
-The 2D Sketcher allows drawing  arbitrary 2D shapes. 
+The 2D Sketcher allows drawing arbitrary 2D shapes. 
 
 To create a <b>2D Sketch</b> select in the main menu  <b>New Entity -> Basic -> 2D Sketch</b>. 
 
@@ -73,7 +73,7 @@ If an \b ark radio button is chosen, \b Point or \b Direction define the locatio
 
 \image html 2dsketch12.png
 
-- \b Radius radio-button allows creating a more limited arc segment by defining a custom  ark radius, which must be greater than half of the distance between the last point and the end point of the arc. 
+- \b Radius radio-button allows creating a more limited arc segment by defining a custom ark radius, which must be greater than half of the distance between the last point and the end point of the arc. 
 	
 \image html 2dsketch8.png
 

doc/salome/gui/GEOM/input/creating_sphere.doc

@@ -16,11 +16,11 @@
 \n Secondly, you can define a \b Sphere with the center at the origin of
 coordinate system by the \b Radius.
 \n <b>TUI Command:</b> <em>geompy. MakeSphereR(Radius)</em>
-\n <b>Arguments:</b> Name + 1  value (Radius from the origin).
+\n <b>Arguments:</b> Name + 1 value (Radius from the origin).
 
 \image html sphere2.png
 
-\n <b>NB!</b> The is another way to create a\b  Sphere, which is
+\n <b>NB!</b> The is another way to create a \b Sphere, which is
 currently accessible only via \b TUI commands.
 \n You can define the \b Sphere by the coordinates of the <b>Center
 Point</b> and its \b Radius (in this way you don't need to create it in advance).

doc/salome/gui/GEOM/input/creating_squareface.doc

@@ -4,7 +4,7 @@
 
 A primitive called \b Rectangle is a rectangular face of certain dimensions and orientation
 
-To create a \b Rectangle  in the <b>Main Menu</b> select <b>New Entity - >
+To create a \b Rectangle in the <b>Main Menu</b> select <b>New Entity - >
 Primitives - > Rectangle</b>
 
 \n There are 2 algorithms to create a \b Rectangle in the 3D space. 
@@ -15,7 +15,7 @@ of coordinates defining its boundaries by the height and the width and its axis
 radio buttons (OXY, OYZ or OZX).This 
 means that the \b Rectangle will lie in "OXY", "OYZ" or "OZX" plane correspondingly.
 \n <b>TUI Command:</b> <em>geompy.MakeFaceHW(Height, Width, Orientation)</em>
-\n <b>Arguments:</b> Name + 3 values (Dimensions at origin: heigth, width and
+\n <b>Arguments:</b> Name + 3 values (Dimensions at origin: height, width and
 orientation).
 
 

doc/salome/gui/GEOM/input/display_mode.doc

@@ -3,7 +3,7 @@
 \page display_mode_page Display Mode
 
 \n This option is relevant for viewing 3D objects. Wireframe mode means
-that you can see only  edges of the object, while its shells remain
+that you can see only edges of the object, while its shells remain
 transparent. Shading mode means that the shells are filled with color.
 
 \n To change the display mode right-click on this geometrical object

doc/salome/gui/GEOM/input/explode_on_blocks_operation.doc

@@ -16,7 +16,7 @@ from a compound.
 \n <b>TUI Command:</b> <em>geompy.MakeBlockExplode(Compound,
 MinNbFaces, MaxNbFaces),</em> where \em Compound is a compound to be
 exploded into the blocks, \em MinNbFaces, \em MaxNbFaces are correspondingly
-the minimal and  the maximal number of faces of the resulting blocks.
+the minimal and the maximal number of faces of the resulting blocks.
 \n <b>Arguments:</b> 1 compound + 2 integers (min. and max. number of
 faces in the block to be extracted).
 

doc/salome/gui/GEOM/input/fast_intersection.doc

@@ -40,7 +40,7 @@ further analysis (see below).
 
 \note The result quality depends on the quality of triangulation. Changing the value of the deflection coefficient
 parameter can strongly affect the result. However, small values of the deflection coefficient might lead to
-some performance loss of the algorithm, as number of triangles of the tesselation mesh depends on this parameter.
+some performance loss of the algorithm, as number of triangles of the tessellation mesh depends on this parameter.
 
 Press <b>Apply and Close</b> or \b Apply button to store the selected sub-shapes in the study for further analysis.
 The selection will be published as a compound containing intersected sub-shapes from both source objects.

doc/salome/gui/GEOM/input/managing_dimensions.doc

@@ -12,7 +12,7 @@ It can be accessed from the main menu via <b>Measures -> Dimensions -> Manage Di
 
 <b>List of Dimensions</b>
 
-This dialog provides the list of dimensions shown in the view for the selected geometrical <b>Object</b>. The list items are sorted by  dimension type: <b>Distance</b>, <b>Diameter</b> and <b>Angle</b>. 
+This dialog provides the list of dimensions shown in the view for the selected geometrical <b>Object</b>. The list items are sorted by dimension type: <b>Distance</b>, <b>Diameter</b> and <b>Angle</b>. 
 
 It is possible to show/hide a dimension in the view by checking on/off the box to the left of its name. 
 
@@ -40,7 +40,7 @@ The following dimensions can be shown:
 </ul>
 </li>
 
-<li> <b>Diameter </b> of an an arc, a circular edge or face, a sphere, a cylinder, a cone or a  torus.</li> 
+<li> <b>Diameter </b> of an an arc, a circular edge or face, a sphere, a cylinder, a cone or a torus.</li> 
 
 <li> <b>Angle.</b> The angle dimension can be defined in one of two possible ways :  </li>
 

doc/salome/gui/GEOM/input/modify_location_operation.doc

@@ -22,9 +22,9 @@ System in the center of it is to the left .
 
 \image html image30.png
 
-\n The second algorithm  modifies the location of the \b Object(s) using \b Start
+\n The second algorithm modifies the location of the \b Object(s) using \b Start
 and \b End \b LCS, although the final position of the object will not
-coincide with the center of  either of the two systems. In this method
+coincide with the center of either of the two systems. In this method
 the object is shifted from its initial position by the value of the
 remainder after subtraction of the coordinates of the <b>Start LCS</b> from
 the coordinates of the <b>End LCS</b>.
@@ -53,7 +53,7 @@ translated cube at the position (-100;0;0)
 \image html image4.png
 
 The third algorithm modifies the location of the \b Object(s) using the <b>Path object</b> (Wire or Edge)
-and the \b Distance parameter (ranging from 0 to 1) defining  how far the object will move along the path.
+and the \b Distance parameter (ranging from 0 to 1) defining how far the object will move along the path.
 \n <b>Create a copy</b> checkbox allows to keep the initial object,
 otherwise it will be removed.
 \n <b>Select Unpublished edges</b> checkbox allows to select sub-shape edges on

doc/salome/gui/GEOM/input/restore_presentation_parameters.doc

@@ -27,7 +27,7 @@ The resulting shape inherits the sub-shapes and the colour of Box_1.
 
 \image html restore-ss-viewer-cut.png "The resulting shape"
 
-Second, we examine the case when the  resulting shape is composed from multiple arguments
+Second, we examine the case when the resulting shape is composed from multiple arguments
 (after all Boolean operations, except for Cut, or after the partition with
 several object shapes, or if the resulting shape is a compound).
 

idl/GEOM_Gen.idl

@@ -386,7 +386,7 @@ module GEOM
      *
      *  This function is useful for the compounds only; for simple shapes it
      *  exactly the same value as GetShapeType().
-     *  Note, that compounds are procesed recursively.
+     *  Note, that compounds are processed recursively.
      *
      *  \sa GetShapeType(), GetTopologyType(), GetMaxShapeType()
      */
@@ -397,7 +397,7 @@ module GEOM
      *
      *  This function is useful for the compounds only; for simple shapes it
      *  exactly the same value as GetShapeType().
-     *  Note, that compounds are procesed recursively.
+     *  Note, that compounds are processed recursively.
      *
      *  \sa GetShapeType(), GetTopologyType(), GetMinShapeType()
      */
@@ -1721,7 +1721,7 @@ module GEOM
 
 
     /*!
-     *  \brief Add / Remove material to / from  a solid by extrusion of the base shape on the given distance.
+     *  \brief Add / Remove material to / from a solid by extrusion of the base shape on the given distance.
      *  \param theInitShape Initial shape on which to perform the feature.It has to be a solid or 
      *   a compound made of a single solid
      *  \param theBase Edge or wire defining the base shape to be extruded. 
@@ -1811,7 +1811,7 @@ module GEOM
      *
      *  The path shape can be a wire or an edge.
      *  the several profiles can be specified in the several locations of path.
-     *  \param theSeqBases - list of  Bases shape to be extruded.
+     *  \param theSeqBases - list of Bases shape to be extruded.
      *  \param theLocations - list of locations on the path corresponding
      *                        specified list of the Bases shapes. Number of locations
      *                        should be equal to number of bases or list of locations can be empty.
@@ -1845,7 +1845,7 @@ module GEOM
      *
      *  The path shape can be a shell or a face.
      *  the several profiles can be specified in the several locations of path.
-     *  \param theSeqBases - list of  Bases shape to be extruded.
+     *  \param theSeqBases - list of Bases shape to be extruded.
      *  \param theSeqSubBases - list of corresponding sub-shapes of section shapes.
      *  \param theLocations - list of locations on the path corresponding
      *                        specified list of the Bases shapes. Number of locations
@@ -1893,7 +1893,7 @@ module GEOM
      *  \param theBase Base shape to be extruded.
      *  \param thePath Path shape to extrude the base shape along it.
      *  \param theVec Vector defines a constant binormal direction to keep the
-     *                same angle beetween the Direction and the sections
+     *                same angle between the Direction and the sections
      *                along the sweep surface.
      *  \param IsGenerateGroups flag that tells if it is necessary to
      *         return groups (true) or not (false).
@@ -2830,7 +2830,7 @@ module GEOM
 
     /*!
      *  \brief Create a quadrangle face from four edges. Order of Edges is not
-     *  important. It is  not necessary that edges share the same vertex.
+     *  important. It is not necessary that edges share the same vertex.
      *  \param theEdge1,theEdge2,theEdge3,theEdge4 Edges for the face bound.
      *  \return New GEOM_Object, containing the created face.
      */
@@ -2865,7 +2865,7 @@ module GEOM
      *  \brief Create a hexahedral solid, bounded by the six given faces. Order of
      *  faces is not important. 
      *
-     *  It is  not necessary that Faces share the same edge.
+     *  It is not necessary that Faces share the same edge.
      *  \param theFace1,theFace2,theFace3,theFace4,theFace5,theFace6 Faces for the hexahedral solid.
      *  \return New GEOM_Object, containing the created solid.
      */
@@ -4174,8 +4174,8 @@ module GEOM
     SALOMEDS::TMPFile GetTexture(in long theID, out long theWidth, out long theHeight);
 
     /*!
-     * \brief Get list of all avaiable texture IDs
+     * \brief Get list of all available texture IDs
-     * \return list of all texture IDs avaiable for the current study
+     * \return list of all texture IDs available for the current study
      */
     ListOfLong GetAllTextures();
 
@@ -4534,7 +4534,7 @@ module GEOM
     /*!
      *  \brief Detect self-intersections of the given shape with algorithm based on mesh intersections.
      *  \param theShape Shape to check validity of.
-     *  \param theDeflection Linear deflection coefficient that specifies quality of tesselation.
+     *  \param theDeflection Linear deflection coefficient that specifies quality of tessellation.
      *  \param theTolerance Specifies a distance between sub-shapes used for detecting gaps:
      *                       - if \a theTolerance <= 0, algorithm detects intersections
      *                       - if \a theTolerance > 0, algorithm detects gaps
@@ -4547,9 +4547,9 @@ module GEOM
 					out ListOfLong theIntersections);
 
     /*!
-     *  \brief Check boolean and partition operations agruments.
+     *  \brief Check boolean and partition operations arguments.
-     *  \param theShape the agrument of an operation to be checked.
+     *  \param theShape the argument of an operation to be checked.
-     *  \return TRUE if the agrument is valid for a boolean or partition
+     *  \return TRUE if the argument is valid for a boolean or partition
      *          operation; FALSE otherwise.
      */
     boolean CheckBOPArguments (in GEOM_Object theShape);
@@ -4561,7 +4561,7 @@ module GEOM
      *  \param theTolerance Specifies a distance between shapes used for detecting gaps:
      *                       - if \a theTolerance <= 0, algorithm detects intersections
      *                       - if \a theTolerance > 0, algorithm detects gaps
-     *  \param theDeflection Linear deflection coefficient that specifies quality of tesselation:
+     *  \param theDeflection Linear deflection coefficient that specifies quality of tessellation:
      *                       - if \a theDeflection <= 0, default deflection 0.001 is used
      *  \param theIntersections1 Output: contains list of sub-shapes IDs from 1st shape that localize intersection
      *  \param theIntersections2 Output: contains list of sub-shapes IDs from 2nd shape that localize intersection
@@ -4699,7 +4699,7 @@ module GEOM
   interface GEOM_IGroupOperations : GEOM_IOperations
   {
     /*!
-     *  \brief Creates a new group which will store  sub-shapes of theMainShape
+     *  \brief Creates a new group which will store sub-shapes of theMainShape
      *  \param theMainShape is a GEOM_Object on which the group is selected
      *  \param theShapeType defines a shape type of the group
      *  \return a newly created GEOM group
@@ -5022,7 +5022,7 @@ module GEOM
     
     /*!
      *  \brief Returns a GEOM_Object defined by its IOR
-     *  \param theIOR a string containg an IOR of the requested GEOM_Object
+     *  \param theIOR a string containing an IOR of the requested GEOM_Object
      */
     GEOM_Object GetIORFromString (in string theIOR);
 

resources/ShHealing

@@ -233,8 +233,8 @@ ShapeProcess.SameParameter.Tolerance3d			: 1.e-7
 ! FixShape.FixOrientationMode		: Mode for fixing face orientation (default - -1, yes - 1 , no - 0).
 ! FixShape.FixMissingSeamMode		: Mode for fixing face missing seam (default - -1, yes - 1 , no - 0).
 ! FixShape.FixSmallAreaWireMode		: Mode for fixing small area wires (default - -1, yes - 1 , no - 0).
-! FixShape.ModifyTopologyMode		: Mode allowing of modifing of topology (default - 0, yes - 1 , no - 0).
+! FixShape.ModifyTopologyMode		: Mode allowing for modifying of topology (default - 0, yes - 1 , no - 0).
-! FixShape.ModifyGeometryMode		: Mode allowing of modifing of geometry (default - 1, yes - 1 , no - 0).
+! FixShape.ModifyGeometryMode		: Mode allowing for modifying of geometry (default - 1, yes - 1 , no - 0).
 ! FixShape.ClosedWireMode		: Mode defining whether the wire is to be closed. (default - 1, yes - 1 , no - 0).
 ! FixShape.PreferencePCurveMode		: Mode defining of preference of 2d representation (default - 1, yes - 1 , no - 0). 
 ! FixShape.FixReorderMode		: Mode for fixing of order of the edges in the wire (default - -1, yes - 1 , no - 0).

src/AdvancedEngine/AdvancedEngine_IOperations.cxx

@@ -1832,7 +1832,7 @@ TopoDS_Shape AdvancedEngine_IOperations::MakeThicknessReduction (gp_Ax2 theAxes,
     StdFail_NotDone::Raise("Cannot build cones of thickness reduction");
   BRepAlgoAPI_Cut cut1 (ConeExt.Shape(), ConeInt.Shape());
   if (!cut1.IsDone())
-    StdFail_NotDone::Raise("Coudn't build transition part of thickness reduction");
+    StdFail_NotDone::Raise("Couldn't build transition part of thickness reduction");
   TopoDS_Shape aReduction = cut1.Shape();
 
   // Build the thin part, if required
@@ -1846,7 +1846,7 @@ TopoDS_Shape AdvancedEngine_IOperations::MakeThicknessReduction (gp_Ax2 theAxes,
       StdFail_NotDone::Raise("Cannot build cylinders of thickness reduction");
     BRepAlgoAPI_Cut cut2 (CExt.Shape(), CInt.Shape());
     if (!cut2.IsDone())
-      StdFail_NotDone::Raise("Coudn't build thin part of thickness reduction");
+      StdFail_NotDone::Raise("Couldn't build thin part of thickness reduction");
     aThinPart = cut2.Shape();
   }
 

src/AdvancedEngine/AdvancedEngine_PipeTShapeDriver.cxx

@@ -338,13 +338,13 @@ TopoDS_Shape AdvancedEngine_PipeTShapeDriver::MakePipeTShape (const double r1, c
   // Remove small radius main pipe
   BRepAlgoAPI_Cut cut1 (fuse1.Shape(), C1Int.Shape());
   if (!cut1.IsDone()) {
-    StdFail_NotDone::Raise("Coudn't cut cylinders");
+    StdFail_NotDone::Raise("Couldn't cut cylinders");
   }
 
   // Remove small radius incident pipe => Te
   BRepAlgoAPI_Cut Te (cut1.Shape(), C2Int.Shape());
   if (!Te.IsDone()) {
-    StdFail_NotDone::Raise("Coudn't cut cylinders");
+    StdFail_NotDone::Raise("Couldn't cut cylinders");
   }
 
   TopoDS_Shape aShape = Te.Shape();

src/AdvancedGUI/AdvancedGUI_SmoothingSurfaceDlg.cxx

@@ -109,7 +109,7 @@ AdvancedGUI_SmoothingSurfaceDlg::~AdvancedGUI_SmoothingSurfaceDlg()
 void AdvancedGUI_SmoothingSurfaceDlg::Init()
 {
   // Get setting of step value from file configuration
-  SUIT_ResourceMgr* resMgr = SUIT_Session::session()->resourceMgr();
+  //SUIT_ResourceMgr* resMgr = SUIT_Session::session()->resourceMgr();
 
   initSpinBox(myDMaxSpin, 0., COORD_MAX, 0.00001, "parametric_precision" );
 

src/BasicGUI/BasicGUI_PointDlg.cxx

@@ -683,7 +683,7 @@ void BasicGUI_PointDlg::CheckBoxClicked()
 
 
 //=================================================================================
-// funcion  : getParameter()
+// function  : getParameter()
 // purpose  :
 //=================================================================================
 double BasicGUI_PointDlg::getParameter() const
@@ -693,7 +693,7 @@ double BasicGUI_PointDlg::getParameter() const
 
 
 //=================================================================================
-// funcion  : getUParameter()
+// function  : getUParameter()
 // purpose  :
 //=================================================================================
 double BasicGUI_PointDlg::getUParameter() const
@@ -703,7 +703,7 @@ double BasicGUI_PointDlg::getUParameter() const
 
 
 //=================================================================================
-// funcion  : getVParameter()
+// function  : getVParameter()
 // purpose  :
 //=================================================================================
 double BasicGUI_PointDlg::getVParameter() const

src/BlockFix/BlockFix.cxx

@@ -95,7 +95,7 @@ static void FixResult(const TopoDS_Shape& result,
 {
   for (TopExp_Explorer ex_f(result,TopAbs_FACE); ex_f.More(); ex_f.Next()) {
     TopoDS_Shape aShape = Context->Apply(ex_f.Current().Oriented(TopAbs_FORWARD));
-    // face coud not be dropped or splitted on this step
+    // face could not be dropped or split on this step
     TopoDS_Face aFace = TopoDS::Face(aShape);
     TopLoc_Location L;
     Handle(Geom_Surface) Surf = BRep_Tool::Surface(aFace,L);

src/BlockFix/BlockFix_UnionEdges.cxx

@@ -657,7 +657,7 @@ static Standard_Boolean MergeEdges(const TopTools_SequenceOfShape& SeqEdges,
       break;
     }
     if(NeedUnion) {
-      MESSAGE ("can not make analitical union => make approximation");
+      MESSAGE ("can not make analytical union => make approximation");
       TopoDS_Edge E = GlueEdgesWithPCurves(aChain, VF, VL);
       aChain.SetValue(1,E);
     }

src/BlockFix/BlockFix_UnionFaces.cxx

@@ -88,6 +88,8 @@
 #include <BRepAdaptor_HSurface.hxx>
 #include <LocalAnalysis_SurfaceContinuity.hxx>
 #include <GeomConvert_ApproxSurface.hxx>
+#include <Bnd_Box.hxx>
+#include <BRepBndLib.hxx>
 
 #include <Geom_Curve.hxx>
 #include <Geom_Line.hxx>
@@ -239,8 +241,34 @@ static Standard_Boolean IsFacesOfSameSolids
   return isSame;
 }
 
-#if OCC_VERSION_LARGE > 0x07020001
+//=======================================================================
-// for Mantis issue 0023451 by JGV
+//function : DefineMaxTolerance
+//purpose  : calculates maximum possible tolerance on edges of shape
+//=======================================================================
+static Standard_Real DefineMaxTolerance(const TopoDS_Shape& theShape)
+{
+  Standard_Real aTol = Precision::Confusion();
+
+  Standard_Real MinSize = RealLast();
+  TopExp_Explorer Explo(theShape, TopAbs_EDGE);
+  for (; Explo.More(); Explo.Next())
+  {
+    const TopoDS_Edge& anEdge = TopoDS::Edge(Explo.Current());
+    Bnd_Box aBox;
+    BRepBndLib::Add(anEdge, aBox);
+    Standard_Real Xmin, Ymin, Zmin, Xmax, Ymax, Zmax;
+    aBox.Get(Xmin, Ymin, Zmin, Xmax, Ymax, Zmax);
+    Standard_Real MaxSize = Max(Xmax - Xmin, Max(Ymax - Ymin, Zmax - Zmin));
+    if (MaxSize < MinSize)
+      MinSize = MaxSize;
+  }
+
+  if (!Precision::IsInfinite(MinSize))
+    aTol = 0.1 * MinSize;
+
+  return aTol;
+}
+
 //=======================================================================
 //function : IsTangentFaces
 //purpose  : decides: is edge on closed surface tangent or not
@@ -322,15 +350,13 @@ static Standard_Boolean HasSeamEdge(const TopoDS_Face& theFace)
 
   return Standard_False;
 }
-#endif
+
 
 //=======================================================================
 //function : IsEdgeValidToMerge
 //purpose  : Edge is valid if it is not seam or if it is a seam and the face
 //           has another seam edge.
 //=======================================================================
-#if OCC_VERSION_LARGE > 0x07020001
-// for Mantis issue 0023451 by JGV
 static Standard_Boolean IsEdgeValidToMerge(const TopoDS_Edge& theEdge,
                                            const TopoDS_Face& theFace,
                                            const Handle(Geom_Surface)& theSurface,
@@ -396,37 +422,6 @@ static Standard_Boolean IsEdgeValidToMerge(const TopoDS_Edge& theEdge,
 
   return isValid;
 }
-#else
-static Standard_Boolean IsEdgeValidToMerge(const TopoDS_Edge &theEdge,
-                                           const TopoDS_Face &theFace)
-{
-  Standard_Boolean isValid = Standard_True;
-
-  if (BRep_Tool::IsClosed(theEdge, theFace)) {
-    // This is a seam edge. Check if there are another seam edges on the face.
-    TopExp_Explorer anExp(theFace, TopAbs_EDGE);
-
-    for (; anExp.More(); anExp.Next()) {
-      const TopoDS_Shape &aShEdge = anExp.Current();
-
-      // Skip same edge.
-      if (theEdge.IsSame(aShEdge)) {
-        continue;
-      }
-
-      // Check if this edge is a seam.
-      TopoDS_Edge anEdge = TopoDS::Edge(aShEdge);
-
-      if (BRep_Tool::IsClosed(anEdge, theFace)) {
-        isValid = Standard_False;
-        break;
-      }
-    }
-  }
-
-  return isValid;
-}
-#endif
 
 //=======================================================================
 //function : Perform
@@ -494,26 +489,16 @@ TopoDS_Shape BlockFix_UnionFaces::Perform(const TopoDS_Shape& Shape)
       Handle(Geom_Surface) aBaseSurface = BRep_Tool::Surface(aFace,aBaseLocation);
       aBaseSurface = ClearRts(aBaseSurface);
       aBaseSurface = Handle(Geom_Surface)::DownCast(aBaseSurface->Copy());
-#if OCC_VERSION_LARGE > 0x07020001
-// for Mantis issue 0023451 by JGV
       Standard_Boolean ToMakeUPeriodic = Standard_False, ToMakeVPeriodic = Standard_False;
-#endif
 
       // find adjacent faces to union
       Standard_Integer i;
       for (i = 1; i <= edges.Length(); i++) {
         TopoDS_Edge edge = TopoDS::Edge(edges(i));
-#if OCC_VERSION_LARGE > 0x07020001
-// for Mantis issue 0023451 by JGV
         Standard_Boolean IsEdgeOnSeam = Standard_False;
-#endif
         if (BRep_Tool::Degenerated(edge) ||
-#if OCC_VERSION_LARGE > 0x07020001
+            !IsEdgeValidToMerge(edge, aFace, aBaseSurface,
-// for Mantis issue 0023451 by JGV
+                                IsEdgeOnSeam, ToMakeUPeriodic, ToMakeVPeriodic))
-            !IsEdgeValidToMerge(edge, aFace, aBaseSurface, IsEdgeOnSeam, ToMakeUPeriodic, ToMakeVPeriodic))
-#else
-            !IsEdgeValidToMerge(edge, aFace))
-#endif
           continue;
 
         const TopTools_ListOfShape& aList = aMapEdgeFaces.FindFromKey(edge);
@@ -526,13 +511,8 @@ TopoDS_Shape BlockFix_UnionFaces::Perform(const TopoDS_Shape& Shape)
           if (aProcessed.Contains(anCheckedFace))
             continue;
 
-#if OCC_VERSION_LARGE > 0x07020001
-// for Mantis issue 0023451 by JGV
           if (!IsEdgeValidToMerge(edge, anCheckedFace, aBaseSurface,
                                   IsEdgeOnSeam, ToMakeUPeriodic, ToMakeVPeriodic)) {
-#else
-          if (!IsEdgeValidToMerge(edge, anCheckedFace)) {
-#endif
             // Skip seam edge.
             continue;
           }
@@ -549,13 +529,10 @@ TopoDS_Shape BlockFix_UnionFaces::Perform(const TopoDS_Shape& Shape)
               continue;
             }
 
-#if OCC_VERSION_LARGE > 0x07020001
-// for Mantis issue 0023451 by JGV
             //Prevent creating a face with parametric range more than period
             if (IsEdgeOnSeam &&
                 (HasSeamEdge(aFace) || HasSeamEdge(anCheckedFace)))
               continue;
-#endif
 
             // replacing pcurves
             TopoDS_Face aMockUpFace;
@@ -580,8 +557,6 @@ TopoDS_Shape BlockFix_UnionFaces::Perform(const TopoDS_Shape& Shape)
         NbModif++;
         TopoDS_Face aResult;
         BRep_Builder B;
-#if OCC_VERSION_LARGE > 0x07020001
-// for Mantis issue 0023451 by JGV
         if (ToMakeUPeriodic || ToMakeVPeriodic)
         {
           Handle(Geom_BSplineSurface) aBSplineSurface = Handle(Geom_BSplineSurface)::DownCast(aBaseSurface);
@@ -603,7 +578,6 @@ TopoDS_Shape BlockFix_UnionFaces::Perform(const TopoDS_Shape& Shape)
           
           aBaseSurface = aBSplineSurface;
         }
-#endif
         B.MakeFace(aResult,aBaseSurface,aBaseLocation,0);
         Standard_Integer nbWires = 0;
 
@@ -722,15 +696,13 @@ TopoDS_Shape BlockFix_UnionFaces::Perform(const TopoDS_Shape& Shape)
         aContext->Replace(aContext->Apply(aFace),aResult);
 
         ShapeFix_Face sff (aResult);
-        //Intializing by tolerances
+        //Initializing by tolerances
         sff.SetPrecision(myTolerance);
         sff.SetMinTolerance(tol);
-        sff.SetMaxTolerance(Max(1.,myTolerance*1000.));
+        Standard_Real MaxTol = DefineMaxTolerance(aResult);
+        sff.SetMaxTolerance(MaxTol);
         //Setting modes
         sff.FixOrientationMode() = 0;
-#if OCC_VERSION_LARGE > 0x07020001
-        sff.FixWireTool()->CheckMissingEdgesMode() = Standard_False;
-#endif
         //sff.FixWireMode() = 0;
         sff.SetContext(aContext);
         // Applying the fixes

src/CurveCreator/CurveCreator_UtilsICurve.hxx

@@ -58,7 +58,7 @@ public:
                                             CurveCreator_ICurve* theCurve );
 
   /**
-   * Returns whethe the container has the value
+   * Returns whether the container has the value
    * \param theList a container of values
    * \param theValue a value
    */

src/CurveCreator/CurveCreator_Widget.cxx

@@ -1591,7 +1591,7 @@ void CurveCreator_Widget::convert( const CurveCreator_ICurve::SectionToPointList
 }
 
 /**
- * Returns whethe the container has the value
+ * Returns whether the container has the value
  * \param theList a container of values
  * \param theValue a value
  */

src/EntityGUI/EntityGUI.cxx

@@ -297,8 +297,8 @@ bool EntityGUI::OnMousePress( QMouseEvent* pe, SUIT_Desktop* parent, SUIT_ViewWi
 bool EntityGUI::OnMouseRelease( QMouseEvent* pe, SUIT_Desktop* parent, SUIT_ViewWindow* theViewWindow )
 {
   ((OCCViewer_ViewWindow*)theViewWindow)->setSketcherStyle(false);
-  QDialog* aDlg = getGeometryGUI()->GetActiveDialogBox();
 #ifdef WITH_OPENCV
+  QDialog* aDlg = getGeometryGUI()->GetActiveDialogBox();
   if ( aDlg && ( QString( aDlg->metaObject()->className() ).compare( "EntityGUI_FeatureDetectorDlg" ) == 0 ) &&
        theViewWindow->getViewManager()->getType() == OCCViewer_Viewer::Type() &&
        pe->modifiers() != Qt::ControlModifier ) 

src/EntityGUI/EntityGUI_FeatureDetectorDlg.cxx

@@ -450,7 +450,7 @@ void EntityGUI_FeatureDetectorDlg::SelectionIntoArgument()
       myDetector->SetPath( theImgFileName.toStdString() );
       height            =  myDetector->GetImgHeight();
       width             =  myDetector->GetImgWidth();
-      pictureLeft       = -0.5 * width;              // X coordinate of the top left  corner of the background image in the view
+      pictureLeft       = -0.5 * width;              // X coordinate of the top left corner of the background image in the view
       pictureTop        =  0.5 * height;             // Y coordinate of both top corners
       
     } 

src/EntityGUI/EntityGUI_FieldDlg.cxx

@@ -485,7 +485,7 @@ void EntityGUI_FieldDlg::StepTable::setEditable (bool isEditable,
 
 //=======================================================================
 // name    : EntityGUI_FieldDlg::StepTable::isEditable
-// Purpose : Verify wheter cell is editable
+// Purpose : Verify whether cell is editable
 //=======================================================================
 bool EntityGUI_FieldDlg::StepTable::isEditable (int row, int col) const
 {

src/EntityGUI/EntityGUI_SketcherDlg.cxx

@@ -627,7 +627,7 @@ void EntityGUI_SketcherDlg::RectClicked()
 {
   InitClick();
   
-  // Connect the selction manager (disconnected in InitClick())
+  // Connect the selection manager (disconnected in InitClick())
   connect( myGeometryGUI->getApp()->selectionMgr(),
        SIGNAL( currentSelectionChanged() ), this, SLOT( SelectionIntoArgument() ) );
   
@@ -2120,7 +2120,7 @@ QString EntityGUI_SketcherDlg::GetNewCommand( QString& theParameters )
   QString myNewCommand = ":";
   SUIT_ResourceMgr* resMgr = SUIT_Session::session()->resourceMgr();
   int aPrecision = resMgr->integerValue( "Geometry", "length_precision", 6 );
-  int DigNum = qAbs(aPrecision);                   // options for the format of numbers in  myNewCommand
+  int DigNum = qAbs(aPrecision);                   // options for the format of numbers in myNewCommand
   char Format = 'f';
   if ( aPrecision < 0 )                            // f --> DigNum is the number of digits after the decimal point
     Format = 'g';                                  // g --> DigNum is the maximum number of significant digits 
@@ -2319,7 +2319,7 @@ bool EntityGUI_SketcherDlg::execute( ObjectList& objects )
   MESSAGE("EntityGUI_SketcherDlg::execute")
   SUIT_ResourceMgr* resMgr = SUIT_Session::session()->resourceMgr();
   int aPrecision = resMgr->integerValue( "Geometry", "length_precision", 6 );
-  int DigNum = qAbs(aPrecision);                   // options for the format of numbers in  myNewCommand
+  int DigNum = qAbs(aPrecision);                   // options for the format of numbers in myNewCommand
   char Format = 'f';
   if ( aPrecision < 0 )                            // f --> DigNum is the number of digits after the decimal point
     Format = 'g';                                  // g --> DigNum is the maximum number of significant digits 

src/GEOM/GEOM_IField.hxx

@@ -20,7 +20,7 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
-//NOTE: This is an intreface to a function for the Field creation.
+//NOTE: This is an interface to a function for the Field creation.
 //
 #include "GEOM_Function.hxx"
 

src/GEOMAlgo/GEOMAlgo_AlgoTools.hxx

@@ -67,7 +67,7 @@ class GEOMAlgo_AlgoTools  {
 			    gp_Vec& aN);
 
   //! Computes a point <theP> inside the face <theF>. <br>
-  //!          <theP2D> -  2D  representation of <theP> <br>
+  //!          <theP2D> - 2D representation of <theP> <br>
   //!          on the surface of <theF> <br>
   //!          Returns 0 in case of success. <br>
   Standard_EXPORT

src/GEOMAlgo/GEOMAlgo_ShapeInfo.cxx

@@ -429,7 +429,7 @@ void GEOMAlgo_ShapeInfo::Dump()const
     break;
     //
   default:
-    printf(" * not implememted yet\n");
+    printf(" * not implemented yet\n");
     break;
   }
 }

src/GEOMBase/GEOMBase.h

@@ -66,7 +66,7 @@ public :
                                                  const bool shapesOnly = false );
   static QString      GetShapeTypeString( const TopoDS_Shape& shape );
 
-  /* Convertions */
+  /* Conversions */
   static Handle(GEOM_AISShape)
                       ConvertIOinGEOMAISShape( const Handle(SALOME_InteractiveObject)& IO,
                                                bool onlyInActiveView = false );

src/GEOMBase/GEOMBase_Helper.cxx

@@ -145,10 +145,10 @@ void GEOMBase_Helper::display( GEOM::GEOM_Object_ptr object, const bool updateVi
 {
   // Unset color of shape ( this color may be set during preview displaying )
   // Default color will be used
-//   getDisplayer()->UnsetColor();
+  //   getDisplayer()->UnsetColor();
   getDisplayer()->UnsetWidth();
 
-  MESSAGE("GEOMBase_Helper::display myTexture = "<<getDisplayer()->GetTexture())
+  MESSAGE("GEOMBase_Helper::display myTexture = "<<getDisplayer()->GetTexture());
 
   // Enable activisation of selection
   getDisplayer()->SetToActivate( true );
@@ -179,9 +179,11 @@ void GEOMBase_Helper::erase( GEOM::GEOM_Object_ptr object, const bool updateView
 {
   if ( !object->_is_nil() ) {
     QString entry = getEntry( object );
-    getDisplayer()->Erase( new SALOME_InteractiveObject(
+    QString name  = GEOMBase::GetName( object );
-      entry.toLatin1().constData(), 
+    getDisplayer()->Erase ( new SALOME_InteractiveObject(entry.toLatin1().constData(),
-      "GEOM", strdup( GEOMBase::GetName( object ).toLatin1().constData() ) ), true, updateView );
+                                                         "GEOM",
+                                                         name.toLatin1().constData() ),
+                            true, updateView );
   }
 }
 
@@ -219,8 +221,12 @@ void GEOMBase_Helper::redisplay( GEOM::GEOM_Object_ptr object,
     getDisplayer()->SetToActivate( true );
 
     QString entry = getEntry( object );
-    getDisplayer()->Redisplay(new SALOME_InteractiveObject
+    QString  name = GEOMBase::GetName( object );
-                              (entry.toLatin1().constData(), "GEOM", strdup(GEOMBase::GetName(object).toLatin1().constData())), false);
+    getDisplayer()->Redisplay
+      (new SALOME_InteractiveObject (entry.toLatin1().constData(),
+                                     "GEOM",
+                                     name.toLatin1().constData()),
+       false);
   }
 
   if ( withChildren ) {
@@ -237,8 +243,12 @@ void GEOMBase_Helper::redisplay( GEOM::GEOM_Object_ptr object,
           if ( !CORBA::is_nil( aChild ) ) {
             if ( !aChild->_is_nil() ) {
               QString entry = getEntry( aChild );
-              getDisplayer()->Redisplay( new SALOME_InteractiveObject(
+              QString  name = GEOMBase::GetName( aChild );
-                entry.toLatin1().constData(), "GEOM", strdup( GEOMBase::GetName( aChild ).toLatin1().constData() ) ), false );
+              getDisplayer()->Redisplay
+                ( new SALOME_InteractiveObject( entry.toLatin1().constData(),
+                                                "GEOM",
+                                                name.toLatin1().constData() ),
+                  false );
             }
           }
         }
@@ -293,10 +303,10 @@ void GEOMBase_Helper::displayPreview( const bool   display,
     else {
       for ( ObjectList::iterator it = objects.begin(); it != objects.end(); ++it )
       {
-            GEOM::GEOM_Object_var obj=*it;
+        GEOM::GEOM_Object_var obj = *it;
         displayPreview( obj, true, activate, false, lineWidth, displayMode, color );
         if ( toRemoveFromEngine )
-              obj->UnRegister();
+          obj->UnRegister();
       }
     }
   }
@@ -380,12 +390,12 @@ void GEOMBase_Helper::displayPreview( const SALOME_Prs* prs,
   SUIT_ViewManager* aViewManager = myViewWindow->getViewManager();
   if ( aViewManager->getType() == OCCViewer_Viewer::Type() ||
        aViewManager->getType() == SVTK_Viewer::Type() )
-    {
+  {
-      SUIT_ViewModel* aViewModel = aViewManager->getViewModel();
+    SUIT_ViewModel* aViewModel = aViewManager->getViewModel();
-      SALOME_View* aView = dynamic_cast<SALOME_View*>(aViewModel);
+    SALOME_View* aView = dynamic_cast<SALOME_View*>(aViewModel);
-      if (aView)
+    if (aView)
-        aView->Display( getDisplayer(), prs );
+      aView->Display( getDisplayer(), prs );
-    }
+  }
 
   // Add prs to the preview list
   myPreview.push_back( (SALOME_Prs*)prs );
@@ -478,8 +488,11 @@ void GEOMBase_Helper::localSelection( const ObjectList& theObjs, const std::list
       continue;
     QString anEntry = getEntry( anObj );
     if ( anEntry != "" )
-      aListOfIO.Append( new SALOME_InteractiveObject(
+    {
-        anEntry.toLatin1().constData(), "GEOM", strdup( GEOMBase::GetName( anObj ).toLatin1().constData() ) ) );
+      QString aName = GEOMBase::GetName( anObj );
+      aListOfIO.Append( new SALOME_InteractiveObject( anEntry.toLatin1().constData(),
+                                                      "GEOM", aName.toLatin1().constData() ));
+    }
   }
 
   getDisplayer()->LocalSelection( aListOfIO, modes );
@@ -670,11 +683,11 @@ SalomeApp_Study* GEOMBase_Helper::getStudy() const
   SUIT_Application* anApp = 0;
   QListIterator<SUIT_Application*> it( anAppList );
   while ( it.hasNext() )
-    {
+  {
-      anApp = it.next();
+    anApp = it.next();
-      if ( anApp && anApp->desktop() == aDesktop )
+    if ( anApp && anApp->desktop() == aDesktop )
-        break;
+      break;
-    }
+  }
 
   return dynamic_cast<SalomeApp_Study*>(anApp->activeStudy());
 }
@@ -727,7 +740,7 @@ bool GEOMBase_Helper::openCommand()
   if ( !getStudy() || hasCommand() )
   {
     MESSAGE("Getting out from openCommand()")
-    return res;
+      return res;
   }
 
   GEOM::GEOM_IOperations_var anOp = GEOM::GEOM_IOperations::_narrow( getOperation() );
@@ -739,7 +752,7 @@ bool GEOMBase_Helper::openCommand()
   else
   {
     MESSAGE("anOp->_is_nil() = true")
-  }
+      }
 
   return res;
 }
@@ -809,10 +822,10 @@ bool GEOMBase_Helper::checkViewWindow()
     QList<SUIT_ViewWindow*> aViewWindowsList = SUIT_Session::session()->activeApplication()->desktop()->windows();
     QListIterator<SUIT_ViewWindow*> it( aViewWindowsList );
     while ( it.hasNext() )
-      {
+    {
-        if ( myViewWindow == it.next() )
+      if ( myViewWindow == it.next() )
-          return true;
+        return true;
-      }
+    }
   }
   myViewWindow = 0;
   return false;
@@ -830,7 +843,7 @@ bool GEOMBase_Helper::onAccept( const bool publish, const bool useTransaction, b
   if ( !appStudy )
   {
     MESSAGE("appStudy is empty")
-    return false;
+      return false;
   }
   _PTR(Study) aStudy = appStudy->studyDS();
 
@@ -877,21 +890,21 @@ bool GEOMBase_Helper::onAccept( const bool publish, const bool useTransaction, b
             QString aName = getObjectName(obj);
             if (aName.isEmpty()) {
               aName = getNewObjectName(currObj);
-                    if ( nbObjs > 1 ) {
+              if ( nbObjs > 1 ) {
-                            if (aName.isEmpty())
+                if (aName.isEmpty())
-                              aName = getPrefix(obj);
+                  aName = getPrefix(obj);
-                              if (nbObjs <= 30) {
+                if (nbObjs <= 30) {
-                                // Try to find a unique name
+                  // Try to find a unique name
-                                aName = GEOMBase::GetDefaultName(aName, extractPrefix());
+                  aName = GEOMBase::GetDefaultName(aName, extractPrefix());
-                              } else {
+                } else {
-                                // Don't check name uniqueness in case of numerous objects
+                  // Don't check name uniqueness in case of numerous objects
-                                aName = aName + "_" + QString::number(aNumber++);
+                  aName = aName + "_" + QString::number(aNumber++);
-                              }
+                }
-                    } else {
+              } else {
-                            // PAL6521: use a prefix, if some dialog box doesn't reimplement getNewObjectName()
+                // PAL6521: use a prefix, if some dialog box doesn't reimplement getNewObjectName()
-                            if ( aName.isEmpty() )
+                if ( aName.isEmpty() )
-                              aName = GEOMBase::GetDefaultName( getPrefix( obj ) );
+                  aName = GEOMBase::GetDefaultName( getPrefix( obj ) );
-                    }
+              }
             }
             anEntryList << addInStudy( obj, aName.toLatin1().constData() );
             // updateView=false
@@ -941,18 +954,18 @@ bool GEOMBase_Helper::onAccept( const bool publish, const bool useTransaction, b
     SalomeApp_Tools::QtCatchCorbaException( e );
     abortCommand();
     MESSAGE("Exception caught")
-  }
+      }
 
   updateViewer();
 
   MESSAGE("result ="<<result)
-  return result;
+    return result;
 }
 
 
 //================================================================
 // Function : showError
-// Purpose  : Shows a message box with infromation about an error taken from getOperation()->GetErrorCode()
+// Purpose  : Shows a message box with information about an error taken from getOperation()->GetErrorCode()
 //================================================================
 void GEOMBase_Helper::showError()
 {
@@ -1068,15 +1081,15 @@ QString GEOMBase_Helper::getPrefix( GEOM::GEOM_Object_ptr theObj ) const
 
   switch ( aType )
   {
-    case GEOM::VERTEX   : return QObject::tr( "GEOM_VERTEX" );
+  case GEOM::VERTEX   : return QObject::tr( "GEOM_VERTEX" );
-    case GEOM::EDGE     : return QObject::tr( "GEOM_EDGE" );
+  case GEOM::EDGE     : return QObject::tr( "GEOM_EDGE" );
-    case GEOM::WIRE     : return QObject::tr( "GEOM_WIRE" );
+  case GEOM::WIRE     : return QObject::tr( "GEOM_WIRE" );
-    case GEOM::FACE     : return QObject::tr( "GEOM_FACE" );
+  case GEOM::FACE     : return QObject::tr( "GEOM_FACE" );
-    case GEOM::SHELL    : return QObject::tr( "GEOM_SHELL" );
+  case GEOM::SHELL    : return QObject::tr( "GEOM_SHELL" );
-    case GEOM::SOLID    : return QObject::tr( "GEOM_SOLID" );
+  case GEOM::SOLID    : return QObject::tr( "GEOM_SOLID" );
-    case GEOM::COMPSOLID: return QObject::tr( "GEOM_COMPOUNDSOLID" );
+  case GEOM::COMPSOLID: return QObject::tr( "GEOM_COMPOUNDSOLID" );
-    case GEOM::COMPOUND : return QObject::tr( "GEOM_COMPOUND" );
+  case GEOM::COMPOUND : return QObject::tr( "GEOM_COMPOUND" );
-    default : return "";
+  default : return "";
   }
 }
 

src/GEOMBase/GEOMBase_Helper.h

@@ -133,7 +133,7 @@ protected:
   // should be published in a study.
 
   void showError();
-  // Shows a message box with infromation about an error taken from getOperation()->GetErrorCode()
+  // Shows a message box with information about an error taken from getOperation()->GetErrorCode()
   void showError( const QString& msg );
   // Shows a error message followed by <msg>
 

src/GEOMGUI/GEOMGUI_DimensionProperty.h

@@ -135,14 +135,14 @@ public:
     /*!
      * \brief Inits property fields from the passed length object.
      * \param theIO [in] the interactive presentation.
-     * \param theLCS [in] the local coordiante system of parent object.
+     * \param theLCS [in] the local coordinate system of parent object.
      */
     void Init( const Handle(AIS_LengthDimension)& theIO, const gp_Ax3& theLCS );
 
     /*!
      * \brief Updates length object properties from the fields.
      * \param theIO [in/out] the interactive presentation.
-     * \param theLCS [in] the local coordiante system of parent object.
+     * \param theLCS [in] the local coordinate system of parent object.
      */
     void Update( Handle(AIS_LengthDimension)& theIO, const gp_Ax3& theLCS );
 
@@ -160,7 +160,7 @@ public:
     void FromValues(int& theIt, const std::vector<double>& theValues);
 
     /*!
-     * \brief Overload comparsion.
+     * \brief Overload comparison.
      */
     bool operator == (const Length &theOther) const;
     bool operator != (const Length &theOther) const { return !(operator == (theOther)); }
@@ -203,14 +203,14 @@ public:
     /*!
      * \brief Inits property fields from the passed length object.
      * \param theIO [in] the interactive presentation.
-     * \param theLCS [in] the local coordiante system of parent object.
+     * \param theLCS [in] the local coordinate system of parent object.
      */
     void Init( const Handle(AIS_DiameterDimension)& theIO, const gp_Ax3& theLCS );
 
     /*!
      * \brief Updates length object properties from the fields.
      * \param theIO [in/out] the interactive presentation.
-     * \param theLCS [in] the local coordiante system of parent object.
+     * \param theLCS [in] the local coordinate system of parent object.
      */
     void Update( Handle(AIS_DiameterDimension)& theIO, const gp_Ax3& theLCS );
 
@@ -228,7 +228,7 @@ public:
     void FromValues(int& theIt, const std::vector<double>& theValues);
 
     /*!
-     * \brief Overload comparsion.
+     * \brief Overload comparison.
      */
     bool operator == (const Diameter &theOther) const;
     bool operator != (const Diameter &theOther) const { return !(operator == (theOther)); }
@@ -273,14 +273,14 @@ public:
     /*!
      * \brief Inits property fields from the passed length object.
      * \param theIO [in] the interactive presentation.
-     * \param theLCS [in] the local coordiante system of parent object.
+     * \param theLCS [in] the local coordinate system of parent object.
      */
     void Init( const Handle(AIS_AngleDimension)& theIO, const gp_Ax3& theLCS );
 
     /*!
      * \brief Updates length object properties from the fields.
      * \param theIO [in/out] the interactive presentation.
-     * \param theLCS [in] the local coordiante system of parent object.
+     * \param theLCS [in] the local coordinate system of parent object.
      */
     void Update( Handle(AIS_AngleDimension)& theIO, const gp_Ax3& theLCS );
 
@@ -298,7 +298,7 @@ public:
     void FromValues(int& theIt, const std::vector<double>& theValues);
 
     /*!
-     * \brief Overload comparsion.
+     * \brief Overload comparison.
      */
     bool operator == (const Angle &theOther) const;
     bool operator != (const Angle &theOther) const { return !(operator == (theOther)); }
@@ -352,12 +352,12 @@ public:
   operator QString() const;
 
   /*!
-   * \brief Overload comparsion.
+   * \brief Overload comparison.
    */
   bool operator == (const GEOMGUI_DimensionProperty &theOther) const;
 
   /*!
-   * \brief Overload comparsion.
+   * \brief Overload comparison.
    */
   bool operator != (const GEOMGUI_DimensionProperty &theOther) const
   {

src/GEOMGUI/GEOM_Displayer.cxx

@@ -1669,7 +1669,7 @@ void GEOM_Displayer::Update( SALOME_VTKPrs* prs )
 //=================================================================
 /*!
  *  GEOM_Displayer::BuildPrs
- *  Build presentation accordint to the current viewer type
+ *  Build presentation according to the current viewer type
  */
 //=================================================================
 SALOME_Prs* GEOM_Displayer::BuildPrs( GEOM::GEOM_Object_ptr theObj )
@@ -1698,7 +1698,7 @@ SALOME_Prs* GEOM_Displayer::BuildPrs( GEOM::GEOM_Object_ptr theObj )
 //=================================================================
 /*!
  *  GEOM_Displayer::BuildPrs
- *  Build presentation accordint to the current viewer type
+ *  Build presentation according to the current viewer type
  */
 //=================================================================
 SALOME_Prs* GEOM_Displayer::BuildPrs( const TopoDS_Shape& theShape )

src/GEOMGUI/GEOM_Displayer.h

@@ -129,7 +129,7 @@ public:
   /* Update visibility state */
   void          UpdateVisibility( SALOME_View*, const SALOME_Prs*, bool );
 
-  /* build presentation accordint to the current viewer type*/
+  /* build presentation according to the current viewer type*/
   SALOME_Prs*   BuildPrs  ( GEOM::GEOM_Object_ptr );
   SALOME_Prs*   BuildPrs  ( const TopoDS_Shape& );
 

src/GEOMImpl/GEOMImpl_ArchimedeDriver.cxx

@@ -116,7 +116,7 @@ Standard_Integer GEOMImpl_ArchimedeDriver::Execute(Handle(TFunction_Logbook)& lo
     double volume = VOL.CalculateVolume(Zmax) * aWaterDensity;
 
     char msg[100] = "";
-    sprintf(msg, "shape sinks to the bottom : Weigth max = %.1f", volume);
+    sprintf(msg, "shape sinks to the bottom : Weight max = %.1f", volume);
 
     StdFail_NotDone::Raise(msg);
   }

src/GEOMImpl/GEOMImpl_Block6Explorer.cxx

@@ -915,7 +915,7 @@ void GEOMImpl_Block6Explorer::InitByTwoFaces (const TopoDS_Shape& theFace1,
   }
 
   // 1.2. Ordered vertices and edges of the second face we temporarily store
-  // in arrays, to find for them rigth location in <myVertices> on the Step 2.
+  // in arrays, to find for them the right location in <myVertices> in Step 2.
 
   // declare arrays
   TopTools_Array1OfShape aVertis2(1,4); // ordered vertices of the second face

src/GEOMImpl/GEOMImpl_GlueDriver.cxx

@@ -336,7 +336,7 @@ TopoDS_Shape GEOMImpl_GlueDriver::GlueFaces
   aGA.SetTolerance(theTolerance);
   aGA.SetKeepNonSolids(doKeepNonSolids);
 
-  // 2. Detect interferred shapes
+  // 2. Detect interfered shapes
   aGA.Detect();
 
   //Standard_Integer iWrnDetect = aGA.WarningStatus();
@@ -451,7 +451,7 @@ TopoDS_Shape GEOMImpl_GlueDriver::GlueWithWarnings (const TopoDS_Shape& theShape
   aGA.SetTolerance(theTolerance);
   aGA.SetKeepNonSolids(doKeepNonSolids);
 
-  // 2. Detect interferred shapes
+  // 2. Detect interfered shapes
   aGA.Detect();
 
   //modified by NIZNHY-PKV Tue Mar 13 14:07:12 2012f
@@ -609,7 +609,7 @@ TopoDS_Shape GEOMImpl_GlueDriver::GlueByList (const TopoDS_Shape& theShape,
   aGA.SetTolerance(theTolerance);
   aGA.SetKeepNonSolids(doKeepNonSolids);
 
-  // 2. Detect interferred shapes
+  // 2. Detect interfered shapes
   aGA.Detect();
 
   //modified by NIZNHY-PKV Tue Mar 13 14:07:12 2012f

src/GEOMImpl/GEOMImpl_HealingDriver.cxx

@@ -63,7 +63,7 @@
 
 //=======================================================================
 //function :  raiseNotDoneExeption
-//purpose  :  global function: forms error message and raises exeption
+//purpose  :  global function: forms error message and raises exception
 //=======================================================================
 void raiseNotDoneExeption( const int theErrorStatus )
 {

src/GEOMImpl/GEOMImpl_I3DPrimOperations.cxx

@@ -1878,7 +1878,7 @@ Handle(TColStd_HSequenceOfTransient)
   try {
     OCC_CATCH_SIGNALS;
     if (!GetSolver()->ComputeFunction(aFunction)) {
-      SetErrorCode("Pipe with defferent section driver failed");
+      SetErrorCode("Pipe with different section driver failed");
       return NULL;
     }
   }

src/GEOMImpl/GEOMImpl_IArc.hxx

@@ -20,7 +20,7 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
-//NOTE: This is an intreface to a function for the Arc creation.
+//NOTE: This is an interface to a function for the Arc creation.
 //
 #include "GEOM_Function.hxx"
 

src/GEOMImpl/GEOMImpl_IArchimede.hxx

@@ -20,7 +20,7 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
-//NOTE: This is an intreface to a function for the Archimede operation.
+//NOTE: This is an interface to a function for the Archimede operation.
 //
 #include "GEOM_Function.hxx"
 

src/GEOMImpl/GEOMImpl_IBoolean.hxx

@@ -20,7 +20,7 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
-//NOTE: This is an intreface to a function for the Common, Cut and Fuse creation.
+//NOTE: This is an interface to a function for the Common, Cut and Fuse creation.
 //
 #include "GEOM_Function.hxx"
 #include "TColStd_HSequenceOfTransient.hxx"

src/GEOMImpl/GEOMImpl_IBox.hxx

@@ -20,7 +20,7 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
-//NOTE: This is an intreface to a function for the Box creation.
+//NOTE: This is an interface to a function for the Box creation.
 //
 #include "GEOM_Function.hxx"
 

src/GEOMImpl/GEOMImpl_ICircle.hxx

@@ -20,7 +20,7 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
-//NOTE: This is an intreface to a function for the Circle creation.
+//NOTE: This is an interface to a function for the Circle creation.
 //
 #include "GEOM_Function.hxx"
 

src/GEOMImpl/GEOMImpl_ICone.hxx

@@ -20,7 +20,7 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
-//NOTE: This is an intreface to a function for the Cone creation.
+//NOTE: This is an interface to a function for the Cone creation.
 //
 #include "GEOM_Function.hxx"
 

src/GEOMImpl/GEOMImpl_ICopy.hxx

@@ -20,7 +20,7 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
-//NOTE: This is an intreface to a function for the Copy operation.
+//NOTE: This is an interface to a function for the Copy operation.
 //
 #include "GEOM_Function.hxx"
 

src/GEOMImpl/GEOMImpl_ICylinder.hxx

@@ -20,7 +20,7 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
-//NOTE: This is an intreface to a function for the Cylinder creation.
+//NOTE: This is an interface to a function for the Cylinder creation.
 //
 #include "GEOM_Function.hxx"
 

src/GEOMImpl/GEOMImpl_IDisk.hxx

@@ -17,7 +17,7 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
-//NOTE: This is an intreface to a function for the Disk creation.
+//NOTE: This is an interface to a function for the Disk creation.
 //
 #include "GEOM_Function.hxx"
 

src/GEOMImpl/GEOMImpl_IEllipse.hxx

@@ -20,7 +20,7 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
-//NOTE: This is an intreface to a function for the Ellipse creation.
+//NOTE: This is an interface to a function for the Ellipse creation.
 //
 #include "GEOM_Function.hxx"
 

src/GEOMImpl/GEOMImpl_IExtract.hxx

@@ -20,7 +20,7 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
-//NOTE: This is an intreface to a function for the Offset creation.
+//NOTE: This is an interface to a function for the Offset creation.
 //
 #include "GEOM_Function.hxx"
 #include <TColStd_HArray1OfInteger.hxx>

src/GEOMImpl/GEOMImpl_IFace.hxx

@@ -17,7 +17,7 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
-//NOTE: This is an intreface to a function for the Face creation.
+//NOTE: This is an interface to a function for the Face creation.
 //
 #include "GEOM_Function.hxx"
 

src/GEOMImpl/GEOMImpl_IFilling.hxx

@@ -20,7 +20,7 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
-//NOTE: This is an intreface to a function for the Filling operation.
+//NOTE: This is an interface to a function for the Filling operation.
 //
 #include "GEOM_Function.hxx"
 #include <TColStd_HSequenceOfTransient.hxx>

src/GEOMImpl/GEOMImpl_IImportExport.hxx

@@ -20,7 +20,7 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
-//NOTE: This is an intreface to a function for the Import Export operation.
+//NOTE: This is an interface to a function for the Import Export operation.
 //
 #include "GEOM_Function.hxx"
 

src/GEOMImpl/GEOMImpl_ILine.hxx

@@ -20,7 +20,7 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
-//NOTE: This is an intreface to a function for the vector creation.
+//NOTE: This is an interface to a function for the vector creation.
 //
 #include "GEOM_Function.hxx"
 

src/GEOMImpl/GEOMImpl_IOffset.hxx

@@ -20,7 +20,7 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
-//NOTE: This is an intreface to a function for the Offset creation.
+//NOTE: This is an interface to a function for the Offset creation.
 //
 #include "GEOM_Function.hxx"
 #include <TColStd_HArray1OfInteger.hxx>

src/GEOMImpl/GEOMImpl_IPartition.hxx

@@ -20,7 +20,7 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
-//NOTE: This is an intreface to a function for the Partition creation.
+//NOTE: This is an interface to a function for the Partition creation.
 //
 #include "GEOM_Function.hxx"
 

src/GEOMImpl/GEOMImpl_IPipe.hxx

@@ -20,7 +20,7 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
-//NOTE: This is an intreface to a function for the Pipe creation.
+//NOTE: This is an interface to a function for the Pipe creation.
 //
 #ifndef _GEOMImpl_IPIPE_HXX_
 #define _GEOMImpl_IPIPE_HXX_

src/GEOMImpl/GEOMImpl_IPipeDiffSect.hxx

@@ -20,7 +20,7 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
-//NOTE: This is an intreface to a function for the Pipe creation.
+//NOTE: This is an interface to a function for the Pipe creation.
 
 #ifndef _GEOMImpl_IPIPEDIFFSECT_HXX_
 #define _GEOMImpl_IPIPEDIFFSECT_HXX_

src/GEOMImpl/GEOMImpl_IPipeShellSect.hxx

@@ -17,7 +17,7 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
-//NOTE: This is an intreface to a function for the Pipe creation.
+//NOTE: This is an interface to a function for the Pipe creation.
 
 #ifndef _GEOMImpl_IPIPESHELLSECT_HXX_
 #define _GEOMImpl_IPIPESHELLSECT_HXX_

src/GEOMImpl/GEOMImpl_IPlane.hxx

@@ -20,7 +20,7 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
-//NOTE: This is an intreface to a function for the vector creation.
+//NOTE: This is an interface to a function for the vector creation.
 //
 #include "GEOM_Function.hxx"
 

src/GEOMImpl/GEOMImpl_IPosition.hxx

@@ -20,7 +20,7 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
-//NOTE: This is an intreface to a function for the Setting In Position.
+//NOTE: This is an interface to a function for the Setting In Position.
 //
 #include "GEOM_Function.hxx"
 

src/GEOMImpl/GEOMImpl_IPrism.hxx

@@ -20,7 +20,7 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
-//NOTE: This is an intreface to a function for the Prism creation.
+//NOTE: This is an interface to a function for the Prism creation.
 
 #include "GEOM_Function.hxx"
 // #include <GEOMImpl_Mode.hxx>  TEST

src/GEOMImpl/GEOMImpl_IRevolution.hxx

@@ -20,7 +20,7 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
-//NOTE: This is an intreface to a function for the Revolution creation.
+//NOTE: This is an interface to a function for the Revolution creation.
 //
 #include "GEOM_Function.hxx"
 

src/GEOMImpl/GEOMImpl_IScale.hxx

@@ -20,7 +20,7 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
-//NOTE: This is an intreface to a function for the Scale creation.
+//NOTE: This is an interface to a function for the Scale creation.
 //
 #include "GEOM_Function.hxx"
 

src/GEOMImpl/GEOMImpl_IShapeExtend.hxx

@@ -20,7 +20,7 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
-//NOTE: This is an intreface to a function for the extended shape creation.
+//NOTE: This is an interface to a function for the extended shape creation.
 //
 #include "GEOM_Function.hxx"
 

src/GEOMImpl/GEOMImpl_ISphere.hxx

@@ -20,7 +20,7 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
-//NOTE: This is an intreface to a function for the Sphere creation.
+//NOTE: This is an interface to a function for the Sphere creation.
 //
 #include "GEOM_Function.hxx"
 

src/GEOMImpl/GEOMImpl_IThruSections.hxx

@@ -20,7 +20,7 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
-//NOTE: This is an intreface to a function for the Pipe creation.
+//NOTE: This is an interface to a function for the Pipe creation.
 //
 #include "GEOM_Function.hxx"
 #include <TColStd_HSequenceOfTransient.hxx>

src/GEOMImpl/GEOMImpl_ITorus.hxx

@@ -20,7 +20,7 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
-//NOTE: This is an intreface to a function for the Torus creation.
+//NOTE: This is an interface to a function for the Torus creation.
 //
 #include "GEOM_Function.hxx"
 

src/GEOMImpl/GEOMImpl_ITransferData.cxx

@@ -20,7 +20,7 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
-//NOTE: This is an intreface to a function for the Transfer Data functionality.
+//NOTE: This is an interface to a function for the Transfer Data functionality.
 //
 
 

src/GEOMImpl/GEOMImpl_ITransferData.hxx

@@ -20,7 +20,7 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
-//NOTE: This is an intreface to a function for the Transfer Data functionality.
+//NOTE: This is an interface to a function for the Transfer Data functionality.
 //
 
 

src/GEOMImpl/GEOMImpl_ITranslate.hxx

@@ -20,7 +20,7 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
-//NOTE: This is an intreface to a function for the Translate creation.
+//NOTE: This is an interface to a function for the Translate creation.
 //
 #include "GEOM_Function.hxx"
 

src/GEOMImpl/GEOMImpl_PipeDriver.cxx

@@ -569,7 +569,7 @@ static void FindNextPairOfFaces(const TopoDS_Shape& aCurFace,
     bool stat =  FillForOtherEdges(F1other,E1,V1,FF);
     if (!stat) {
       if (aCI) delete aCI;
-      Standard_ConstructionError::Raise("FindNextPairOfFaces: Can not mapping other egdes");
+      Standard_ConstructionError::Raise("FindNextPairOfFaces: Can not map other edges");
     }
 
     FindNextPairOfFaces(F1other, aMapEdgeFaces1, aMapEdgeFaces2, FF, aCI);
@@ -919,7 +919,7 @@ TopoDS_Shape GEOMImpl_PipeDriver::CreatePipeWithDifferentSections
       }
     }
     if (nbEdges<Edges.Length()) {
-        // one of edges was splitted => we have to update WirePath
+        // one of edges was split => we have to update WirePath
         BRep_Builder B;
         TopoDS_Wire W;
         B.MakeWire(W);
@@ -1824,7 +1824,7 @@ static TopoDS_Shape CreatePipeForShellSections(const TopoDS_Wire& aWirePath,
         bool stat =  FillForOtherEdges(FS1,E1,V11,FF);
         if (!stat) {
           if (aCI) delete aCI;
-          Standard_ConstructionError::Raise("FindForOtherEdges: Can not mapping other egdes");
+          Standard_ConstructionError::Raise("FindForOtherEdges: Can not map other edges");
         }
 
       }

src/GEOMImpl/GEOMImpl_PolylineDumper.cxx

@@ -91,7 +91,7 @@ Standard_Boolean GEOMImpl_PolylineDumper::Dump
     aPD << theObject << " = pl.result(";
 
     if (myWorkingPlane.IsNull()) {
-      // Add coodinates of working plane.
+      // Add coordinates of working plane.
       Standard_Integer i;
 
       aPD << "[";

src/GEOMToolsGUI/GEOMToolsGUI.cxx

@@ -77,7 +77,7 @@ static QString getParentComponent( _PTR( SObject ) obj )
 
 //=====================================================================================
 // function : inUse
-// purpose  : check if the object(s) passed as the the second arguments are used
+// purpose  : check if the object(s) passed as the second arguments are used
 //            by the other objects in the study
 //=====================================================================================
 static bool inUse( const QString& component, const QMap<QString,QString>& objects )

src/GEOMToolsGUI/GEOMToolsGUI_1.cxx

@@ -124,7 +124,7 @@
 // Below macro, when uncommented, switches on simplified (more performant) algorithm
 // of auto-color picking up
 #define SIMPLE_AUTOCOLOR
-// Below macro, when defined, switches on automatic layouting of OCC and Dependecy views
+// Below macro, when defined, switches on automatic layouting of OCC and Dependency views
 // on Show Dependencies operation
 #define LAYOUT_DEPVIEW
 

src/GEOMToolsGUI/GEOMToolsGUI_MaterialPropertiesDlg.cxx

@@ -67,7 +67,7 @@
 */
 
 /*!
-  \brief Contructor
+  \brief Constructor
  */
 GEOMToolsGUI_MaterialList::GEOMToolsGUI_MaterialList( QWidget* parent )
   : QListWidget( parent )

src/GEOMToolsGUI/GEOMToolsGUI_TransparencyDlg.cxx

@@ -238,7 +238,7 @@ void GEOMToolsGUI_TransparencyDlg::SliderHasMoved(int value)
 //=================================================================================
 // function : SetTransparency()
 // purpose  : Called when value of slider change
-//          : or the first time as initilisation
+//          : or the first time as initialisation
 //=================================================================================
 void GEOMToolsGUI_TransparencyDlg::SetTransparency()
 {

src/GEOMUtils/GEOMUtils.hxx

@@ -254,10 +254,10 @@ namespace GEOMUtils
   Standard_EXPORT bool CheckShape( TopoDS_Shape& shape, bool checkGeometry = false );
 
   /*!
-   * \brief Check boolean and partition operations agruments
+   * \brief Check boolean and partition operations arguments
    *
-   * \param theShape the agrument of an operation to be checked
+   * \param theShape the argument of an operation to be checked
-   * \return \c true if the agrument is valid for a boolean or partition
+   * \return \c true if the argument is valid for a boolean or partition
    *         operation or \c false otherwise
    */
   Standard_EXPORT bool CheckBOPArguments(const TopoDS_Shape &theShape);

src/GEOM_I/GEOM_Gen_i.cc

@@ -915,7 +915,7 @@ GEOM::ListOfGO* GEOM_Gen_i::RestoreSubShapesO (GEOM::GEOM_Object_ptr   theObject
   CORBA::String_var anIORo = _orb->object_to_string(theObject);
   SALOMEDS::SObject_var aSO = aStudy->FindObjectIOR(anIORo.in());
   //PTv, IMP 0020001, The salome object <aSO>
-  // is not obligatory in case of invokation from script
+  // is not obligatory in case of invocation from script
   // if (CORBA::is_nil(aSO))
   //  return aParts._retn();
 
@@ -944,7 +944,7 @@ GEOM::ListOfGO* GEOM_Gen_i::RestoreGivenSubShapesO (GEOM::GEOM_Object_ptr   theO
   CORBA::String_var anIORo = _orb->object_to_string(theObject);
   SALOMEDS::SObject_var aSO = getStudyServant()->FindObjectIOR(anIORo.in());
   //PTv, IMP 0020001, The salome object <aSO>
-  // is not obligatory in case of invokation from script
+  // is not obligatory in case of invocation from script
   // if (CORBA::is_nil(aSO))
   //  return aParts._retn();
 
@@ -1027,7 +1027,7 @@ GEOM::ListOfGO* GEOM_Gen_i::RestoreSubShapes(GEOM::GEOM_Object_ptr   theObject,
   GEOM::ListOfGO_var aParts = new GEOM::ListOfGO;
   SALOMEDS::Study_var aStudy = getStudyServant();
   //PTv, IMP 0020001, The salome object <theSObject>
-  //     is not obligatory in case of invokation from script
+  //     is not obligatory in case of invocation from script
   if (CORBA::is_nil(aStudy) || CORBA::is_nil(theObject) /*|| CORBA::is_nil(theSObject)*/)
     return aParts._retn();
 
@@ -1620,7 +1620,7 @@ GEOM::ListOfGO* GEOM_Gen_i::RestoreGivenSubShapes(GEOM::GEOM_Object_ptr   theObj
   GEOM::ListOfGO_var aParts = new GEOM::ListOfGO;
   SALOMEDS::Study_var aStudy = getStudyServant();
   //PTv, IMP 0020001, The salome object <theSObject>
-  //     is not obligatory in case of invokation from script
+  //     is not obligatory in case of invocation from script
   if (CORBA::is_nil(aStudy) || CORBA::is_nil(theObject) /*|| CORBA::is_nil(theSObject)*/)
     return aParts._retn();
 

src/GEOM_I/GEOM_IMeasureOperations_i.cc

@@ -826,7 +826,7 @@ CORBA::Boolean GEOM_IMeasureOperations_i::CheckBOPArguments
   bool isGood = false;
 
   if (!aShape.IsNull()) {
-    // Check BOP agruments
+    // Check BOP arguments
     isGood = GetOperations()->CheckBOPArguments(aShape);
   }
 

src/GEOM_SWIG/GEOM_TestHealing.py

@@ -21,7 +21,7 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-#  GEOM_SWIG : binding of C++ implementaion with Python
+#  GEOM_SWIG : binding of C++ implementation with Python
 #  File   : GEOM_TestHealing.py
 #  Author : Julia DOROVSKIKH
 #  Module : GEOM

src/GEOM_SWIG/GEOM_blocks.py

@@ -21,7 +21,7 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-#  GEOM GEOM_SWIG : binding of C++ implementaion with Python
+#  GEOM GEOM_SWIG : binding of C++ implementation with Python
 #  File   : GEOM_blocks.py
 #  Author : Julia DOROVSKIKH
 #  Module : GEOM

src/GEOM_SWIG/geomBuilder.py

@@ -4367,7 +4367,7 @@ class geomBuilder(GEOM._objref_GEOM_Gen):
         #  @param theBase Base shape to be extruded.
         #  @param thePath Path shape to extrude the base shape along it.
         #  @param theVec Vector defines a constant binormal direction to keep the
-        #                same angle beetween the direction and the sections
+        #                same angle between the direction and the sections
         #                along the sweep surface.
         #  @param IsGenerateGroups flag that tells if it is necessary to
         #         create groups. It is equal to False by default.
@@ -4396,7 +4396,7 @@ class geomBuilder(GEOM._objref_GEOM_Gen):
                 theBase Base shape to be extruded.
                 thePath Path shape to extrude the base shape along it.
                 theVec Vector defines a constant binormal direction to keep the
-                       same angle beetween the direction and the sections
+                       same angle between the direction and the sections
                        along the sweep surface.
                 IsGenerateGroups flag that tells if it is necessary to
                                  create groups. It is equal to False by default.
@@ -10515,7 +10515,7 @@ class geomBuilder(GEOM._objref_GEOM_Gen):
             Parameters:
                 theInit Shape to remove material from. It must be a solid or a compound made of a single solid.
                 theBase Closed edge or wire defining the base shape to be extruded.
-                theH Prism dimension along the normal  to theBase
+                theH Prism dimension along the normal to theBase
                 theAngle Draft angle in degrees.
                 theInvert If true material changes the direction.
                 theName Object name; when specified, this parameter is used
@@ -10555,7 +10555,7 @@ class geomBuilder(GEOM._objref_GEOM_Gen):
             Parameters:
                 theInit Shape to add material to. It must be a solid or a compound made of a single solid.
                 theBase Closed edge or wire defining the base shape to be extruded.
-                theH Prism dimension along the normal  to theBase
+                theH Prism dimension along the normal to theBase
                 theAngle Draft angle in degrees.
                 theInvert If true material changes the direction.
                 theName Object name; when specified, this parameter is used
@@ -11540,7 +11540,7 @@ class geomBuilder(GEOM._objref_GEOM_Gen):
 
         ## Detect self-intersections of the given shape with algorithm based on mesh intersections.
         #  @param theShape Shape to check.
-        #  @param theDeflection Linear deflection coefficient that specifies quality of tesselation:
+        #  @param theDeflection Linear deflection coefficient that specifies quality of tessellation:
         #         - if \a theDeflection <= 0, default deflection 0.001 is used
         #  @param theTolerance Specifies a distance between sub-shapes used for detecting gaps:
         #         - if \a theTolerance <= 0, algorithm detects intersections (default behavior)
@@ -11555,7 +11555,7 @@ class geomBuilder(GEOM._objref_GEOM_Gen):
 
             Parameters:
                 theShape Shape to check.
-                theDeflection Linear deflection coefficient that specifies quality of tesselation:
+                theDeflection Linear deflection coefficient that specifies quality of tessellation:
                     - if theDeflection <= 0, default deflection 0.001 is used
                 theTolerance Specifies a distance between shapes used for detecting gaps:
                     - if theTolerance <= 0, algorithm detects intersections (default behavior)
@@ -11569,20 +11569,20 @@ class geomBuilder(GEOM._objref_GEOM_Gen):
             RaiseIfFailed("CheckSelfIntersectionsFast", self.MeasuOp)
             return IsValid
 
-        ## Check boolean and partition operations agruments.
+        ## Check boolean and partition operations arguments.
-        #  @param theShape the agrument of an operation to be checked
+        #  @param theShape the argument of an operation to be checked
-        #  @return TRUE if the agrument is valid for a boolean or partition
+        #  @return TRUE if the argument is valid for a boolean or partition
         #          operation; FALSE otherwise.
         @ManageTransactions("MeasuOp")
         def CheckBOPArguments(self, theShape):
             """
-            Check boolean and partition operations agruments.
+            Check boolean and partition operations arguments.
 
             Parameters:
-                theShape the agrument of an operation to be checked
+                theShape the argument of an operation to be checked
 
             Returns:
-                TRUE if the agrument is valid for a boolean or partition
+                TRUE if the argument is valid for a boolean or partition
                 operation; FALSE otherwise.
             """
             return self.MeasuOp.CheckBOPArguments(theShape)
@@ -11593,7 +11593,7 @@ class geomBuilder(GEOM._objref_GEOM_Gen):
         #  @param theTolerance Specifies a distance between shapes used for detecting gaps:
         #         - if \a theTolerance <= 0, algorithm detects intersections (default behavior)
         #         - if \a theTolerance > 0, algorithm detects gaps
-        #  @param theDeflection Linear deflection coefficient that specifies quality of tesselation:
+        #  @param theDeflection Linear deflection coefficient that specifies quality of tessellation:
         #         - if \a theDeflection <= 0, default deflection 0.001 is used
         #  @return TRUE, if there are intersections (gaps) between source shapes
         #  @return List of sub-shapes IDs from 1st shape that localize intersection.
@@ -11611,7 +11611,7 @@ class geomBuilder(GEOM._objref_GEOM_Gen):
                 theTolerance Specifies a distance between shapes used for detecting gaps:
                     - if theTolerance <= 0, algorithm detects intersections (default behavior)
                     - if theTolerance > 0, algorithm detects gaps
-                theDeflection Linear deflection coefficient that specifies quality of tesselation:
+                theDeflection Linear deflection coefficient that specifies quality of tessellation:
                     - if theDeflection <= 0, default deflection 0.001 is used
  
             Returns:
@@ -11895,7 +11895,7 @@ class geomBuilder(GEOM._objref_GEOM_Gen):
         ## @{
 
         ## Create a quadrangle face from four edges. Order of Edges is not
-        #  important. It is  not necessary that edges share the same vertex.
+        #  important. It is not necessary that edges share the same vertex.
         #  @param E1,E2,E3,E4 Edges for the face bound.
         #  @param theName Object name; when specified, this parameter is used
         #         for result publication in the study. Otherwise, if automatic
@@ -11908,7 +11908,7 @@ class geomBuilder(GEOM._objref_GEOM_Gen):
         def MakeQuad(self, E1, E2, E3, E4, theName=None):
             """
             Create a quadrangle face from four edges. Order of Edges is not
-            important. It is  not necessary that edges share the same vertex.
+            important. It is not necessary that edges share the same vertex.
 
             Parameters:
                 E1,E2,E3,E4 Edges for the face bound.
@@ -12013,7 +12013,7 @@ class geomBuilder(GEOM._objref_GEOM_Gen):
             return anObj
 
         ## Create a hexahedral solid, bounded by the six given faces. Order of
-        #  faces is not important. It is  not necessary that Faces share the same edge.
+        #  faces is not important. It is not necessary that Faces share the same edge.
         #  @param F1,F2,F3,F4,F5,F6 Faces for the hexahedral solid.
         #  @param theName Object name; when specified, this parameter is used
         #         for result publication in the study. Otherwise, if automatic
@@ -12027,7 +12027,7 @@ class geomBuilder(GEOM._objref_GEOM_Gen):
         def MakeHexa(self, F1, F2, F3, F4, F5, F6, theName=None):
             """
             Create a hexahedral solid, bounded by the six given faces. Order of
-            faces is not important. It is  not necessary that Faces share the same edge.
+            faces is not important. It is not necessary that Faces share the same edge.
 
             Parameters:
                 F1,F2,F3,F4,F5,F6 Faces for the hexahedral solid.

src/GEOM_SWIG_WITHIHM/libGEOM_Swig.cxx

@@ -492,7 +492,7 @@ public:
 
 /*!
   \brief Initialize GEOM module's engine
-  \return \c true if initialization succeedes or \c false otherwise
+  \return \c true if initialization succeeds or \c false otherwise
 */
 bool GEOM_Swig::initGeomGen()
 {

src/GroupGUI/GroupGUI_BooleanDlg.cxx

@@ -327,11 +327,11 @@ GEOM::GEOM_Object_ptr GroupGUI_BooleanDlg::getFather(GEOM::GEOM_Object_ptr theOb
 QList<GEOM::GeomObjPtr> GroupGUI_BooleanDlg::getSourceObjects()
 {
   QList<GEOM::GeomObjPtr> res;
-  for (int i = 0; i < myListShapes.length(); i++) {
+  for ( CORBA::ULong i = 0; i < myListShapes.length(); i++) {
     GEOM::GeomObjPtr aGeomObjPtr(myListShapes[i]);
     res << aGeomObjPtr;
   }
-  for (int i = 0; i < myListTools.length(); i++) {
+  for ( CORBA::ULong i = 0; i < myListTools.length(); i++) {
     GEOM::GeomObjPtr aGeomObjPtr(myListTools[i]);
     res << aGeomObjPtr;
   }

src/Material/Material_ResourceMgr.cxx

@@ -101,10 +101,10 @@ Material_ResourceMgr* Material_ResourceMgr::resourceMgr()
 }
 
 /*!
-  \brief Get list of avaiable materials
+  \brief Get list of available materials
   \param theType material type
   \param theSort if \c true (default), returns a list of materials sorted by name
-  \return list of avaiable materials names
+  \return list of available materials names
 */
 QStringList Material_ResourceMgr::materials( MaterialType theType, bool theSort )
 {

src/MeasureGUI/MeasureGUI_CheckSelfIntersectionsDlg.cxx

@@ -89,7 +89,7 @@ MeasureGUI_CheckSelfIntersectionsDlg::MeasureGUI_CheckSelfIntersectionsDlg (Geom
   mainFrame()->RadioButton3->close();
 
   /***************************************************************/
-  /* SIMPLE SELF-INTERSECTION constructor
+  // SIMPLE SELF-INTERSECTION constructor
   /***************************************************************/
   mySimpleGrp             = new QGroupBox(tr("GEOM_CHECK_INFOS"));
   QLabel    *anObjLbl    = new QLabel(tr("GEOM_OBJECT"));
@@ -139,7 +139,7 @@ MeasureGUI_CheckSelfIntersectionsDlg::MeasureGUI_CheckSelfIntersectionsDlg (Geom
   aGrpLayout1->addWidget(myShapeList1,     6, 2);
 
   /***************************************************************/
-  /* FAST SELF-INTERSECTION constructor
+  // FAST SELF-INTERSECTION constructor
   /***************************************************************/
   
   myFastGrp               = new QGroupBox(tr("GEOM_CHECK_INFOS"), centralWidget());
@@ -268,7 +268,7 @@ void MeasureGUI_CheckSelfIntersectionsDlg::Init()
   /***************************************************************/
 
   connect(this,               SIGNAL(constructorsClicked(int)), 
-	  this,               SLOT(ConstructorsClicked(int)));
+          this,               SLOT(ConstructorsClicked(int)));
   connect(myGeomGUI,          SIGNAL(SignalDeactivateActiveDialog()),
           this,               SLOT(DeactivateActiveDialog()));
   connect(myGeomGUI,          SIGNAL(SignalCloseAllDialogs()),
@@ -527,19 +527,19 @@ void MeasureGUI_CheckSelfIntersectionsDlg::SelectionIntoArgument()
 
   if ( getConstructorId() == 0 ) {
     typesLst << TopAbs_COMPOUND
-	     << TopAbs_COMPSOLID
+             << TopAbs_COMPSOLID
-	     << TopAbs_SOLID
+             << TopAbs_SOLID
-	     << TopAbs_SHELL
+             << TopAbs_SHELL
-	     << TopAbs_FACE
+             << TopAbs_FACE
-	     << TopAbs_WIRE
+             << TopAbs_WIRE
-	     << TopAbs_EDGE
+             << TopAbs_EDGE
-	     << TopAbs_VERTEX
+             << TopAbs_VERTEX
-	     << TopAbs_SHAPE;
+             << TopAbs_SHAPE;
   } else {
     typesLst << TopAbs_FACE
-	     << TopAbs_SHELL
+             << TopAbs_SHELL
-	     << TopAbs_SOLID
+             << TopAbs_SOLID
-	     << TopAbs_COMPOUND;
+             << TopAbs_COMPOUND;
   }
 
   // Clear the dialog.
@@ -672,11 +672,11 @@ void MeasureGUI_CheckSelfIntersectionsDlg::onSubShapesListSelectionChanged()
     foreach(int idx, aIds) {
       aSubShape = anIndices.FindKey(idx);
       try {
-	SALOME_Prs* aPrs = !aSubShape.IsNull() ? getDisplayer()->BuildPrs(aSubShape) : 0;
+        SALOME_Prs* aPrs = !aSubShape.IsNull() ? getDisplayer()->BuildPrs(aSubShape) : 0;
-	if (aPrs) displayPreview(aPrs, true);
+        if (aPrs) displayPreview(aPrs, true);
       }
       catch (const SALOME::SALOME_Exception& e) {
-	SalomeApp_Tools::QtCatchCorbaException(e);
+        SalomeApp_Tools::QtCatchCorbaException(e);
       }
     }
   }

src/MeasureGUI/MeasureGUI_CheckShapeDlg.cxx

@@ -475,7 +475,7 @@ void MeasureGUI_CheckShapeDlg::onErrorsListSelectionChanged()
 
   myGrp->ListBox2->clear();
 
-  if (aCurItem < aErrs.length()) {
+  if (aCurItem < (int)aErrs.length()) {
     GEOM::GEOM_IMeasureOperations::ShapeError aErr = aErrs[aCurItem];
     GEOM::ListOfLong aObjLst = aErr.incriminated;
     QStringList aSubShapeList;

src/MeasureGUI/MeasureGUI_DimensionCreateTool.cxx

@@ -1076,7 +1076,7 @@ void MeasureGUI_DimensionCreateTool::ChooseLengthFlyoutsFromBnd( SeqOfDirs& theD
   {
     const gp_Pln& aPlane = aPlaneIt.Value();
 
-    // transform bounding box to orthogonal coordiantes relative to
+    // transform bounding box to orthogonal coordinates relative to
     // dimension points P1, P2 (x-axis) and plane direction (z-axis),
     // where y coordinates will correspond to flyout direction against
     // the dimension point line

src/MeasureGUI/MeasureGUI_DistanceDlg.cxx

@@ -204,7 +204,7 @@ void MeasureGUI_DistanceDlg::enterEvent(QEvent*)
 //=================================================================================
 void MeasureGUI_DistanceDlg::SolutionSelected (int i)
 {
-  if (i < 0 || myDbls->length() < (i+1)*6) {
+  if (i < 0 || (int)myDbls->length() < (i+1)*6) {
     myGrp->LineEdit3->setText("");
     myGrp->LineEdit4->setText("");
     myGrp->LineEdit5->setText("");
@@ -341,7 +341,7 @@ SALOME_Prs* MeasureGUI_DistanceDlg::buildPrs()
   int currSol = myGrp->ComboBox1->currentIndex();
 
   if (!myObj1 || !myObj2 ||
-      currSol == -1 || (currSol+1)*6 > myDbls->length() ||
+      currSol == -1 || (currSol+1)*6 > (int)myDbls->length() ||
       vw->getViewManager()->getType() != OCCViewer_Viewer::Type())
     return 0;