From fde342bef471648e5265fa28f6464241708c79d4 Mon Sep 17 00:00:00 2001 From: jfa Date: Wed, 27 Dec 2017 11:32:50 +0300 Subject: [PATCH 1/5] 0023451: Remove Extra Edges. Version without OCCT modification. --- src/BlockFix/BlockFix_UnionFaces.cxx | 98 ++++++++++------------------ 1 file changed, 35 insertions(+), 63 deletions(-) diff --git a/src/BlockFix/BlockFix_UnionFaces.cxx b/src/BlockFix/BlockFix_UnionFaces.cxx index 7406cd4df..1a6a9b3d6 100644 --- a/src/BlockFix/BlockFix_UnionFaces.cxx +++ b/src/BlockFix/BlockFix_UnionFaces.cxx @@ -88,6 +88,8 @@ #include #include #include +#include +#include #include #include @@ -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 -// for Mantis issue 0023451 by JGV - !IsEdgeValidToMerge(edge, aFace, aBaseSurface, IsEdgeOnSeam, ToMakeUPeriodic, ToMakeVPeriodic)) -#else - !IsEdgeValidToMerge(edge, aFace)) -#endif + !IsEdgeValidToMerge(edge, aFace, aBaseSurface, + IsEdgeOnSeam, ToMakeUPeriodic, ToMakeVPeriodic)) 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; @@ -725,12 +699,10 @@ TopoDS_Shape BlockFix_UnionFaces::Perform(const TopoDS_Shape& Shape) //Intializing 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 From a9fe5759c52e7f225c6b1403bf93fc97c10874b9 Mon Sep 17 00:00:00 2001 From: eap Date: Thu, 28 Dec 2017 14:38:33 +0300 Subject: [PATCH 2/5] Typo-fix by Kunda http://www.salome-platform.org/forum/forum_9/22126441 --- idl/GEOM_Gen.idl | 22 ++++++------- .../AdvancedEngine_IOperations.cxx | 4 +-- .../AdvancedEngine_PipeTShapeDriver.cxx | 4 +-- src/BasicGUI/BasicGUI_PointDlg.cxx | 6 ++-- src/BlockFix/BlockFix.cxx | 2 +- src/CurveCreator/CurveCreator_UtilsICurve.hxx | 2 +- src/CurveCreator/CurveCreator_Widget.cxx | 2 +- src/EntityGUI/EntityGUI_FieldDlg.cxx | 2 +- src/EntityGUI/EntityGUI_SketcherDlg.cxx | 2 +- src/GEOM/GEOM_IField.hxx | 2 +- src/GEOMAlgo/GEOMAlgo_ShapeInfo.cxx | 2 +- src/GEOMBase/GEOMBase.h | 2 +- src/GEOMBase/GEOMBase_Helper.cxx | 2 +- src/GEOMBase/GEOMBase_Helper.h | 2 +- src/GEOMGUI/GEOMGUI_DimensionProperty.h | 22 ++++++------- src/GEOMGUI/GEOM_Displayer.cxx | 4 +-- src/GEOMGUI/GEOM_Displayer.h | 2 +- src/GEOMImpl/GEOMImpl_ArchimedeDriver.cxx | 2 +- src/GEOMImpl/GEOMImpl_GlueDriver.cxx | 6 ++-- src/GEOMImpl/GEOMImpl_HealingDriver.cxx | 2 +- src/GEOMImpl/GEOMImpl_IArc.hxx | 2 +- src/GEOMImpl/GEOMImpl_IArchimede.hxx | 2 +- src/GEOMImpl/GEOMImpl_IBoolean.hxx | 2 +- src/GEOMImpl/GEOMImpl_IBox.hxx | 2 +- src/GEOMImpl/GEOMImpl_ICircle.hxx | 2 +- src/GEOMImpl/GEOMImpl_ICone.hxx | 2 +- src/GEOMImpl/GEOMImpl_ICopy.hxx | 2 +- src/GEOMImpl/GEOMImpl_ICylinder.hxx | 2 +- src/GEOMImpl/GEOMImpl_IDisk.hxx | 2 +- src/GEOMImpl/GEOMImpl_IEllipse.hxx | 2 +- src/GEOMImpl/GEOMImpl_IExtract.hxx | 2 +- src/GEOMImpl/GEOMImpl_IFace.hxx | 2 +- src/GEOMImpl/GEOMImpl_IFilling.hxx | 2 +- src/GEOMImpl/GEOMImpl_IImportExport.hxx | 2 +- src/GEOMImpl/GEOMImpl_ILine.hxx | 2 +- src/GEOMImpl/GEOMImpl_IOffset.hxx | 2 +- src/GEOMImpl/GEOMImpl_IPartition.hxx | 2 +- src/GEOMImpl/GEOMImpl_IPipe.hxx | 2 +- src/GEOMImpl/GEOMImpl_IPipeDiffSect.hxx | 2 +- src/GEOMImpl/GEOMImpl_IPipeShellSect.hxx | 2 +- src/GEOMImpl/GEOMImpl_IPlane.hxx | 2 +- src/GEOMImpl/GEOMImpl_IPosition.hxx | 2 +- src/GEOMImpl/GEOMImpl_IPrism.hxx | 2 +- src/GEOMImpl/GEOMImpl_IRevolution.hxx | 2 +- src/GEOMImpl/GEOMImpl_IScale.hxx | 2 +- src/GEOMImpl/GEOMImpl_IShapeExtend.hxx | 2 +- src/GEOMImpl/GEOMImpl_ISphere.hxx | 2 +- src/GEOMImpl/GEOMImpl_IThruSections.hxx | 2 +- src/GEOMImpl/GEOMImpl_ITorus.hxx | 2 +- src/GEOMImpl/GEOMImpl_ITransferData.cxx | 2 +- src/GEOMImpl/GEOMImpl_ITransferData.hxx | 2 +- src/GEOMImpl/GEOMImpl_ITranslate.hxx | 2 +- src/GEOMImpl/GEOMImpl_PipeDriver.cxx | 6 ++-- src/GEOMImpl/GEOMImpl_PolylineDumper.cxx | 2 +- src/GEOMToolsGUI/GEOMToolsGUI.cxx | 2 +- src/GEOMToolsGUI/GEOMToolsGUI_1.cxx | 2 +- .../GEOMToolsGUI_MaterialPropertiesDlg.cxx | 2 +- src/GEOMUtils/GEOMUtils.hxx | 6 ++-- src/GEOM_I/GEOM_Gen_i.cc | 8 ++--- src/GEOM_I/GEOM_IMeasureOperations_i.cc | 2 +- src/GEOM_SWIG/GEOM_TestHealing.py | 2 +- src/GEOM_SWIG/GEOM_blocks.py | 2 +- src/GEOM_SWIG/geomBuilder.py | 24 +++++++------- src/GEOM_SWIG_WITHIHM/libGEOM_Swig.cxx | 2 +- src/Material/Material_ResourceMgr.cxx | 4 +-- .../MeasureGUI_DimensionCreateTool.cxx | 2 +- src/OBJECT/GEOM_Annotation.cxx | 2 +- src/OBJECT/GEOM_Annotation.hxx | 8 ++--- src/RepairGUI/RepairGUI_ShapeProcessDlg.cxx | 2 +- src/SKETCHER/Sketcher_Profile.cxx | 32 +++++++++---------- src/ShHealOper/ShHealOper_EdgeDivide.cxx | 4 +-- src/ShHealOper/ShHealOper_EdgeDivide.hxx | 2 +- src/ShHealOper/ShHealOper_ShapeProcess.hxx | 4 +-- 73 files changed, 139 insertions(+), 139 deletions(-) diff --git a/idl/GEOM_Gen.idl b/idl/GEOM_Gen.idl index 7241c256d..cd8f8c808 100644 --- a/idl/GEOM_Gen.idl +++ b/idl/GEOM_Gen.idl @@ -391,7 +391,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() */ @@ -402,7 +402,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() */ @@ -1903,7 +1903,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). @@ -4184,8 +4184,8 @@ module GEOM SALOMEDS::TMPFile GetTexture(in long theID, out long theWidth, out long theHeight); /*! - * \brief Get list of all avaiable texture IDs - * \return list of all texture IDs avaiable for the current study + * \brief Get list of all available texture IDs + * \return list of all texture IDs available for the current study */ ListOfLong GetAllTextures(); @@ -4544,7 +4544,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 @@ -4557,9 +4557,9 @@ module GEOM out ListOfLong theIntersections); /*! - * \brief Check boolean and partition operations agruments. - * \param theShape the agrument of an operation to be checked. - * \return TRUE if the agrument is valid for a boolean or partition + * \brief Check boolean and partition operations arguments. + * \param theShape the argument of an operation to be checked. + * \return TRUE if the argument is valid for a boolean or partition * operation; FALSE otherwise. */ boolean CheckBOPArguments (in GEOM_Object theShape); @@ -4571,7 +4571,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 @@ -5044,7 +5044,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); diff --git a/src/AdvancedEngine/AdvancedEngine_IOperations.cxx b/src/AdvancedEngine/AdvancedEngine_IOperations.cxx index 4af7dd3b6..1641097db 100644 --- a/src/AdvancedEngine/AdvancedEngine_IOperations.cxx +++ b/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(); } diff --git a/src/AdvancedEngine/AdvancedEngine_PipeTShapeDriver.cxx b/src/AdvancedEngine/AdvancedEngine_PipeTShapeDriver.cxx index 4549680fb..dffa0b5f5 100644 --- a/src/AdvancedEngine/AdvancedEngine_PipeTShapeDriver.cxx +++ b/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(); diff --git a/src/BasicGUI/BasicGUI_PointDlg.cxx b/src/BasicGUI/BasicGUI_PointDlg.cxx index 66326b97d..5d7668a8a 100644 --- a/src/BasicGUI/BasicGUI_PointDlg.cxx +++ b/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 diff --git a/src/BlockFix/BlockFix.cxx b/src/BlockFix/BlockFix.cxx index 3c095f058..30f2505d9 100644 --- a/src/BlockFix/BlockFix.cxx +++ b/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); diff --git a/src/CurveCreator/CurveCreator_UtilsICurve.hxx b/src/CurveCreator/CurveCreator_UtilsICurve.hxx index 33af24245..804c81737 100644 --- a/src/CurveCreator/CurveCreator_UtilsICurve.hxx +++ b/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 */ diff --git a/src/CurveCreator/CurveCreator_Widget.cxx b/src/CurveCreator/CurveCreator_Widget.cxx index a76f408f1..ae0c67d91 100644 --- a/src/CurveCreator/CurveCreator_Widget.cxx +++ b/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 */ diff --git a/src/EntityGUI/EntityGUI_FieldDlg.cxx b/src/EntityGUI/EntityGUI_FieldDlg.cxx index 58d99914e..f74de4a98 100644 --- a/src/EntityGUI/EntityGUI_FieldDlg.cxx +++ b/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 { diff --git a/src/EntityGUI/EntityGUI_SketcherDlg.cxx b/src/EntityGUI/EntityGUI_SketcherDlg.cxx index 29b0692c2..2a1863026 100644 --- a/src/EntityGUI/EntityGUI_SketcherDlg.cxx +++ b/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() ) ); diff --git a/src/GEOM/GEOM_IField.hxx b/src/GEOM/GEOM_IField.hxx index d6da53b27..4092b5f9a 100644 --- a/src/GEOM/GEOM_IField.hxx +++ b/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" diff --git a/src/GEOMAlgo/GEOMAlgo_ShapeInfo.cxx b/src/GEOMAlgo/GEOMAlgo_ShapeInfo.cxx index 6eaf087dc..3614245da 100644 --- a/src/GEOMAlgo/GEOMAlgo_ShapeInfo.cxx +++ b/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; } } diff --git a/src/GEOMBase/GEOMBase.h b/src/GEOMBase/GEOMBase.h index 1ec882ca1..58319d39b 100644 --- a/src/GEOMBase/GEOMBase.h +++ b/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 ); diff --git a/src/GEOMBase/GEOMBase_Helper.cxx b/src/GEOMBase/GEOMBase_Helper.cxx index c38769a9a..cbd5e5e6c 100755 --- a/src/GEOMBase/GEOMBase_Helper.cxx +++ b/src/GEOMBase/GEOMBase_Helper.cxx @@ -967,7 +967,7 @@ bool GEOMBase_Helper::onAccept( const bool publish, const bool useTransaction, b //================================================================ // 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() { diff --git a/src/GEOMBase/GEOMBase_Helper.h b/src/GEOMBase/GEOMBase_Helper.h index a62b2f129..feaf74a83 100755 --- a/src/GEOMBase/GEOMBase_Helper.h +++ b/src/GEOMBase/GEOMBase_Helper.h @@ -134,7 +134,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 diff --git a/src/GEOMGUI/GEOMGUI_DimensionProperty.h b/src/GEOMGUI/GEOMGUI_DimensionProperty.h index a2397968c..a074da494 100644 --- a/src/GEOMGUI/GEOMGUI_DimensionProperty.h +++ b/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& 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& 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& 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 { diff --git a/src/GEOMGUI/GEOM_Displayer.cxx b/src/GEOMGUI/GEOM_Displayer.cxx index c08cee809..6925d8d22 100755 --- a/src/GEOMGUI/GEOM_Displayer.cxx +++ b/src/GEOMGUI/GEOM_Displayer.cxx @@ -1672,7 +1672,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 ) @@ -1701,7 +1701,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 ) diff --git a/src/GEOMGUI/GEOM_Displayer.h b/src/GEOMGUI/GEOM_Displayer.h index d9184ec54..712fe8316 100755 --- a/src/GEOMGUI/GEOM_Displayer.h +++ b/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& ); diff --git a/src/GEOMImpl/GEOMImpl_ArchimedeDriver.cxx b/src/GEOMImpl/GEOMImpl_ArchimedeDriver.cxx index 3f42292a6..fbd647b68 100644 --- a/src/GEOMImpl/GEOMImpl_ArchimedeDriver.cxx +++ b/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); } diff --git a/src/GEOMImpl/GEOMImpl_GlueDriver.cxx b/src/GEOMImpl/GEOMImpl_GlueDriver.cxx index 20ab8d47f..d014f5503 100644 --- a/src/GEOMImpl/GEOMImpl_GlueDriver.cxx +++ b/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 diff --git a/src/GEOMImpl/GEOMImpl_HealingDriver.cxx b/src/GEOMImpl/GEOMImpl_HealingDriver.cxx index c75a775b2..5014ef7e8 100644 --- a/src/GEOMImpl/GEOMImpl_HealingDriver.cxx +++ b/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 ) { diff --git a/src/GEOMImpl/GEOMImpl_IArc.hxx b/src/GEOMImpl/GEOMImpl_IArc.hxx index f95c5cd9e..344dbfb46 100644 --- a/src/GEOMImpl/GEOMImpl_IArc.hxx +++ b/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" diff --git a/src/GEOMImpl/GEOMImpl_IArchimede.hxx b/src/GEOMImpl/GEOMImpl_IArchimede.hxx index ac0009cdd..5d0da1171 100644 --- a/src/GEOMImpl/GEOMImpl_IArchimede.hxx +++ b/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" diff --git a/src/GEOMImpl/GEOMImpl_IBoolean.hxx b/src/GEOMImpl/GEOMImpl_IBoolean.hxx index 470739bd5..499d89517 100644 --- a/src/GEOMImpl/GEOMImpl_IBoolean.hxx +++ b/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" diff --git a/src/GEOMImpl/GEOMImpl_IBox.hxx b/src/GEOMImpl/GEOMImpl_IBox.hxx index 5a152c933..fd571341a 100644 --- a/src/GEOMImpl/GEOMImpl_IBox.hxx +++ b/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" diff --git a/src/GEOMImpl/GEOMImpl_ICircle.hxx b/src/GEOMImpl/GEOMImpl_ICircle.hxx index 70a71b6f0..d87ccb8cc 100644 --- a/src/GEOMImpl/GEOMImpl_ICircle.hxx +++ b/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" diff --git a/src/GEOMImpl/GEOMImpl_ICone.hxx b/src/GEOMImpl/GEOMImpl_ICone.hxx index a55d2b561..6d534aebe 100644 --- a/src/GEOMImpl/GEOMImpl_ICone.hxx +++ b/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" diff --git a/src/GEOMImpl/GEOMImpl_ICopy.hxx b/src/GEOMImpl/GEOMImpl_ICopy.hxx index a3ec0c733..6fc5df8ea 100644 --- a/src/GEOMImpl/GEOMImpl_ICopy.hxx +++ b/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" diff --git a/src/GEOMImpl/GEOMImpl_ICylinder.hxx b/src/GEOMImpl/GEOMImpl_ICylinder.hxx index 3215ffca8..b37cb553a 100644 --- a/src/GEOMImpl/GEOMImpl_ICylinder.hxx +++ b/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" diff --git a/src/GEOMImpl/GEOMImpl_IDisk.hxx b/src/GEOMImpl/GEOMImpl_IDisk.hxx index e3dd2d52f..32b43637e 100755 --- a/src/GEOMImpl/GEOMImpl_IDisk.hxx +++ b/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" diff --git a/src/GEOMImpl/GEOMImpl_IEllipse.hxx b/src/GEOMImpl/GEOMImpl_IEllipse.hxx index 0a84af66f..3db6b40c8 100644 --- a/src/GEOMImpl/GEOMImpl_IEllipse.hxx +++ b/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" diff --git a/src/GEOMImpl/GEOMImpl_IExtract.hxx b/src/GEOMImpl/GEOMImpl_IExtract.hxx index b5905696e..93a6d5dae 100644 --- a/src/GEOMImpl/GEOMImpl_IExtract.hxx +++ b/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 diff --git a/src/GEOMImpl/GEOMImpl_IFace.hxx b/src/GEOMImpl/GEOMImpl_IFace.hxx index 1c240cb7d..ece051018 100755 --- a/src/GEOMImpl/GEOMImpl_IFace.hxx +++ b/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" diff --git a/src/GEOMImpl/GEOMImpl_IFilling.hxx b/src/GEOMImpl/GEOMImpl_IFilling.hxx index 812ac132c..059c501b2 100644 --- a/src/GEOMImpl/GEOMImpl_IFilling.hxx +++ b/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 diff --git a/src/GEOMImpl/GEOMImpl_IImportExport.hxx b/src/GEOMImpl/GEOMImpl_IImportExport.hxx index c0ef51087..de71434f9 100644 --- a/src/GEOMImpl/GEOMImpl_IImportExport.hxx +++ b/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" diff --git a/src/GEOMImpl/GEOMImpl_ILine.hxx b/src/GEOMImpl/GEOMImpl_ILine.hxx index 0e186f741..1257dc8c4 100644 --- a/src/GEOMImpl/GEOMImpl_ILine.hxx +++ b/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" diff --git a/src/GEOMImpl/GEOMImpl_IOffset.hxx b/src/GEOMImpl/GEOMImpl_IOffset.hxx index fea75eac9..21287c81a 100644 --- a/src/GEOMImpl/GEOMImpl_IOffset.hxx +++ b/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 diff --git a/src/GEOMImpl/GEOMImpl_IPartition.hxx b/src/GEOMImpl/GEOMImpl_IPartition.hxx index bcb58e5a0..a37e95368 100644 --- a/src/GEOMImpl/GEOMImpl_IPartition.hxx +++ b/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" diff --git a/src/GEOMImpl/GEOMImpl_IPipe.hxx b/src/GEOMImpl/GEOMImpl_IPipe.hxx index 798b3348b..35c730678 100644 --- a/src/GEOMImpl/GEOMImpl_IPipe.hxx +++ b/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_ diff --git a/src/GEOMImpl/GEOMImpl_IPipeDiffSect.hxx b/src/GEOMImpl/GEOMImpl_IPipeDiffSect.hxx index c0dd78003..bfe638a26 100644 --- a/src/GEOMImpl/GEOMImpl_IPipeDiffSect.hxx +++ b/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_ diff --git a/src/GEOMImpl/GEOMImpl_IPipeShellSect.hxx b/src/GEOMImpl/GEOMImpl_IPipeShellSect.hxx index bd508bfd4..a816e42e4 100644 --- a/src/GEOMImpl/GEOMImpl_IPipeShellSect.hxx +++ b/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_ diff --git a/src/GEOMImpl/GEOMImpl_IPlane.hxx b/src/GEOMImpl/GEOMImpl_IPlane.hxx index 0ad501049..34b6c352a 100644 --- a/src/GEOMImpl/GEOMImpl_IPlane.hxx +++ b/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" diff --git a/src/GEOMImpl/GEOMImpl_IPosition.hxx b/src/GEOMImpl/GEOMImpl_IPosition.hxx index 6aa23a52d..44702db0d 100644 --- a/src/GEOMImpl/GEOMImpl_IPosition.hxx +++ b/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" diff --git a/src/GEOMImpl/GEOMImpl_IPrism.hxx b/src/GEOMImpl/GEOMImpl_IPrism.hxx index ecfc91e64..06982fd7e 100644 --- a/src/GEOMImpl/GEOMImpl_IPrism.hxx +++ b/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 TEST diff --git a/src/GEOMImpl/GEOMImpl_IRevolution.hxx b/src/GEOMImpl/GEOMImpl_IRevolution.hxx index 9a7f9bf90..cbbc52b66 100644 --- a/src/GEOMImpl/GEOMImpl_IRevolution.hxx +++ b/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" diff --git a/src/GEOMImpl/GEOMImpl_IScale.hxx b/src/GEOMImpl/GEOMImpl_IScale.hxx index f819ac140..5db120a78 100644 --- a/src/GEOMImpl/GEOMImpl_IScale.hxx +++ b/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" diff --git a/src/GEOMImpl/GEOMImpl_IShapeExtend.hxx b/src/GEOMImpl/GEOMImpl_IShapeExtend.hxx index 004bc142b..6bdb18092 100644 --- a/src/GEOMImpl/GEOMImpl_IShapeExtend.hxx +++ b/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" diff --git a/src/GEOMImpl/GEOMImpl_ISphere.hxx b/src/GEOMImpl/GEOMImpl_ISphere.hxx index 248c697c1..bbc5e176f 100644 --- a/src/GEOMImpl/GEOMImpl_ISphere.hxx +++ b/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" diff --git a/src/GEOMImpl/GEOMImpl_IThruSections.hxx b/src/GEOMImpl/GEOMImpl_IThruSections.hxx index f0d04e927..91303ee9a 100644 --- a/src/GEOMImpl/GEOMImpl_IThruSections.hxx +++ b/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 diff --git a/src/GEOMImpl/GEOMImpl_ITorus.hxx b/src/GEOMImpl/GEOMImpl_ITorus.hxx index ed224a03f..3c04a7cb6 100644 --- a/src/GEOMImpl/GEOMImpl_ITorus.hxx +++ b/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" diff --git a/src/GEOMImpl/GEOMImpl_ITransferData.cxx b/src/GEOMImpl/GEOMImpl_ITransferData.cxx index e4ae42a6e..e6e11f659 100644 --- a/src/GEOMImpl/GEOMImpl_ITransferData.cxx +++ b/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. // diff --git a/src/GEOMImpl/GEOMImpl_ITransferData.hxx b/src/GEOMImpl/GEOMImpl_ITransferData.hxx index acded66d7..a29294649 100644 --- a/src/GEOMImpl/GEOMImpl_ITransferData.hxx +++ b/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. // diff --git a/src/GEOMImpl/GEOMImpl_ITranslate.hxx b/src/GEOMImpl/GEOMImpl_ITranslate.hxx index d48d438cd..c128d03ac 100755 --- a/src/GEOMImpl/GEOMImpl_ITranslate.hxx +++ b/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" diff --git a/src/GEOMImpl/GEOMImpl_PipeDriver.cxx b/src/GEOMImpl/GEOMImpl_PipeDriver.cxx index 5bb530e39..d84397a4c 100644 --- a/src/GEOMImpl/GEOMImpl_PipeDriver.cxx +++ b/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 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"); } } diff --git a/src/GEOMImpl/GEOMImpl_PolylineDumper.cxx b/src/GEOMImpl/GEOMImpl_PolylineDumper.cxx index 3a34f1bcb..52e71ee4f 100644 --- a/src/GEOMImpl/GEOMImpl_PolylineDumper.cxx +++ b/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 << "["; diff --git a/src/GEOMToolsGUI/GEOMToolsGUI.cxx b/src/GEOMToolsGUI/GEOMToolsGUI.cxx index bd79254a3..d79a68e10 100644 --- a/src/GEOMToolsGUI/GEOMToolsGUI.cxx +++ b/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( _PTR(Study) study, const QString& component, const QMap& objects ) diff --git a/src/GEOMToolsGUI/GEOMToolsGUI_1.cxx b/src/GEOMToolsGUI/GEOMToolsGUI_1.cxx index 8f463bcbf..723dd270d 100644 --- a/src/GEOMToolsGUI/GEOMToolsGUI_1.cxx +++ b/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 diff --git a/src/GEOMToolsGUI/GEOMToolsGUI_MaterialPropertiesDlg.cxx b/src/GEOMToolsGUI/GEOMToolsGUI_MaterialPropertiesDlg.cxx index bc62c01c0..c96f80821 100644 --- a/src/GEOMToolsGUI/GEOMToolsGUI_MaterialPropertiesDlg.cxx +++ b/src/GEOMToolsGUI/GEOMToolsGUI_MaterialPropertiesDlg.cxx @@ -67,7 +67,7 @@ */ /*! - \brief Contructor + \brief Constructor */ GEOMToolsGUI_MaterialList::GEOMToolsGUI_MaterialList( QWidget* parent ) : QListWidget( parent ) diff --git a/src/GEOMUtils/GEOMUtils.hxx b/src/GEOMUtils/GEOMUtils.hxx index 20201f799..c91556ae3 100644 --- a/src/GEOMUtils/GEOMUtils.hxx +++ b/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 - * \return \c true if the agrument is valid for a boolean or partition + * \param theShape the argument of an operation to be checked + * \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); diff --git a/src/GEOM_I/GEOM_Gen_i.cc b/src/GEOM_I/GEOM_Gen_i.cc index 34365e199..fc6cee5c4 100644 --- a/src/GEOM_I/GEOM_Gen_i.cc +++ b/src/GEOM_I/GEOM_Gen_i.cc @@ -919,7 +919,7 @@ GEOM::ListOfGO* GEOM_Gen_i::RestoreSubShapesO (SALOMEDS::Study_ptr theStudy, CORBA::String_var anIORo = _orb->object_to_string(theObject); SALOMEDS::SObject_var aSO = theStudy->FindObjectIOR(anIORo.in()); //PTv, IMP 0020001, The salome object - // 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(); @@ -949,7 +949,7 @@ GEOM::ListOfGO* GEOM_Gen_i::RestoreGivenSubShapesO (SALOMEDS::Study_ptr theS CORBA::String_var anIORo = _orb->object_to_string(theObject); SALOMEDS::SObject_var aSO = theStudy->FindObjectIOR(anIORo.in()); //PTv, IMP 0020001, The salome object - // 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(); @@ -1033,7 +1033,7 @@ GEOM::ListOfGO* GEOM_Gen_i::RestoreSubShapes(SALOMEDS::Study_ptr theStudy, { GEOM::ListOfGO_var aParts = new GEOM::ListOfGO; //PTv, IMP 0020001, The salome object - // is not obligatory in case of invokation from script + // is not obligatory in case of invocation from script if (CORBA::is_nil(theStudy) || CORBA::is_nil(theObject) /*|| CORBA::is_nil(theSObject)*/) return aParts._retn(); @@ -1625,7 +1625,7 @@ GEOM::ListOfGO* GEOM_Gen_i::RestoreGivenSubShapes(SALOMEDS::Study_ptr theStu { GEOM::ListOfGO_var aParts = new GEOM::ListOfGO; //PTv, IMP 0020001, The salome object - // is not obligatory in case of invokation from script + // is not obligatory in case of invocation from script if (CORBA::is_nil(theStudy) || CORBA::is_nil(theObject) /*|| CORBA::is_nil(theSObject)*/) return aParts._retn(); diff --git a/src/GEOM_I/GEOM_IMeasureOperations_i.cc b/src/GEOM_I/GEOM_IMeasureOperations_i.cc index ad7fe1b03..80340bb7c 100644 --- a/src/GEOM_I/GEOM_IMeasureOperations_i.cc +++ b/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); } diff --git a/src/GEOM_SWIG/GEOM_TestHealing.py b/src/GEOM_SWIG/GEOM_TestHealing.py index 4b7951596..dc22c1cee 100644 --- a/src/GEOM_SWIG/GEOM_TestHealing.py +++ b/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 diff --git a/src/GEOM_SWIG/GEOM_blocks.py b/src/GEOM_SWIG/GEOM_blocks.py index c33b2c446..43f1e1016 100644 --- a/src/GEOM_SWIG/GEOM_blocks.py +++ b/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 diff --git a/src/GEOM_SWIG/geomBuilder.py b/src/GEOM_SWIG/geomBuilder.py index 79dd09036..bf056947d 100644 --- a/src/GEOM_SWIG/geomBuilder.py +++ b/src/GEOM_SWIG/geomBuilder.py @@ -4289,7 +4289,7 @@ class geomBuilder(object, 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. @@ -4318,7 +4318,7 @@ class geomBuilder(object, 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. @@ -11462,7 +11462,7 @@ class geomBuilder(object, 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) @@ -11477,7 +11477,7 @@ class geomBuilder(object, 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) @@ -11491,20 +11491,20 @@ class geomBuilder(object, GEOM._objref_GEOM_Gen): RaiseIfFailed("CheckSelfIntersectionsFast", self.MeasuOp) return IsValid - ## Check boolean and partition operations agruments. - # @param theShape the agrument of an operation to be checked - # @return TRUE if the agrument is valid for a boolean or partition + ## Check boolean and partition operations arguments. + # @param theShape the argument of an operation to be checked + # @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) @@ -11515,7 +11515,7 @@ class geomBuilder(object, 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. @@ -11533,7 +11533,7 @@ class geomBuilder(object, 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: diff --git a/src/GEOM_SWIG_WITHIHM/libGEOM_Swig.cxx b/src/GEOM_SWIG_WITHIHM/libGEOM_Swig.cxx index 2d3306979..0efbe7f0d 100644 --- a/src/GEOM_SWIG_WITHIHM/libGEOM_Swig.cxx +++ b/src/GEOM_SWIG_WITHIHM/libGEOM_Swig.cxx @@ -508,7 +508,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() { diff --git a/src/Material/Material_ResourceMgr.cxx b/src/Material/Material_ResourceMgr.cxx index 02e3fabe7..1c09c4360 100644 --- a/src/Material/Material_ResourceMgr.cxx +++ b/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 ) { diff --git a/src/MeasureGUI/MeasureGUI_DimensionCreateTool.cxx b/src/MeasureGUI/MeasureGUI_DimensionCreateTool.cxx index 47a2f38de..a03a0f4e8 100644 --- a/src/MeasureGUI/MeasureGUI_DimensionCreateTool.cxx +++ b/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 diff --git a/src/OBJECT/GEOM_Annotation.cxx b/src/OBJECT/GEOM_Annotation.cxx index 808893ac8..d45fed6c8 100755 --- a/src/OBJECT/GEOM_Annotation.cxx +++ b/src/OBJECT/GEOM_Annotation.cxx @@ -209,7 +209,7 @@ void GEOM_Annotation::SetAttachPoint( const gp_Pnt& thePoint ) // ======================================================================= // function : SetHilightShape -// purpose : Sets shape (annotated shape) that will be used for hilighting. +// purpose : Sets shape (annotated shape) that will be used for highlighting. // ======================================================================= void GEOM_Annotation::SetHilightShape( const TopoDS_Shape& theShape ) { diff --git a/src/OBJECT/GEOM_Annotation.hxx b/src/OBJECT/GEOM_Annotation.hxx index 3594a1b6d..794402491 100755 --- a/src/OBJECT/GEOM_Annotation.hxx +++ b/src/OBJECT/GEOM_Annotation.hxx @@ -122,10 +122,10 @@ public: //! Returns attachment point of extension line. const gp_Pnt& GetAttachPoint() const { return myAttach; } - //! Sets shape (annotated shape) that will be used for hilighting. + //! Sets shape (annotated shape) that will be used for highlighting. Standard_EXPORT void SetHilightShape( const TopoDS_Shape& theShape ); - //! Returns the hilighting shape. + //! Returns the highlighting shape. const TopoDS_Shape HilightShape() const { return myShape; } public: @@ -283,10 +283,10 @@ private: gp_Pnt myStartPosition; //!< Position before starting dragging operation. Standard_Boolean myIsScreenFixed; //!< Flag indicating whether "screen fixed" positioning mode is turned on or off. Standard_Boolean myIsAutoHide; //!< Flag indicating whether "auto-hiding" option is turned on. - Standard_Boolean myIsDepthCulling; //!< Flag indiciating whether the "depth culling" is turned on. + Standard_Boolean myIsDepthCulling; //!< Flag indicating whether the "depth culling" is turned on. HighlightMode myHilightMode; //!< Highlight mode for presentation. TCollection_ExtendedString myText; //!< Text string of the label presentation. - TopoDS_Shape myShape; //!< Hilighting shape. + TopoDS_Shape myShape; //!< Highlighting shape. private: diff --git a/src/RepairGUI/RepairGUI_ShapeProcessDlg.cxx b/src/RepairGUI/RepairGUI_ShapeProcessDlg.cxx index c073038e7..4a7e27ada 100755 --- a/src/RepairGUI/RepairGUI_ShapeProcessDlg.cxx +++ b/src/RepairGUI/RepairGUI_ShapeProcessDlg.cxx @@ -842,7 +842,7 @@ GEOM::string_array* RepairGUI_ShapeProcessDlg::getParameters( const GEOM::string for ( i = 0, j = 0; i < theOperators.length(); i++ ) j += myValMap[ QString( theOperators[i].in() ) ].size(); - // set the new length of paremeters + // set the new length of parameters aParams->length( j ); // fill the parameters diff --git a/src/SKETCHER/Sketcher_Profile.cxx b/src/SKETCHER/Sketcher_Profile.cxx index fdb7d5bb8..14da33077 100644 --- a/src/SKETCHER/Sketcher_Profile.cxx +++ b/src/SKETCHER/Sketcher_Profile.cxx @@ -594,8 +594,8 @@ void Sketcher_Profile::ShapeFunctor::addSegmentAbsolute( const TCollection_Ascii /*! \brief Add segment by relativ coordinates - \param dx dX value specifing segment end - \param dy dY value specifing segment end + \param dx dX value specifying segment end + \param dy dY value specifying segment end \internal */ void Sketcher_Profile::ShapeFunctor::addSegmentRelative( const TCollection_AsciiString& dx, @@ -801,8 +801,8 @@ void Sketcher_Profile::ShapeFunctor::addArcAbsolute( const TCollection_AsciiStri /*! \brief Add arc along current direction vector by specified relative coordinates - \param dx dX value specifing arc end - \param dy dY value specifing arc end + \param dx dX value specifying arc end + \param dy dY value specifying arc end \internal */ void Sketcher_Profile::ShapeFunctor::addArcRelative( const TCollection_AsciiString& dx, @@ -867,8 +867,8 @@ void Sketcher_Profile::ShapeFunctor::addArcRadiusAbsolute( const TCollection_Asc /*! \brief Add arc with given radius by specified relative coordinates - \param dx dX value specifing arc end - \param dy dY value specifing arc end + \param dx dX value specifying arc end + \param dy dY value specifying arc end \param radius arc radius \param flag reverse direction flag \internal @@ -958,8 +958,8 @@ void Sketcher_Profile::ShapeFunctor::addArcCenterAbsolute( const TCollection_Asc /*! \brief Add arc with given center by specified relative coordinates - \param dx dX value specifing arc end - \param dy dY value specifing arc end + \param dx dX value specifying arc end + \param dy dY value specifying arc end \param xc X coordinate of arc center \param yc Y coordinate of arc center \param flag1 reverse direction flag @@ -1351,8 +1351,8 @@ void Sketcher_Profile::DumpFunctor::addSegmentAbsolute( const TCollection_AsciiS /*! \brief Add segment by relativ coordinates - \param dx dX value specifing segment end - \param dy dY value specifing segment end + \param dx dX value specifying segment end + \param dy dY value specifying segment end \internal */ void Sketcher_Profile::DumpFunctor::addSegmentRelative( const TCollection_AsciiString& dx, @@ -1531,8 +1531,8 @@ void Sketcher_Profile::DumpFunctor::addArcAbsolute( const TCollection_AsciiStrin /*! \brief Add arc along current direction vector by specified relative coordinates - \param dx dX value specifing arc end - \param dy dY value specifing arc end + \param dx dX value specifying arc end + \param dy dY value specifying arc end \internal */ void Sketcher_Profile::DumpFunctor::addArcRelative( const TCollection_AsciiString& dx, @@ -1561,8 +1561,8 @@ void Sketcher_Profile::DumpFunctor::addArcRadiusAbsolute( const TCollection_Asci /*! \brief Add arc with given radius by specified relative coordinates - \param dx dX value specifing arc end - \param dy dY value specifing arc end + \param dx dX value specifying arc end + \param dy dY value specifying arc end \param radius arc radius \param flag reverse direction flag \internal @@ -1599,8 +1599,8 @@ void Sketcher_Profile::DumpFunctor::addArcCenterAbsolute( const TCollection_Asci /*! \brief Add arc with given center by specified relative coordinates - \param dx dX value specifing arc end - \param dy dY value specifing arc end + \param dx dX value specifying arc end + \param dy dY value specifying arc end \param xc X coordinate of arc center \param yc Y coordinate of arc center \param flag1 reverse direction flag diff --git a/src/ShHealOper/ShHealOper_EdgeDivide.cxx b/src/ShHealOper/ShHealOper_EdgeDivide.cxx index 869be89b9..c0aba1164 100644 --- a/src/ShHealOper/ShHealOper_EdgeDivide.cxx +++ b/src/ShHealOper/ShHealOper_EdgeDivide.cxx @@ -261,7 +261,7 @@ Standard_Boolean ShHealOper_EdgeDivide::computeValues(const Handle(TColStd_HSequ Standard_Real aFirst =0.,aLast=0.; - //computation of the split values if edge should be splitted by parameter. + //computation of the split values if edge should be split by parameter. if(myDivideParamMode) { BRep_Tool::Range(myEdge,aFirst,aLast); Handle(Geom_Curve) aCurve = BRep_Tool::Curve(myEdge,aFirst,aLast); @@ -275,7 +275,7 @@ Standard_Boolean ShHealOper_EdgeDivide::computeValues(const Handle(TColStd_HSequ } } else { - //computation of the split values if edge should be splitted by length. + //computation of the split values if edge should be split by length. ShapeAnalysis_Edge sae; Handle(Geom_Curve) aCurve; Standard_Real aCurLen =0.; diff --git a/src/ShHealOper/ShHealOper_EdgeDivide.hxx b/src/ShHealOper/ShHealOper_EdgeDivide.hxx index 1a9eebb7d..2302ba8e5 100644 --- a/src/ShHealOper/ShHealOper_EdgeDivide.hxx +++ b/src/ShHealOper/ShHealOper_EdgeDivide.hxx @@ -56,7 +56,7 @@ class ShHealOper_EdgeDivide : public ShHealOper_Tool const Standard_Boolean theDivideParamMode = Standard_True); //Performs spitting of the specified edge in the accoradnce to //specified mode and value. - //If theDivideParamMode is equal to true edge will be splitted by parameter. + //If theDivideParamMode is equal to true edge will be split by parameter. //Else edge will be spliited by length (default true). //theValue is coefficient for splitting from 0 to 1. diff --git a/src/ShHealOper/ShHealOper_ShapeProcess.hxx b/src/ShHealOper/ShHealOper_ShapeProcess.hxx index f52271dc8..b1e5c1aa5 100644 --- a/src/ShHealOper/ShHealOper_ShapeProcess.hxx +++ b/src/ShHealOper/ShHealOper_ShapeProcess.hxx @@ -47,7 +47,7 @@ class ShHealOper_ShapeProcess : public ShHealOper_Tool /// Empty constructor Standard_EXPORT ShHealOper_ShapeProcess(); - //Constuctor initializes by defaults parameters + //Constructor initializes by defaults parameters // (name of resource file - ShHealing, prefix - ShapeProcess, // SaveHistory = Standard_False, level = TopAbs_FACE) @@ -55,7 +55,7 @@ class ShHealOper_ShapeProcess : public ShHealOper_Tool Standard_EXPORT ShHealOper_ShapeProcess (const TCollection_AsciiString& theNameResource, const TCollection_AsciiString& thePrefix = "ShapeProcess"); - //Constuctor initializes by specified name of resource file and prefix + //Constructor initializes by specified name of resource file and prefix Standard_EXPORT void Perform(const TopoDS_Shape& theOldShape, TopoDS_Shape& theNewShape); From 14bd7e1d7098a3da6ffc336dd9e0e0ee6f624291 Mon Sep 17 00:00:00 2001 From: eap Date: Thu, 28 Dec 2017 14:41:31 +0300 Subject: [PATCH 3/5] Typo-fix by Kunda http://www.salome-platform.org/forum/forum_9/22126441 --- doc/salome/examples/free_boundaries.py | 4 ++-- doc/salome/gui/GEOM/input/archimede.doc | 2 +- doc/salome/gui/GEOM/input/blocks_operations.doc | 2 +- .../gui/GEOM/input/check_self_intersections.doc | 6 +++--- doc/salome/gui/GEOM/input/creating_circle.doc | 2 +- doc/salome/gui/GEOM/input/creating_explode.doc | 2 +- doc/salome/gui/GEOM/input/creating_lcs.doc | 2 +- doc/salome/gui/GEOM/input/creating_line.doc | 4 ++-- doc/salome/gui/GEOM/input/creating_plane.doc | 4 ++-- doc/salome/gui/GEOM/input/creating_polyline.doc | 2 +- doc/salome/gui/GEOM/input/creating_sketcher.doc | 4 ++-- doc/salome/gui/GEOM/input/creating_sphere.doc | 4 ++-- doc/salome/gui/GEOM/input/creating_squareface.doc | 4 ++-- doc/salome/gui/GEOM/input/display_mode.doc | 2 +- .../gui/GEOM/input/explode_on_blocks_operation.doc | 2 +- doc/salome/gui/GEOM/input/fast_intersection.doc | 2 +- doc/salome/gui/GEOM/input/managing_dimensions.doc | 4 ++-- .../gui/GEOM/input/modify_location_operation.doc | 6 +++--- .../GEOM/input/restore_presentation_parameters.doc | 2 +- idl/GEOM_Gen.idl | 12 ++++++------ src/EntityGUI/EntityGUI_FeatureDetectorDlg.cxx | 2 +- src/EntityGUI/EntityGUI_SketcherDlg.cxx | 4 ++-- src/GEOMAlgo/GEOMAlgo_AlgoTools.hxx | 2 +- src/GEOM_SWIG/geomBuilder.py | 12 ++++++------ src/Tools/t_shape/t_shape_dialog.ui | 6 +++--- 25 files changed, 49 insertions(+), 49 deletions(-) diff --git a/doc/salome/examples/free_boundaries.py b/doc/salome/examples/free_boundaries.py index 8fe0d475b..361739a91 100644 --- a/doc/salome/examples/free_boundaries.py +++ b/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 diff --git a/doc/salome/gui/GEOM/input/archimede.doc b/doc/salome/gui/GEOM/input/archimede.doc index aed6376a5..c89be8370 100644 --- a/doc/salome/gui/GEOM/input/archimede.doc +++ b/doc/salome/gui/GEOM/input/archimede.doc @@ -13,7 +13,7 @@ water-line of the object plunged into the water (in Z direction). \n TUI Command: geompy.Archimede(Shape,Weight,WaterDensity,MeshingDeflection), 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 Arguments: Name + 1 shape + 3 values (Weight, Water Density & Meshing Deflection). diff --git a/doc/salome/gui/GEOM/input/blocks_operations.doc b/doc/salome/gui/GEOM/input/blocks_operations.doc index 685f99509..a266309d6 100644 --- a/doc/salome/gui/GEOM/input/blocks_operations.doc +++ b/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:
    diff --git a/doc/salome/gui/GEOM/input/check_self_intersections.doc b/doc/salome/gui/GEOM/input/check_self_intersections.doc index 8533274e2..55a9cb6ad 100644 --- a/doc/salome/gui/GEOM/input/check_self_intersections.doc +++ b/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. -- Deflection coefficient - a linear deflection coefficient that defines the tesselation quality. If theDeflection <= 0, default deflection 0.001 is used. +- Deflection coefficient - a linear deflection coefficient that defines the tessellation quality. If theDeflection <= 0, default deflection 0.001 is used. - Detect gaps with tolerance 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 TUI Command: geompy.CheckSelfIntersectionsFast(theShape, theDeflection, theTolerance), \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". diff --git a/doc/salome/gui/GEOM/input/creating_circle.doc b/doc/salome/gui/GEOM/input/creating_circle.doc index 4ea760993..b445a22f2 100644 --- a/doc/salome/gui/GEOM/input/creating_circle.doc +++ b/doc/salome/gui/GEOM/input/creating_circle.doc @@ -15,7 +15,7 @@ Radius) \n Arguments: Name + 1 vertex (for the center) + 1 edge (for the direction) + Radius. -\note By default it is presumed that the Center Point is located at the Origin of the global +\note By default it is presumed that the Center Point is located at the Origin of the global coordinate system, and the \b Vector corresponds to OZ axis of the global coordinate system. diff --git a/doc/salome/gui/GEOM/input/creating_explode.doc b/doc/salome/gui/GEOM/input/creating_explode.doc index 693773973..b4677831f 100644 --- a/doc/salome/gui/GEOM/input/creating_explode.doc +++ b/doc/salome/gui/GEOM/input/creating_explode.doc @@ -8,7 +8,7 @@ select New Entity > Explode. 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 Main Object, which will be exploded and the Type of Sub-shapes you wish to obtain from it. diff --git a/doc/salome/gui/GEOM/input/creating_lcs.doc b/doc/salome/gui/GEOM/input/creating_lcs.doc index 1c06b2cc3..140c05c24 100644 --- a/doc/salome/gui/GEOM/input/creating_lcs.doc +++ b/doc/salome/gui/GEOM/input/creating_lcs.doc @@ -8,7 +8,7 @@ To create a Local Coordinate System in the Main Menu select 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 TUI command: geompy.MakeMarker(OX, OY, OZ, XDX, XDY, XDZ, YDX, YDY, YDZ), 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 Arguments: Name + Coordinates of origin, X axis direction, Y axis direction. diff --git a/doc/salome/gui/GEOM/input/creating_line.doc b/doc/salome/gui/GEOM/input/creating_line.doc index 7f7daa3d9..8332c990d 100644 --- a/doc/salome/gui/GEOM/input/creating_line.doc +++ b/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 TUI Command: geompy.MakeLineTwoPnt(Point1, Point2) \n Arguments: 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 TUI Command: geompy.MakeLine(Point, Vector) diff --git a/doc/salome/gui/GEOM/input/creating_plane.doc b/doc/salome/gui/GEOM/input/creating_plane.doc index 5573f61e4..afdae95e9 100644 --- a/doc/salome/gui/GEOM/input/creating_plane.doc +++ b/doc/salome/gui/GEOM/input/creating_plane.doc @@ -8,7 +8,7 @@ Basic - > Plane \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 Size of the Plane (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 Size of the Plane. +which the plane passes and a Size of the Plane. \n TUI Command: geompy.MakePlaneThreePnt(Point1, Point2, Point3, TrimSize) \n Arguments: Name + 3 vertices + 1 value (to define the size of the plane). diff --git a/doc/salome/gui/GEOM/input/creating_polyline.doc b/doc/salome/gui/GEOM/input/creating_polyline.doc index 2ca7f4ba9..f7d5a17f8 100644 --- a/doc/salome/gui/GEOM/input/creating_polyline.doc +++ b/doc/salome/gui/GEOM/input/creating_polyline.doc @@ -9,7 +9,7 @@ To create a 2D Polyline select in the main menu 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. diff --git a/doc/salome/gui/GEOM/input/creating_sketcher.doc b/doc/salome/gui/GEOM/input/creating_sketcher.doc index 159361772..2dc805814 100644 --- a/doc/salome/gui/GEOM/input/creating_sketcher.doc +++ b/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 2D Sketch select in the main menu New Entity -> Basic -> 2D Sketch. @@ -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 diff --git a/doc/salome/gui/GEOM/input/creating_sphere.doc b/doc/salome/gui/GEOM/input/creating_sphere.doc index b772bdac8..9bf2e0ec7 100644 --- a/doc/salome/gui/GEOM/input/creating_sphere.doc +++ b/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 TUI Command: geompy. MakeSphereR(Radius) -\n Arguments: Name + 1 value (Radius from the origin). +\n Arguments: Name + 1 value (Radius from the origin). \image html sphere2.png -\n NB! The is another way to create a\b Sphere, which is +\n NB! 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 Center Point and its \b Radius (in this way you don't need to create it in advance). diff --git a/doc/salome/gui/GEOM/input/creating_squareface.doc b/doc/salome/gui/GEOM/input/creating_squareface.doc index f10b0e350..7fa7ea537 100755 --- a/doc/salome/gui/GEOM/input/creating_squareface.doc +++ b/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 Main Menu select New Entity - > +To create a \b Rectangle in the Main Menu select New Entity - > Primitives - > Rectangle \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 TUI Command: geompy.MakeFaceHW(Height, Width, Orientation) -\n Arguments: Name + 3 values (Dimensions at origin: heigth, width and +\n Arguments: Name + 3 values (Dimensions at origin: height, width and orientation). diff --git a/doc/salome/gui/GEOM/input/display_mode.doc b/doc/salome/gui/GEOM/input/display_mode.doc index af842ccf1..bffcf081e 100644 --- a/doc/salome/gui/GEOM/input/display_mode.doc +++ b/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 diff --git a/doc/salome/gui/GEOM/input/explode_on_blocks_operation.doc b/doc/salome/gui/GEOM/input/explode_on_blocks_operation.doc index abfaf09bd..f1f314161 100644 --- a/doc/salome/gui/GEOM/input/explode_on_blocks_operation.doc +++ b/doc/salome/gui/GEOM/input/explode_on_blocks_operation.doc @@ -16,7 +16,7 @@ from a compound. \n TUI Command: geompy.MakeBlockExplode(Compound, MinNbFaces, MaxNbFaces), 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 Arguments: 1 compound + 2 integers (min. and max. number of faces in the block to be extracted). diff --git a/doc/salome/gui/GEOM/input/fast_intersection.doc b/doc/salome/gui/GEOM/input/fast_intersection.doc index f27a6d944..04c1da79f 100644 --- a/doc/salome/gui/GEOM/input/fast_intersection.doc +++ b/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 Apply and Close 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. diff --git a/doc/salome/gui/GEOM/input/managing_dimensions.doc b/doc/salome/gui/GEOM/input/managing_dimensions.doc index 8b49f3ad1..3e2b35202 100644 --- a/doc/salome/gui/GEOM/input/managing_dimensions.doc +++ b/doc/salome/gui/GEOM/input/managing_dimensions.doc @@ -12,7 +12,7 @@ It can be accessed from the main menu via Measures -> Dimensions -> Manage Di List of Dimensions -This dialog provides the list of dimensions shown in the view for the selected geometrical Object. The list items are sorted by dimension type: Distance, Diameter and Angle. +This dialog provides the list of dimensions shown in the view for the selected geometrical Object. The list items are sorted by dimension type: Distance, Diameter and Angle. 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:
-
  • Diameter of an an arc, a circular edge or face, a sphere, a cylinder, a cone or a torus.
    • +
  • Diameter of an an arc, a circular edge or face, a sphere, a cylinder, a cone or a torus.
  • Angle. The angle dimension can be defined in one of two possible ways :
    • diff --git a/doc/salome/gui/GEOM/input/modify_location_operation.doc b/doc/salome/gui/GEOM/input/modify_location_operation.doc index 68c7e746b..dc4157eea 100644 --- a/doc/salome/gui/GEOM/input/modify_location_operation.doc +++ b/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 Start LCS from the coordinates of the End LCS. @@ -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 Path object (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 Create a copy checkbox allows to keep the initial object, otherwise it will be removed. \n Select Unpublished edges checkbox allows to select sub-shape edges on diff --git a/doc/salome/gui/GEOM/input/restore_presentation_parameters.doc b/doc/salome/gui/GEOM/input/restore_presentation_parameters.doc index abbc08358..55694bd8b 100644 --- a/doc/salome/gui/GEOM/input/restore_presentation_parameters.doc +++ b/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). diff --git a/idl/GEOM_Gen.idl b/idl/GEOM_Gen.idl index cd8f8c808..6deaf2952 100644 --- a/idl/GEOM_Gen.idl +++ b/idl/GEOM_Gen.idl @@ -1731,7 +1731,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. @@ -1821,7 +1821,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. @@ -1855,7 +1855,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 @@ -2840,7 +2840,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. */ @@ -2875,7 +2875,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. */ @@ -4709,7 +4709,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 diff --git a/src/EntityGUI/EntityGUI_FeatureDetectorDlg.cxx b/src/EntityGUI/EntityGUI_FeatureDetectorDlg.cxx index b33b7a7d6..95bc2cc68 100644 --- a/src/EntityGUI/EntityGUI_FeatureDetectorDlg.cxx +++ b/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 } diff --git a/src/EntityGUI/EntityGUI_SketcherDlg.cxx b/src/EntityGUI/EntityGUI_SketcherDlg.cxx index 2a1863026..8cc523c62 100644 --- a/src/EntityGUI/EntityGUI_SketcherDlg.cxx +++ b/src/EntityGUI/EntityGUI_SketcherDlg.cxx @@ -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 diff --git a/src/GEOMAlgo/GEOMAlgo_AlgoTools.hxx b/src/GEOMAlgo/GEOMAlgo_AlgoTools.hxx index a737460dc..b6e56e232 100755 --- a/src/GEOMAlgo/GEOMAlgo_AlgoTools.hxx +++ b/src/GEOMAlgo/GEOMAlgo_AlgoTools.hxx @@ -67,7 +67,7 @@ class GEOMAlgo_AlgoTools { gp_Vec& aN); //! Computes a point inside the face .
    - //! - 2D representation of
    + //! - 2D representation of
    //! on the surface of
    //! Returns 0 in case of success.
    Standard_EXPORT diff --git a/src/GEOM_SWIG/geomBuilder.py b/src/GEOM_SWIG/geomBuilder.py index bf056947d..b70a8d42f 100644 --- a/src/GEOM_SWIG/geomBuilder.py +++ b/src/GEOM_SWIG/geomBuilder.py @@ -10437,7 +10437,7 @@ class geomBuilder(object, 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 @@ -10477,7 +10477,7 @@ class geomBuilder(object, 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 @@ -11817,7 +11817,7 @@ class geomBuilder(object, 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 @@ -11830,7 +11830,7 @@ class geomBuilder(object, 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. @@ -11935,7 +11935,7 @@ class geomBuilder(object, 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 @@ -11949,7 +11949,7 @@ class geomBuilder(object, 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. diff --git a/src/Tools/t_shape/t_shape_dialog.ui b/src/Tools/t_shape/t_shape_dialog.ui index 55a48232e..9bc0affe2 100644 --- a/src/Tools/t_shape/t_shape_dialog.ui +++ b/src/Tools/t_shape/t_shape_dialog.ui @@ -78,21 +78,21 @@ - Big pipe height + Big pipe height - Small pipe radius + Small pipe radius - Small pipe height + Small pipe height From b9104d97c5893c00247c9ad7249cf2443ab15178 Mon Sep 17 00:00:00 2001 From: eap Date: Fri, 29 Dec 2017 17:42:48 +0300 Subject: [PATCH 4/5] Regression of Offset dialog: result shape not published + fix some warnings and memory leaks --- .../AdvancedGUI_SmoothingSurfaceDlg.cxx | 2 +- src/EntityGUI/EntityGUI.cxx | 2 +- src/GEOMBase/GEOMBase_Helper.cxx | 163 ++++++++++-------- src/GroupGUI/GroupGUI_BooleanDlg.cxx | 4 +- .../MeasureGUI_CheckSelfIntersectionsDlg.cxx | 34 ++-- src/MeasureGUI/MeasureGUI_CheckShapeDlg.cxx | 2 +- src/MeasureGUI/MeasureGUI_DistanceDlg.cxx | 4 +- .../MeasureGUI_ShapeStatisticsDlg.cxx | 42 ++--- .../OperationGUI_GetSharedShapesDlg.cxx | 4 +- .../TransformationGUI_OffsetDlg.cxx | 22 +-- 10 files changed, 146 insertions(+), 133 deletions(-) diff --git a/src/AdvancedGUI/AdvancedGUI_SmoothingSurfaceDlg.cxx b/src/AdvancedGUI/AdvancedGUI_SmoothingSurfaceDlg.cxx index 527cbcde2..75f688d36 100644 --- a/src/AdvancedGUI/AdvancedGUI_SmoothingSurfaceDlg.cxx +++ b/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" ); diff --git a/src/EntityGUI/EntityGUI.cxx b/src/EntityGUI/EntityGUI.cxx index 5c7e913d8..672298e41 100644 --- a/src/EntityGUI/EntityGUI.cxx +++ b/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 ) diff --git a/src/GEOMBase/GEOMBase_Helper.cxx b/src/GEOMBase/GEOMBase_Helper.cxx index cbd5e5e6c..fa682ffc5 100755 --- a/src/GEOMBase/GEOMBase_Helper.cxx +++ b/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 = "<GetTexture()) + + MESSAGE("GEOMBase_Helper::display myTexture = "<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( - entry.toLatin1().constData(), - "GEOM", strdup( GEOMBase::GetName( object ).toLatin1().constData() ) ), true, updateView ); + QString name = GEOMBase::GetName( object ); + getDisplayer()->Erase ( new SALOME_InteractiveObject(entry.toLatin1().constData(), + "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 - (entry.toLatin1().constData(), "GEOM", strdup(GEOMBase::GetName(object).toLatin1().constData())), false); + QString name = GEOMBase::GetName( object ); + 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( - entry.toLatin1().constData(), "GEOM", strdup( GEOMBase::GetName( aChild ).toLatin1().constData() ) ), false ); + QString name = GEOMBase::GetName( aChild ); + getDisplayer()->Redisplay + ( new SALOME_InteractiveObject( entry.toLatin1().constData(), + "GEOM", + name.toLatin1().constData() ), + false ); } } } @@ -267,7 +277,7 @@ void GEOMBase_Helper::displayPreview( const bool display, erasePreview( update ); return; } - + isPreview = true; QString msg; if ( !isValid( msg ) ) @@ -283,20 +293,20 @@ void GEOMBase_Helper::displayPreview( const bool display, try { SUIT_OverrideCursor wc; ObjectList objects; - + if ( !isWaitCursorEnabled() ) wc.suspend(); - + if ( !execute( objects ) || !getOperation()->IsDone() ) { wc.suspend(); } 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(); } } } @@ -322,7 +332,7 @@ void GEOMBase_Helper::displayPreview( GEOM::GEOM_Object_ptr object, const int displayMode, const int color ) { - SUIT_ResourceMgr* resMgr = SUIT_Session::session()->resourceMgr(); + SUIT_ResourceMgr* resMgr = SUIT_Session::session()->resourceMgr(); // Set color for preview shape getDisplayer()->SetColor( color == -1 ? Quantity_NOC_VIOLET : color ); @@ -344,7 +354,7 @@ void GEOMBase_Helper::displayPreview( GEOM::GEOM_Object_ptr object, SALOME_Prs* aPrs = getDisplayer()->BuildPrs( object ); if ( aPrs == 0 || aPrs->IsNull() ) return; - + // Make preview not clippable aPrs->SetClippable (false); @@ -375,17 +385,17 @@ void GEOMBase_Helper::displayPreview( const SALOME_Prs* prs, if ( myViewWindow == 0 ) return; - + // Display prs SUIT_ViewManager* aViewManager = myViewWindow->getViewManager(); if ( aViewManager->getType() == OCCViewer_Viewer::Type() || aViewManager->getType() == SVTK_Viewer::Type() ) - { - SUIT_ViewModel* aViewModel = aViewManager->getViewModel(); - SALOME_View* aView = dynamic_cast(aViewModel); - if (aView) - aView->Display( getDisplayer(), prs ); - } + { + SUIT_ViewModel* aViewModel = aViewManager->getViewModel(); + SALOME_View* aView = dynamic_cast(aViewModel); + if (aView) + 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 ); @@ -685,11 +698,11 @@ SalomeApp_Study* GEOMBase_Helper::getStudy() const SUIT_Application* anApp = 0; QListIterator it( anAppList ); while ( it.hasNext() ) - { - anApp = it.next(); - if ( anApp && anApp->desktop() == aDesktop ) - break; - } + { + anApp = it.next(); + if ( anApp && anApp->desktop() == aDesktop ) + break; + } return dynamic_cast(anApp->activeStudy()); } @@ -742,7 +755,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() ); @@ -754,7 +767,7 @@ bool GEOMBase_Helper::openCommand() else { MESSAGE("anOp->_is_nil() = true") - } + } return res; } @@ -824,10 +837,10 @@ bool GEOMBase_Helper::checkViewWindow() QList aViewWindowsList = SUIT_Session::session()->activeApplication()->desktop()->windows(); QListIterator it( aViewWindowsList ); while ( it.hasNext() ) - { - if ( myViewWindow == it.next() ) - return true; - } + { + if ( myViewWindow == it.next() ) + return true; + } } myViewWindow = 0; return false; @@ -842,10 +855,10 @@ bool GEOMBase_Helper::checkViewWindow() bool GEOMBase_Helper::onAccept( const bool publish, const bool useTransaction, bool erasePreviewFlag ) { SalomeApp_Study* appStudy = dynamic_cast( SUIT_Session::session()->activeApplication()->activeStudy() ); - if ( !appStudy ) + if ( !appStudy ) { MESSAGE("appStudy is empty") - return false; + return false; } _PTR(Study) aStudy = appStudy->studyDS(); @@ -864,7 +877,7 @@ bool GEOMBase_Helper::onAccept( const bool publish, const bool useTransaction, b showError( msg ); return false; } - + if(erasePreviewFlag) erasePreview( false ); @@ -892,21 +905,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 (aName.isEmpty()) - aName = getPrefix(obj); - if (nbObjs <= 30) { - // Try to find a unique name - aName = GEOMBase::GetDefaultName(aName, extractPrefix()); - } else { - // Don't check name uniqueness in case of numerous objects - aName = aName + "_" + QString::number(aNumber++); - } - } else { - // PAL6521: use a prefix, if some dialog box doesn't reimplement getNewObjectName() - if ( aName.isEmpty() ) - aName = GEOMBase::GetDefaultName( getPrefix( obj ) ); - } + if ( nbObjs > 1 ) { + if (aName.isEmpty()) + aName = getPrefix(obj); + if (nbObjs <= 30) { + // Try to find a unique name + aName = GEOMBase::GetDefaultName(aName, extractPrefix()); + } else { + // Don't check name uniqueness in case of numerous objects + aName = aName + "_" + QString::number(aNumber++); + } + } else { + // PAL6521: use a prefix, if some dialog box doesn't reimplement getNewObjectName() + if ( aName.isEmpty() ) + aName = GEOMBase::GetDefaultName( getPrefix( obj ) ); + } } anEntryList << addInStudy( obj, aName.toLatin1().constData() ); // updateView=false @@ -956,12 +969,12 @@ bool GEOMBase_Helper::onAccept( const bool publish, const bool useTransaction, b SalomeApp_Tools::QtCatchCorbaException( e ); abortCommand(); MESSAGE("Exception caught") - } + } updateViewer(); MESSAGE("result ="<( SUIT_Session::session()->activeApplication()->activeStudy() ); if ( study ) { _PTR(Study) studyDS = study->studyDS(); @@ -1197,7 +1210,7 @@ GEOM::GEOM_Object_ptr GEOMBase_Helper::findObjectInFather( GEOM::GEOM_Object_ptr } } } - + return object._retn(); } @@ -1228,7 +1241,7 @@ QList GEOMBase_Helper::getSourceObjects() // Returns valid object if only one object of the specified type is selected // (no matter global or local selection is activated). If \a type is TopAbs_SHAPE, // geometrical object of any valid type is expected. -// +// // \param type type of the object to be obtained from selection // \return selected geometrical object or nil object if selection is not satisfactory //================================================================ @@ -1247,7 +1260,7 @@ GEOM::GeomObjPtr GEOMBase_Helper::getSelected( TopAbs_ShapeEnum type ) // (no matter global or local selection is activated). The list of allowed // shape types is passed via \a types. If \a types includes TopAbs_SHAPE, // geometrical object of any valid type is expected. -// +// // \param types list of allowed shape types for the objects to be obtained from selection // \return selected geometrical object or nil object if selection is not satisfactory //================================================================ @@ -1267,7 +1280,7 @@ GEOM::GeomObjPtr GEOMBase_Helper::getSelected( const QList& ty // // The \a type parameter specifies allowed type of the object(s) being selected. // The \a count parameter specifies exact number of the objects to be retrieved from selection. -// The \a strict parameter specifies policy being applied to the selection. +// The \a strict parameter specifies policy being applied to the selection. // If \a count < 0, then any number of the selected objects is valid (including 0). // In this case, if \a strict is \c true (default), all selected objects should satisfy // the specified \a type. @@ -1275,7 +1288,7 @@ GEOM::GeomObjPtr GEOMBase_Helper::getSelected( const QList& ty // In this case, if \a strict is \c true (default), function returns empty list if total number of selected // objects does not correspond to the \a count parameter. Otherwise (if \a strict is \c false), // function returns valid list of objects if at least \a count objects satisfy specified \a type. -// +// // \param type type of the object(s) to be obtained from selection // \param count number of items to be retrieved from selection // \param strict selection policy @@ -1306,7 +1319,7 @@ static bool typeInList( TopAbs_ShapeEnum type, const QList& ty // // The \a types parameter specifies allowed types of the object(s) being selected. // The \a count parameter specifies exact number of the objects to be retrieved from selection. -// The \a strict parameter specifies policy being applied to the selection. +// The \a strict parameter specifies policy being applied to the selection. // If \a count < 0, then any number of the selected objects is valid (including 0). // In this case, if \a strict is \c true (default), all selected objects should satisfy // the specified \a type. @@ -1314,7 +1327,7 @@ static bool typeInList( TopAbs_ShapeEnum type, const QList& ty // In this case, if \a strict is \c true (default), function returns empty list if total number of selected // objects does not correspond to the \a count parameter. Otherwise (if \a strict is \c false), // function returns valid list of objects if at least \a count objects satisfy specified \a type. -// +// // \param types list of allowed shape types for the objects to be obtained from selection // \param count number of items to be retrieved from selection // \param strict selection policy diff --git a/src/GroupGUI/GroupGUI_BooleanDlg.cxx b/src/GroupGUI/GroupGUI_BooleanDlg.cxx index 994868603..16bcf1acc 100644 --- a/src/GroupGUI/GroupGUI_BooleanDlg.cxx +++ b/src/GroupGUI/GroupGUI_BooleanDlg.cxx @@ -327,11 +327,11 @@ GEOM::GEOM_Object_ptr GroupGUI_BooleanDlg::getFather(GEOM::GEOM_Object_ptr theOb QList GroupGUI_BooleanDlg::getSourceObjects() { QList 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; } diff --git a/src/MeasureGUI/MeasureGUI_CheckSelfIntersectionsDlg.cxx b/src/MeasureGUI/MeasureGUI_CheckSelfIntersectionsDlg.cxx index 41c0d94ff..83ccf56c5 100644 --- a/src/MeasureGUI/MeasureGUI_CheckSelfIntersectionsDlg.cxx +++ b/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_SOLID - << TopAbs_SHELL - << TopAbs_FACE - << TopAbs_WIRE - << TopAbs_EDGE - << TopAbs_VERTEX - << TopAbs_SHAPE; + << TopAbs_COMPSOLID + << TopAbs_SOLID + << TopAbs_SHELL + << TopAbs_FACE + << TopAbs_WIRE + << TopAbs_EDGE + << TopAbs_VERTEX + << TopAbs_SHAPE; } else { typesLst << TopAbs_FACE - << TopAbs_SHELL - << TopAbs_SOLID - << TopAbs_COMPOUND; + << TopAbs_SHELL + << TopAbs_SOLID + << 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; - if (aPrs) displayPreview(aPrs, true); + SALOME_Prs* aPrs = !aSubShape.IsNull() ? getDisplayer()->BuildPrs(aSubShape) : 0; + if (aPrs) displayPreview(aPrs, true); } catch (const SALOME::SALOME_Exception& e) { - SalomeApp_Tools::QtCatchCorbaException(e); + SalomeApp_Tools::QtCatchCorbaException(e); } } } diff --git a/src/MeasureGUI/MeasureGUI_CheckShapeDlg.cxx b/src/MeasureGUI/MeasureGUI_CheckShapeDlg.cxx index 25907ba45..328eb4794 100644 --- a/src/MeasureGUI/MeasureGUI_CheckShapeDlg.cxx +++ b/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; diff --git a/src/MeasureGUI/MeasureGUI_DistanceDlg.cxx b/src/MeasureGUI/MeasureGUI_DistanceDlg.cxx index 7dd84b34f..c732c0e66 100644 --- a/src/MeasureGUI/MeasureGUI_DistanceDlg.cxx +++ b/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; diff --git a/src/MeasureGUI/MeasureGUI_ShapeStatisticsDlg.cxx b/src/MeasureGUI/MeasureGUI_ShapeStatisticsDlg.cxx index 78afc2eb5..7cf7b9792 100644 --- a/src/MeasureGUI/MeasureGUI_ShapeStatisticsDlg.cxx +++ b/src/MeasureGUI/MeasureGUI_ShapeStatisticsDlg.cxx @@ -65,9 +65,9 @@ // class : MeasureGUI_ShapeStatisticsDlg() //=========================================================================== MeasureGUI_ShapeStatisticsDlg::MeasureGUI_ShapeStatisticsDlg( QWidget* parent, TopoDS_Shape aShape, TopAbs_ShapeEnum aSubShapeType ) - : GEOMBase_Helper( SUIT_Session::session()->activeApplication()->desktop() ), - QDialog( parent ), - myHistogram ( 0 ) +: GEOMBase_Helper( SUIT_Session::session()->activeApplication()->desktop() ), + QDialog( parent ), + myHistogram ( 0 ) { myShapes.push_back( aShape ); @@ -106,9 +106,9 @@ MeasureGUI_ShapeStatisticsDlg::MeasureGUI_ShapeStatisticsDlg( QWidget* parent, T myCBTypes = new QtxComboBox( this ); myCBTypes->setCleared( true ); if ( aSubShapeType != TopAbs_SHAPE ) { - fillTypes( aSubShapeType == TopAbs_EDGE, - aSubShapeType == TopAbs_FACE, - aSubShapeType == TopAbs_SOLID ); + fillTypes( aSubShapeType == TopAbs_EDGE, + aSubShapeType == TopAbs_FACE, + aSubShapeType == TopAbs_SOLID ); myCBTypes->setEnabled( false ); } @@ -137,7 +137,7 @@ MeasureGUI_ShapeStatisticsDlg::MeasureGUI_ShapeStatisticsDlg( QWidget* parent, T QLabel* maxLabel = new QLabel( tr( "GEOM_SHAPE_STATISTICS_MAX" ), this ); myMax = new QLineEdit( this ); myMax->setValidator( aValid ); - + QPushButton* buttonCompute = new QPushButton( tr( "GEOM_SHAPE_STATISTICS_COMPUTE" ), this ); connect( buttonCompute, SIGNAL( clicked() ), this, SLOT( clickOnCompute() ) ); @@ -209,10 +209,10 @@ GEOM::GEOM_IOperations_ptr MeasureGUI_ShapeStatisticsDlg::createOperation() return getGeomEngine()->GetIGroupOperations(getStudyId()); } -#define RETURN_WITH_MSG(a, b) \ - if (!(a)) { \ - theMessage += (b); \ - return false; \ +#define RETURN_WITH_MSG(a, b) \ + if (!(a)) { \ + theMessage += (b); \ + return false; \ } //================================================================ @@ -334,9 +334,9 @@ TopAbs_ShapeEnum MeasureGUI_ShapeStatisticsDlg::currentType() bool MeasureGUI_ShapeStatisticsDlg::isValid(QString& theMessage) { if ( myScalarRangeBox->isChecked() ) { - RETURN_WITH_MSG( !myMin->text().isEmpty(), tr("GEOM_SHAPE_STATISTICS_MIN_ERROR") ) - RETURN_WITH_MSG( !myMax->text().isEmpty(), tr("GEOM_SHAPE_STATISTICS_MAX_ERROR") ) - RETURN_WITH_MSG( myMin->text().toDouble() <= myMax->text().toDouble(), tr("GEOM_SHAPE_STATISTICS_MIN_MAX_ERROR") ) + RETURN_WITH_MSG( !myMin->text().isEmpty(), tr("GEOM_SHAPE_STATISTICS_MIN_ERROR") ); + RETURN_WITH_MSG( !myMax->text().isEmpty(), tr("GEOM_SHAPE_STATISTICS_MAX_ERROR") ); + RETURN_WITH_MSG( myMin->text().toDouble() <= myMax->text().toDouble(), tr("GEOM_SHAPE_STATISTICS_MIN_MAX_ERROR") ); } return true; } @@ -360,7 +360,7 @@ void MeasureGUI_ShapeStatisticsDlg::clickOnPlot() aRange.max = -1.0; // flag that range is empty } - GEOMUtils::Distribution aShapesDistr = + GEOMUtils::Distribution aShapesDistr = GEOMUtils::ComputeDistribution( myShapes, currentType(), myNbIntervals->value(), aRange ); QList xVals, yVals; @@ -445,7 +445,7 @@ void MeasureGUI_ShapeStatisticsDlg::clickOnCreateGroups() //================================================================================= // function : execute(ObjectList& objects) -// purpose : +// purpose : //================================================================================= bool MeasureGUI_ShapeStatisticsDlg::execute(ObjectList& objects) { @@ -472,9 +472,9 @@ bool MeasureGUI_ShapeStatisticsDlg::execute(ObjectList& objects) int aPrecision = resMgr->integerValue( "Geometry", "length_precision", 6 ); QString aTypePrefix = myCBTypes->currentText().replace(' ', '_'); QString objIOR, aMin, aMax, aGroupName; - SalomeApp_Study* study = getStudy(); + //SalomeApp_Study* study = getStudy(); - GEOMUtils::Distribution aShapesDistr = + GEOMUtils::Distribution aShapesDistr = GEOMUtils::ComputeDistribution( myShapes, currentType(), myNbIntervals->value(), aRange ); int nbGroups = 0; @@ -489,7 +489,7 @@ bool MeasureGUI_ShapeStatisticsDlg::execute(ObjectList& objects) int ii = 0; std::list::const_iterator id_it; for ( id_it = idList.begin(); id_it != idList.end(); id_it++ ) { - aNewList[ii++] = *id_it; + aNewList[ii++] = *id_it; } // Create an empty group @@ -497,12 +497,12 @@ bool MeasureGUI_ShapeStatisticsDlg::execute(ObjectList& objects) aGroup = anOper->CreateGroup( myMainObj.get(), currentType() ); if (CORBA::is_nil(aGroup) || !anOper->IsDone()) - return false; + return false; // Add sub-shapes into group anOper->UnionIDs(aGroup, aNewList); if (!anOper->IsDone()) - return false; + return false; // publish group aMin = DlgRef::PrintDoubleValue( (*it).min, aPrecision ); diff --git a/src/OperationGUI/OperationGUI_GetSharedShapesDlg.cxx b/src/OperationGUI/OperationGUI_GetSharedShapesDlg.cxx index 5b24f665e..81299f758 100644 --- a/src/OperationGUI/OperationGUI_GetSharedShapesDlg.cxx +++ b/src/OperationGUI/OperationGUI_GetSharedShapesDlg.cxx @@ -45,7 +45,7 @@ namespace GEOM::shape_type maxShapeType(const GEOM::ListOfGO& objs) { GEOM::shape_type r = GEOM::SHAPE; - for ( int i = 0; i < objs.length(); i++ ) { + for ( CORBA::ULong i = 0; i < objs.length(); i++ ) { GEOM::shape_type t = objs[i]->GetShapeType(); if ( t == GEOM::COMPOUND || t == GEOM::COMPSOLID ) t = objs[i]->GetMaxShapeType(); @@ -412,7 +412,7 @@ QList OperationGUI_GetSharedShapesDlg::getSourceObjects() { QList res; GEOM::ListOfGO aListPtr(myListShapes); - for (int i = 0; i < aListPtr.length(); i++) { + for (CORBA::ULong i = 0; i < aListPtr.length(); i++) { GEOM::GeomObjPtr aGeomObjPtr(aListPtr[i]); res << aGeomObjPtr; } diff --git a/src/TransformationGUI/TransformationGUI_OffsetDlg.cxx b/src/TransformationGUI/TransformationGUI_OffsetDlg.cxx index 2e2916f03..9409cfc4f 100644 --- a/src/TransformationGUI/TransformationGUI_OffsetDlg.cxx +++ b/src/TransformationGUI/TransformationGUI_OffsetDlg.cxx @@ -37,7 +37,7 @@ //================================================================================= // class : TransformationGUI_OffsetDlg() -// purpose : Constructs a TransformationGUI_OffsetDlg which is a child of 'parent', with the +// purpose : Constructs a TransformationGUI_OffsetDlg which is a child of 'parent', with the // name 'name' and widget flags set to 'f'. // The dialog will by default be modeless, unless you set 'modal' to // TRUE to construct a modal dialog. @@ -85,7 +85,7 @@ TransformationGUI_OffsetDlg::TransformationGUI_OffsetDlg( GeometryGUI* theGeomet // purpose : Destroys the object and frees any allocated resources //================================================================================= TransformationGUI_OffsetDlg::~TransformationGUI_OffsetDlg() -{ +{ /* no need to delete child widgets, Qt does it all for us */ } @@ -148,9 +148,9 @@ void TransformationGUI_OffsetDlg::ClickOnOk() //================================================================================= bool TransformationGUI_OffsetDlg::ClickOnApply() { - if ( !onAccept( GroupPoints->CheckButton1->isChecked() ) ) + if ( !onAccept( /*copy=*/true )) return false; - + initName(); return true; } @@ -182,7 +182,7 @@ void TransformationGUI_OffsetDlg::SelectionIntoArgument() void TransformationGUI_OffsetDlg::SetEditCurrentArgument() { QPushButton* send = (QPushButton*)sender(); - + if ( send == GroupPoints->PushButton1 ) { GroupPoints->PushButton1->setDown(true); myEditCurrentArgument = GroupPoints->LineEdit1; @@ -210,7 +210,7 @@ void TransformationGUI_OffsetDlg::enterEvent( QEvent* ) void TransformationGUI_OffsetDlg::ActivateThisDialog() { GEOMBase_Skeleton::ActivateThisDialog(); - connect( myGeomGUI->getApp()->selectionMgr(), + connect( myGeomGUI->getApp()->selectionMgr(), SIGNAL( currentSelectionChanged() ), this, SLOT( SelectionIntoArgument() ) ); globalSelection( GEOM_ALLSHAPES ); myEditCurrentArgument = GroupPoints->LineEdit1; @@ -260,14 +260,14 @@ bool TransformationGUI_OffsetDlg::isValid( QString& msg ) bool TransformationGUI_OffsetDlg::execute( ObjectList& objects ) { bool res = false; - + GEOM::GEOM_Object_var anObj; - + GEOM::GEOM_ITransformOperations_var anOper = GEOM::GEOM_ITransformOperations::_narrow(getOperation()); if ( true /*GroupPoints->CheckButton1->isChecked() || IsPreview()*/ ) { for ( int i = 0; i < myObjects.count(); i++ ) { - + anObj = anOper->OffsetShapeCopy( myObjects[i].get(), GetOffset(), GetIsJoinByPipes() ); if ( !anObj->_is_nil() ) { if(!IsPreview()) { @@ -285,7 +285,7 @@ bool TransformationGUI_OffsetDlg::execute( ObjectList& objects ) } } res = true; - + return res; } @@ -316,7 +316,7 @@ double TransformationGUI_OffsetDlg::GetOffset() const //======================================================================= //function : GetIsJoinByPipes -//purpose : +//purpose : //======================================================================= bool TransformationGUI_OffsetDlg::GetIsJoinByPipes() const From 8f00089bdf4ddde4bca130fb1c3361832e7b87a4 Mon Sep 17 00:00:00 2001 From: eap Date: Tue, 9 Jan 2018 13:33:37 +0300 Subject: [PATCH 5/5] typo-fix by Kunda http://www.salome-platform.org/forum/forum_10/195000978 --- doc/salome/gui/GEOM/input/annotation.doc | 2 +- resources/ShHealing | 4 ++-- src/BlockFix/BlockFix_UnionEdges.cxx | 2 +- src/BlockFix/BlockFix_UnionFaces.cxx | 2 +- src/GEOMImpl/GEOMImpl_Block6Explorer.cxx | 2 +- src/GEOMImpl/GEOMImpl_I3DPrimOperations.cxx | 2 +- src/GEOMToolsGUI/GEOMToolsGUI_TransparencyDlg.cxx | 2 +- src/RepairGUI/RepairGUI_ShapeProcessDlg.h | 2 +- src/ShHealOper/ShHealOper_CloseContour.hxx | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/doc/salome/gui/GEOM/input/annotation.doc b/doc/salome/gui/GEOM/input/annotation.doc index 944630a4c..721f74d03 100644 --- a/doc/salome/gui/GEOM/input/annotation.doc +++ b/doc/salome/gui/GEOM/input/annotation.doc @@ -3,7 +3,7 @@ \page annotation_page Shape annotation Annotation 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): diff --git a/resources/ShHealing b/resources/ShHealing index 864e192a1..6adba366b 100644 --- a/resources/ShHealing +++ b/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.ModifyGeometryMode : Mode allowing of modifing of geometry (default - 1, yes - 1 , no - 0). +! FixShape.ModifyTopologyMode : Mode allowing for modifying of topology (default - 0, 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). diff --git a/src/BlockFix/BlockFix_UnionEdges.cxx b/src/BlockFix/BlockFix_UnionEdges.cxx index 642953f67..cba4e2520 100644 --- a/src/BlockFix/BlockFix_UnionEdges.cxx +++ b/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); } diff --git a/src/BlockFix/BlockFix_UnionFaces.cxx b/src/BlockFix/BlockFix_UnionFaces.cxx index 1a6a9b3d6..771e8f0cb 100644 --- a/src/BlockFix/BlockFix_UnionFaces.cxx +++ b/src/BlockFix/BlockFix_UnionFaces.cxx @@ -696,7 +696,7 @@ 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); Standard_Real MaxTol = DefineMaxTolerance(aResult); diff --git a/src/GEOMImpl/GEOMImpl_Block6Explorer.cxx b/src/GEOMImpl/GEOMImpl_Block6Explorer.cxx index 2c4f4ab6c..25f25227c 100644 --- a/src/GEOMImpl/GEOMImpl_Block6Explorer.cxx +++ b/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 on the Step 2. + // in arrays, to find for them the right location in in Step 2. // declare arrays TopTools_Array1OfShape aVertis2(1,4); // ordered vertices of the second face diff --git a/src/GEOMImpl/GEOMImpl_I3DPrimOperations.cxx b/src/GEOMImpl/GEOMImpl_I3DPrimOperations.cxx index 41a288f8b..0bd208270 100644 --- a/src/GEOMImpl/GEOMImpl_I3DPrimOperations.cxx +++ b/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; } } diff --git a/src/GEOMToolsGUI/GEOMToolsGUI_TransparencyDlg.cxx b/src/GEOMToolsGUI/GEOMToolsGUI_TransparencyDlg.cxx index 3f6e6b98f..9159af61c 100644 --- a/src/GEOMToolsGUI/GEOMToolsGUI_TransparencyDlg.cxx +++ b/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() { diff --git a/src/RepairGUI/RepairGUI_ShapeProcessDlg.h b/src/RepairGUI/RepairGUI_ShapeProcessDlg.h index 508cff9ec..8865edba6 100755 --- a/src/RepairGUI/RepairGUI_ShapeProcessDlg.h +++ b/src/RepairGUI/RepairGUI_ShapeProcessDlg.h @@ -74,7 +74,7 @@ private: QWidget* getControl( const QString& ); void setValue( QWidget*, const QString& ); // initialize the given control in the proper way - // (analize its class and convert the value string) + // (analyze its class and convert the value string) QString getValue( QWidget* ) const; // retrieve value of the control in the proper way QString getText( QWidget* ) const; // retrieve text of the control (for spin-boxes only) diff --git a/src/ShHealOper/ShHealOper_CloseContour.hxx b/src/ShHealOper/ShHealOper_CloseContour.hxx index ede77dbe8..53cb7bfb3 100644 --- a/src/ShHealOper/ShHealOper_CloseContour.hxx +++ b/src/ShHealOper/ShHealOper_CloseContour.hxx @@ -47,7 +47,7 @@ class ShHealOper_CloseContour : public ShHealOper_Tool Standard_EXPORT ShHealOper_CloseContour() : ShHealOper_Tool() {} Standard_EXPORT ShHealOper_CloseContour (const TopoDS_Shape& theShape); - //Initalizes by whole shape. + //Initializes by whole shape. Standard_EXPORT virtual void Init(const TopoDS_Shape& theShape); //Method for initialization by whole shape.