ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2024-12-25 08:50:36 +05:00
Code Issues Packages Projects Releases Wiki Activity

Typo-fix by Kunda

Browse Source 
http://www.salome-platform.org/forum/forum_9/948131982/228851081
This commit is contained in:
eap 2017-12-04 14:40:22 +03:00
parent 7a3c2d25cc
commit def38fecf8
61 changed files with 133 additions and 133 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -86,7 +86,7 @@ MARK_AS_ADVANCED(SALOME_BUILD_GUI SALOME_GEOM_USE_OPENCV SALOME_GEOM_USE_VTK)
# Prerequisites
# =============
# Find "big" prerequisites first - they reference themselves many others
# -> this can help finding the smaller prerequisites and detect conficts.
# -> this can help find the smaller prerequisites and detect conflicts.
# In our case KERNEL has already loaded many prereq:
##

4
README
View File

@ -34,8 +34,8 @@ Installation
Pre-requisites
--------------
SALOME platform relies on a set of third-party softwares; some of them are needed
at build time only, while other ones are needed in runtime also.
SALOME platform relies on a set of third-party software; some of them are needed
at build time only, while other ones are needed at runtime as well.
For more information about the pre-requisites please visit SALOME platform web
site:

2
SalomeGEOMConfig.cmake.in
View File

@ -19,7 +19,7 @@
# - Config file for the @PROJECT_NAME@ package
# It defines the following variables.
# Specific to the pacakge @PROJECT_NAME@ itself:
# Specific to the package @PROJECT_NAME@ itself:
# @PROJECT_NAME_UC@_ROOT_DIR_EXP - the root path of the installation providing this CMake file
#

2
doc/salome/examples/complex_objs_ex07.py
View File

@ -60,7 +60,7 @@ def MakeComplexSect(pnt,vec,rmax,rmin,nb):
#=======================================================
# Create simple path and recieve points
# Create simple path and receive points
# for section creation
#=======================================================
WirePath = geompy.MakeSketcher("Sketcher:F 0 0:T 60 0:T 40 0:R 0:C 100 90:",

2
doc/salome/examples/topological_geom_objs_ex06.py
View File

@ -21,7 +21,7 @@ while i <= 3 :
ShapeListCompound.append(S)
i = i + 1
# create a compund of the given shapes
# create a compound of the given shapes
compound = geompy.MakeCompound(ShapeListCompound)
# add object in the study

2
doc/salome/gui/GEOM/input/creating_divideddisk.doc
View File

@ -33,7 +33,7 @@ The result of each operation will be a GEOM_Object.
<b>Arguments:</b>
- \b Radius - Radius of the disk
- \b Orientation - Plane on wich the disk will be built
- \b Orientation - Plane on which the disk will be built
- \b Pattern - Division pattern
\image html divided_disk_dlg.png

2
doc/salome/gui/GEOM/input/extruded_boss_operation.doc
View File

@ -37,7 +37,7 @@ The input arguments are:
- The \b height of extrusion. It is calculated from the <b>base profile</b> along the normal to its plane.
And optionnaly:
And optionally:
- A <b>draft angle</b> in degrees. Activated by clicking on \image html draft.png

2
doc/salome/gui/GEOM/input/extruded_cut_operation.doc
View File

@ -37,7 +37,7 @@ The input arguments are:
- The \b height of extrusion. It's calculated from the <b>base profile</b> along the normal to its plane.
And optionnaly:
And optionally:
- A <b>draft angle</b> in degrees. Activated by clicking on \image html draft.png

2
doc/salome/gui/GEOM/input/geompy_migration.doc
View File

@ -34,7 +34,7 @@ geompy = geomBuilder.New(salome.myStudy)
<b> Of course, <em>from geompy import *</em> is no more possible.</b>
\n You have to explicitely write <em>geompy.some_method()</em>.
\n You have to explicitly write <em>geompy.some_method()</em>.
\n <b>Some variables have been transferred from the namespace <em>geompy.GEOM</em> to the namespace <em>GEOM</em>.</b>
\n All occurrences of <em>geompy.GEOM.</em> can be replaced by <em>GEOM.</em>.

2
doc/salome/gui/GEOM/input/pictures.doc
View File

@ -5,7 +5,7 @@
Some tools in GEOM allow you to create shapes, basing the design on imported pictures (engineering drawings, nautical charts ...) :
<ul>
<li>\subpage import_picture_page, such as engeneering drawings or nautical charts as a support for shape design.
<li>\subpage import_picture_page, such as engineering drawings or nautical charts as a support for shape design.
<li>\subpage shape_recognition_page previously imported in the OCC viewer .
</ul>

2
doc/salome/gui/GEOM/input/restore_presentation_parameters.doc
View File

@ -17,7 +17,7 @@ faces and Cylinder_1 with free published edges.
\image html restore-ss-viewer-before.png "The initial box and cylinder"
First, we examine the case when the resulting shape corresponds to one argument (after transformation,
after the Boolean operation Cut, or after the partiton with one object shape).
after the Boolean operation Cut, or after the partition with one object shape).
We create a Cut of Box_1 with Cylinder_1.

2
doc/salome/gui/GEOM/input/translation_operation.doc
View File

@ -30,7 +30,7 @@ components of translation vector.
\image html transformation2.png
\n Finally you can define the \b Vector explicitely. The \b Object will be translated by the length of the vector.
\n Finally you can define the \b Vector explicitly. The \b Object will be translated by the length of the vector.
If a curve has been selected instead of the vector, only its first and last vertices will be used to get the vector direction and the dialog preview will display the vector along which the object will be translated.
\n <b>Activate Distance</b> checkbox and <b>Distance</b> field allow defining a custom distance of translation.

32
idl/GEOM_Gen.idl
View File

@ -682,7 +682,7 @@ module GEOM
/*!
* \brief Set the operation error code
* \param theErrorID is a string describing the error occured
* \param theErrorID is a string describing the error occurred
* \note This method is supposed to be used only by interfaces inheriting from IOperations.
*/
void SetErrorCode (in string theErrorID);
@ -703,7 +703,7 @@ module GEOM
void StartOperation();
/*!
* \brief Closes the previously opened trasaction
* \brief Closes the previously opened transaction
*/
void FinishOperation();
@ -855,7 +855,7 @@ module GEOM
/*!
* C\brief reate a line, passing through the given point
* and parrallel to the given direction
* and parallel to the given direction
* \param thePnt Point. The resulting line will pass through it.
* \param theDir Direction. The resulting line will be parallel to it.
* \return New GEOM_Object, containing the created line.
@ -3217,7 +3217,7 @@ module GEOM
*
* Propagation group is a set of all edges, opposite to one (main)
* edge of this group directly or through other opposite edges.
* Notion of Opposite Edge make sence only on quadrangle face.
* Notion of Opposite Edge make sense only on quadrangle face.
* \param theShape Shape to build propagation groups on.
* \return List of GEOM_Object, each of them is a propagation group.
*/
@ -3316,7 +3316,7 @@ module GEOM
* \param theRemoveInside Shapes, inside which the results will be deleted.
* Each shape from theRemoveInside must belong to theShapes also.
* \param theRemoveWebs If TRUE, perform Glue 3D algorithm.
* \param theMaterials Material indices for each shape. Make sence, only if theRemoveWebs is TRUE.
* \param theMaterials Material indices for each shape. Make sense, only if theRemoveWebs is TRUE.
*
* \return New GEOM_Object, containing the result shapes.
*/
@ -3332,7 +3332,7 @@ module GEOM
/*!
* \brief Perform partition operation.
*
* This method may be usefull if it is needed to make a partition for
* This method may be useful if it is needed to make a partition for
* a compound containing nonintersected shapes. Performance will be better
* since intersection between shapes from compound is not performed.
*
@ -3795,7 +3795,7 @@ module GEOM
* \param theVertexes Global indices of vertexes to perform fillet on.
* \note Global index of sub-shape can be obtained, using method
* <VAR>GEOM_IShapesOperations.GetSubShapeIndex()</VAR>.
* \note The list of vertices coudl be empty, in this case fillet fill be done
* \note The list of vertices could be empty, in this case fillet fill be done
* at all vertices in given wire
* \param doIgnoreSecantVertices If FALSE, fillet radius is always limited
* by the length of the edges, nearest to the fillet vertex.
@ -3834,7 +3834,7 @@ module GEOM
in double theD1, in double theD2,
in long theFace1, in long theFace2);
/*!
* \brief The Same but with params theD = Chamfer Lenght
* \brief The Same but with params theD = Chamfer Length
* and theAngle = Chamfer Angle (Angle in radians)
*/
GEOM_Object MakeChamferEdgeAD (in GEOM_Object theShape,
@ -3858,7 +3858,7 @@ module GEOM
in double theD1, in double theD2,
in ListOfLong theFaces);
/*!
* The Same but with params theD = Chamfer Lenght
* The Same but with params theD = Chamfer Length
* and theAngle = Chamfer Angle (Angle in radians)
*/
GEOM_Object MakeChamferFacesAD (in GEOM_Object theShape,
@ -3877,7 +3877,7 @@ module GEOM
in double theD1, in double theD2,
in ListOfLong theEdges);
/*!
* The Same but with params theD = Chamfer Lenght
* The Same but with params theD = Chamfer Length
* and theAngle = Chamfer Angle (Angle in radians)
*/
GEOM_Object MakeChamferEdgesAD (in GEOM_Object theShape,
@ -4064,7 +4064,7 @@ module GEOM
* \param theObjects Shapes to get free boundary of.
* \param theClosedWires Output. Closed wires on the free boundary of the given shape.
* \param theOpenWires Output. Open wires on the free boundary of the given shape.
* \return FALSE, if an error(s) occured during the method execution.
* \return FALSE, if an error(s) occurred during the method execution.
*/
boolean GetFreeBoundary (in ListOfGO theObjects,
out ListOfGO theClosedWires,
@ -4194,7 +4194,7 @@ module GEOM
};
/*!
* \brief Sequence of non-topological information tranfer data.
* \brief Sequence of non-topological information transfer data.
*/
typedef sequence<TransferDatum> ListOfTransferDatum;
@ -4209,7 +4209,7 @@ module GEOM
* \param theResult statistics of the operation. Output parameter. It
* represents a sequence of Transfer Datum. A datum has the type
* (string code), the total number of items of this type and
* the number of transfered items.
* the number of transferred items.
* \return true in case of success; otherwise false.
*/
boolean TransferData(in GEOM_Object theObjectFrom,
@ -4912,7 +4912,7 @@ module GEOM
* in place of sub-shapes of the first argument,
* because the whole shape corresponds to the first argument.
* Mainly to be used after transformations, but it also can be
* usefull after partition with one object shape, and some other
* useful after partition with one object shape, and some other
* operations, where only the first argument has to be considered.
* If theObject has only one argument shape, this flag is automatically
* considered as True, not regarding really passed value.
@ -4943,7 +4943,7 @@ module GEOM
* in place of sub-shapes of the first argument,
* because the whole shape corresponds to the first argument.
* Mainly to be used after transformations, but it also can be
* usefull after partition with one object shape, and some other
* useful after partition with one object shape, and some other
* operations, where only the first argument has to be considered.
* If theObject has only one argument shape, this flag is automatically
* considered as True, not regarding really passed value.
@ -4975,7 +4975,7 @@ module GEOM
* in place of sub-shapes of the first argument,
* because the whole shape corresponds to the first argument.
* Mainly to be used after transformations, but it also can be
* usefull after partition with one object shape, and some other
* useful after partition with one object shape, and some other
* operations, where only the first argument has to be considered.
* If theObject has only one argument shape, this flag is automatically
* considered as True, not regarding really passed value.

2
src/AdvancedEngine/AdvancedEngine_IOperations.cxx
View File

@ -830,7 +830,7 @@ bool AdvancedEngine_IOperations::GetFacesOnSurf
// Default value=3
aFinder.SetNbPntsMin(3);
// Sets the maximal number of inner points for edges or faces.
// It is usefull for the cases when this number is very big (e.g =2000) to improve
// It is useful for the cases when this number is very big (e.g =2000) to improve
// the performance. If this value =0, all inner points will be taken into account.
// Default value=0
aFinder.SetNbPntsMax(100);

2
src/AdvancedEngine/AdvancedEngine_PipeTShapeDriver.cxx
View File

@ -200,7 +200,7 @@ Handle(TColStd_HSequenceOfInteger)
// Default value=3
aFinder.SetNbPntsMin(3);
// Sets the maximal number of inner points for edges or faces.
// It is usefull for the cases when this number is very big (e.g =2000) to improve
// It is useful for the cases when this number is very big (e.g =2000) to improve
// the performance. If this value =0, all inner points will be taken into account.
// Default value=0
aFinder.SetNbPntsMax(0);

2
src/BlockFix/BlockFix.cxx
View File

@ -87,7 +87,7 @@
//=======================================================================
//function : FixResult
//purpose : auxilary
//purpose : auxiliary
//=======================================================================
static void FixResult(const TopoDS_Shape& result,
Handle(ShapeBuild_ReShape)& Context,

2
src/BlockFix/BlockFix_PeriodicSurfaceModifier.cxx
View File

@ -81,7 +81,7 @@ void BlockFix_PeriodicSurfaceModifier::SetTolerance(const Standard_Real Tol)
//=======================================================================
//function : ModifySurface
//purpose : auxilary
//purpose : auxiliary
//=======================================================================
static Standard_Boolean ModifySurface(const TopoDS_Face& aFace,
const Handle(Geom_Surface)& aSurface,

2
src/BlockFix/BlockFix_UnionEdges.cxx
View File

@ -463,7 +463,7 @@ static TopoDS_Edge GlueEdgesWithPCurves(const TopTools_SequenceOfShape& aChain,
//=======================================================================
//function : MergeEdges
//purpose : auxilary
//purpose : auxiliary
//=======================================================================
static Standard_Boolean MergeEdges(const TopTools_SequenceOfShape& SeqEdges,
const Standard_Real Tol,

6
src/BlockFix/BlockFix_UnionFaces.cxx
View File

@ -127,7 +127,7 @@ Standard_Integer& BlockFix_UnionFaces::GetOptimumNbFaces()
//=======================================================================
//function : AddOrdinaryEdges
//purpose : auxilary
//purpose : auxiliary
// adds edges from the shape to the sequence
// seams and equal edges are dropped
// Returns true if one of original edges dropped
@ -179,7 +179,7 @@ static Standard_Boolean AddOrdinaryEdges(TopTools_SequenceOfShape& edges,
//=======================================================================
//function : ClearRts
//purpose : auxilary
//purpose : auxiliary
//=======================================================================
static Handle(Geom_Surface) ClearRts(const Handle(Geom_Surface)& aSurface)
{
@ -193,7 +193,7 @@ static Handle(Geom_Surface) ClearRts(const Handle(Geom_Surface)& aSurface)
//=======================================================================
//function : IsFacesOfSameSolids
//purpose : auxilary
//purpose : auxiliary
//=======================================================================
static Standard_Boolean IsFacesOfSameSolids
(const TopoDS_Face &theFace1,

2
src/CurveCreator/CurveCreator_Diff.cxx
View File

@ -103,7 +103,7 @@ bool CurveCreator_Diff::init(const CurveCreator_Curve *theCurve,
if (myPRedo->init(theType, theIntParam)) {
// Construct undo for RemoveSection command.
// If the last section is removed, one AddSection command is enough.
// If not last section is removed, two commands are requred: AddSection
// If not last section is removed, two commands are required: AddSection
// and MoveSection.
const int aLastIndex = theCurve->getNbSections() - 1;

2
src/CurveCreator/CurveCreator_Widget.cxx
View File

@ -954,7 +954,7 @@ void CurveCreator_Widget::SetViewer2DMode(const bool To2D)
//=================================================================================
// function : GeometryGUI::addCoordsByClick()
// purpose : Manage mouse press events in Additon mode
// purpose : Manage mouse press events in Addition mode
//=================================================================================
void CurveCreator_Widget::addCoordsByClick( QMouseEvent* pe )
{

2
src/EntityGUI/EntityGUI.cxx
View File

@ -390,7 +390,7 @@ void EntityGUI::DisplaySimulationShape( const TopoDS_Shape& S1, const TopoDS_Sha
ic->UpdateCurrentViewer();
}
catch( Standard_Failure ) {
MESSAGE( "Exception catched in EntityGUI::DisplaySimulationShape" );
MESSAGE( "Exception caught in EntityGUI::DisplaySimulationShape" );
}
}

8
src/EntityGUI/EntityGUI_3DSketcherDlg.cxx
View File

@ -1285,7 +1285,7 @@ gp_Dir EntityGUI_3DSketcherDlg::getPresentationPlane() const
gp_Vec V = Vec1.Transformed(aTransform.Inverted());
gp_Vec Vec3(V.X(),V.Y(),0.0);
// Express the coordinates in the refernce coordinate system (OXY)
// Express the coordinates in the reference coordinate system (OXY)
Vec3.Transform(aTransform);
if(Abs(Vec1.CrossMagnitude(Vec3)) > Precision::Confusion())
{
@ -1482,7 +1482,7 @@ void EntityGUI_3DSketcherDlg::displayDimensions (bool store)
aLength * sin(anAngle1 * M_PI / 180. ),
0.0);
// Express the coordinates in the refernce coordinate system (OXY)
// Express the coordinates in the reference coordinate system (OXY)
gp_Trsf aTranform = toReferenceSystem(P0);
P1.Transform(aTranform);
P2.Transform(aTranform);
@ -1656,7 +1656,7 @@ void EntityGUI_3DSketcherDlg::displayText ( std::string theText,
//================================================================
// Function : createAISLengthDimension()
// Purpose : Method for creation of a length dimension object
// Returns an Handle on the AIS_LengthDimension obect
// Returns an Handle on the AIS_LengthDimension object
//================================================================
Handle(AIS_LengthDimension) EntityGUI_3DSketcherDlg::createAISLengthDimension(double theLength,
gp_Pnt P1,
@ -1694,7 +1694,7 @@ Handle(AIS_LengthDimension) EntityGUI_3DSketcherDlg::createAISLengthDimension(do
//================================================================
// Function : createAISAngleDimension()
// Purpose : Method for creation of an angle dimension object
// Returns an Handle on the AIS_AngleDimension obect
// Returns an Handle on the AIS_AngleDimension object
//================================================================
Handle(AIS_AngleDimension) EntityGUI_3DSketcherDlg::createAISAngleDimension(double theAngle,
gp_Pnt P0,

2
src/EntityGUI/EntityGUI_FeatureDetectorDlg.cxx
View File

@ -281,7 +281,7 @@ EntityGUI_FeatureDetectorDlg::EntityGUI_FeatureDetectorDlg( GeometryGUI* theGeom
// about what will be considered INSIDE the zone we want to find the frontier of
// This makes the algorithm more robust against a bit inhomogeneous parts in the zone
// that we want to delimitate.
// The drawback is if we want to delimitate a zone wich color is very similar to the zone
// The drawback is if we want to delimitate a zone which color is very similar to the zone
// we consider as the OUTSIDE, the result will be bad.
// The current use cases are more of the first form :
// - Strongly contrasted INSIDE and OUTSIDE zones

2
src/EntityGUI/EntityGUI_FieldDlg.cxx
View File

@ -1634,7 +1634,7 @@ void EntityGUI_FieldDlg::activateSelection()
// local selection
if (!myShape->_is_nil() &&
!myEditCurrentArgument &&
myShapeIDs.size() > 1 ) // shape type is already choosen by user
myShapeIDs.size() > 1 ) // shape type is already chosen by user
{
GEOM_Displayer* aDisplayer = getDisplayer();
CORBA::String_var aMainEntry = myShape->GetStudyEntry();

8
src/EntityGUI/EntityGUI_SketcherDlg.cxx
View File

@ -908,7 +908,7 @@ void EntityGUI_SketcherDlg::Dir2Clicked( int constructorId )
{
InitClick();
Group3Spin->SpinBox_DX->blockSignals(true); // Block signals in order not to modify
Group3Spin->SpinBox_DY->blockSignals(true); // defaut values
Group3Spin->SpinBox_DY->blockSignals(true); // default values
Group3Spin->SpinBox_DZ->blockSignals(true);
Group2Spin->SpinBox_DX->blockSignals(true);
@ -1591,7 +1591,7 @@ void EntityGUI_SketcherDlg::LineEditReturnPressed()
myEditCurrentArgument = Group2Sel->LineEdit2;
/* User name of object input management */
/* If successfull the selection is changed and signal emitted... */
/* If successful the selection is changed and signal emitted... */
/* so SelectionIntoArgument() is automatically called. */
const QString objectUserName = myEditCurrentArgument->text();
QWidget* thisWidget = (QWidget*)this;
@ -1692,8 +1692,8 @@ void EntityGUI_SketcherDlg::closeEvent( QCloseEvent* e )
void EntityGUI_SketcherDlg::OnPointSelected(Qt::KeyboardModifiers modifiers, const gp_Pnt& thePnt,
bool isStart )
{
// NOTE Basing the autoapply functionnality on the background picture has no sense anymore
// The import picture functionnality is now used for drawing on top of a picture
// NOTE Basing the autoapply functionality on the background picture has no sense anymore
// The import picture functionality is now used for drawing on top of a picture
// SUIT_ViewWindow* theViewWindow = getDesktop()->activeWindow();
// OCCViewer_ViewPort3d* vp = ((OCCViewer_ViewWindow*)theViewWindow)->getViewPort();

2
src/GEOM/GEOM_BaseObject.cxx
View File

@ -322,7 +322,7 @@ TCollection_AsciiString GEOM_BaseObject::GetName()
aName = aNameAttr->Get();
// do not return pointer of local variable
// return aName.ToCString();
// the following code could lead to memory leak, so take care about recieved pointer
// the following code could lead to memory leak, so take care about received pointer
return aName;
}

4
src/GEOM/GEOM_Engine.cxx
View File

@ -529,7 +529,7 @@ bool GEOM_Engine::RemoveObject(Handle(GEOM_BaseObject)& theObject)
if ( aFreeLabels.empty() || aFreeLabels.back() != aLabel )
aFreeLabels.push_back(aLabel);
// we can't explicitely delete theObject. At least prevent its functioning
// we can't explicitly delete theObject. At least prevent its functioning
// as an alive object when aLabel is reused for a new object
theObject->_label = aLabel.Root();
theObject->_ior.Clear();
@ -679,7 +679,7 @@ TCollection_AsciiString GEOM_Engine::DumpPython(int theDocID,
// a map containing copies of TObjectData from theObjectData
TSting2ObjDataMap aEntry2ObjData;
// contains pointers to TObjectData of either aEntry2ObjData or theObjectData; the latter
// occures when several StudyEntries correspond to one Entry
// occurs when several StudyEntries correspond to one Entry
TSting2ObjDataPtrMap aStEntry2ObjDataPtr;
//Resource_DataMapOfAsciiStringAsciiString aEntry2StEntry, aStEntry2Entry, theObjectNames;

8
src/GEOM/GEOM_Engine.hxx
View File

@ -91,11 +91,11 @@ typedef std::map<int, std::list<TDF_Label> > TFreeLabelsList;
class GEOM_Engine
{
public:
public:
Standard_EXPORT GEOM_Engine();
Standard_EXPORT virtual ~GEOM_Engine();
//Retuns the engine
//Returns the engine
Standard_EXPORT static GEOM_Engine* GetEngine();
//Returns the OCAF document by its ID, if document doesn't exists it will be created
@ -175,10 +175,10 @@ class GEOM_Engine
Standard_EXPORT bool DocumentModified(const int theDocId);
protected:
protected:
Standard_EXPORT static void SetEngine(GEOM_Engine* theEngine);
private:
private:
Handle(GEOM_Application) _OCAFApp;
TColStd_DataMapOfIntegerTransient _mapIDDocument;

6
src/GEOM/GEOM_Field.cxx
View File

@ -46,7 +46,7 @@ namespace
{
//================================================================================
/*!
* \brief Returns a funtion with a given type OR the 1st function
* \brief Returns a function with a given type OR the 1st function
*/
//================================================================================
@ -101,7 +101,7 @@ void GEOM_Field::Init(const Handle(GEOM_Object)& theShape,
{
Handle(GEOM_Function) fun = GetFunction(1);
if ( !fun.IsNull() )
Standard_MultiplyDefined::Raise( "Reinitialization of GEOM_Field is forbiden" );
Standard_MultiplyDefined::Raise( "Reinitialization of GEOM_Field is forbidden" );
fun = AddFunction( GetFieldID(), FUN_ADD_FIELD );
GEOM_IField data( fun );
@ -498,7 +498,7 @@ void GEOM_FieldStep::Init(const Handle(GEOM_Field)& theField,
{
Handle(GEOM_Function) fun = GetFunction(1);
if ( !fun.IsNull() )
Standard_MultiplyDefined::Raise( "Reinitialization of GEOM_FieldStep is forbiden" );
Standard_MultiplyDefined::Raise( "Reinitialization of GEOM_FieldStep is forbidden" );
fun = AddFunction( GEOM_Field::GetFieldID(), GEOM_Field::FUN_ADD_STEP );
GEOM_IField data( fun );

2
src/GEOM/GEOM_Function.cxx
View File

@ -155,7 +155,7 @@ GEOM_Function::~GEOM_Function()
//================================================================================
/*!
* \brief Retuns true if this function is the last one in the study
* \brief Returns true if this function is the last one in the study
*/
//================================================================================

2
src/GEOM/GEOM_Function.hxx
View File

@ -174,7 +174,7 @@ public:
//Returns true if the last method succided
Standard_EXPORT bool IsDone() { return _isDone; }
//Retuns true if this function is the last one in the study
//Returns true if this function is the last one in the study
Standard_EXPORT bool IsLastFuntion();
//Returns a sequence of the external dependencies of this function

2
src/GEOMAlgo/GEOMAlgo_FinderShapeOn1.cxx
View File

@ -632,7 +632,7 @@ void GEOMAlgo_FinderShapeOn1::InnerPoints(const TopoDS_Face& aF,
for (; aIt.More(); aIt.Next()) {
iCnt=aIt.Value();
if (iCnt>1) {
// take the first having occured inner link
// take the first having occurred inner link
// and discretize it
const GEOMAlgo_PassKey& aPK=aIt.Key();
//

2
src/GEOMAlgo/GEOMAlgo_GetInPlaceAPI.cxx
View File

@ -187,7 +187,7 @@ Standard_Integer GEOMAlgo_GetInPlaceAPI::GetInPlaceOld
if (aWhereDistance.IsDone() && aWhatDistance.IsDone() &&
fabs(aWhereDistance.Value() - aWhatDistance.Value()) <= aTolConf)
{
// 0020162: "EDF 961 GEOM : Getinplace is getting additionnal orthogonal faces"
// 0020162: "EDF 961 GEOM : Getinplace is getting additional orthogonal faces"
// aVertex must be projected to the same point on Where and on What
gp_Pnt pOnWhat = aWhatDistance.PointOnShape2(1);
gp_Pnt pOnWhere = aWhereDistance.PointOnShape2(1);

2
src/GEOMAlgo/GEOMAlgo_GetInPlaceAPI.hxx
View File

@ -60,7 +60,7 @@ public:
GEOMAlgo_GetInPlace &theGIP);
/*!
* \brief Old implementation of GetInPlace algoritm.
* \brief Old implementation of GetInPlace algorithm.
* This method searches among sub shapes of the shape theWhere parts that are
* coincident with the shape theWhat. The result list of shape is returned as
* an output parameter. It returns the error code with the following possible

2
src/GEOMAlgo/GEOMAlgo_GlueDetector.cxx
View File

@ -219,7 +219,7 @@ void GEOMAlgo_GlueDetector::DetectVertices()
//
aNbVSD=aBBTree.Select(aSelector);
if (!aNbVSD) {
continue; // it shoild not be so [at least IP itself]
continue; // it should not be so [at least IP itself]
}
//
const TColStd_ListOfInteger& aLI=aSelector.Indices();

4
src/GEOMBase/GEOMBase_Helper.cxx
View File

@ -836,7 +836,7 @@ bool GEOMBase_Helper::checkViewWindow()
//================================================================
// Function : onAccept
// Purpose : This method should be called from dialog's slots onOk() and onApply()
// It perfroms user input validation, then it
// It performs user input validation, then it
// performs a proper operation and manages transactions, etc.
//================================================================
bool GEOMBase_Helper::onAccept( const bool publish, const bool useTransaction, bool erasePreviewFlag )
@ -955,7 +955,7 @@ bool GEOMBase_Helper::onAccept( const bool publish, const bool useTransaction, b
catch( const SALOME::SALOME_Exception& e ) {
SalomeApp_Tools::QtCatchCorbaException( e );
abortCommand();
MESSAGE("Exception catched")
MESSAGE("Exception caught")
}
updateViewer();

2
src/GEOMBase/GEOMBase_Skeleton.cxx
View File

@ -225,7 +225,7 @@ void GEOMBase_Skeleton::LineEditReturnPressed()
return;
/* User name of object input management */
/* If successfull the selection is changed and signal emitted... */
/* If successful the selection is changed and signal emitted... */
/* so SelectionIntoArgument() is automatically called. */
const QString objectUserName = myEditCurrentArgument->text();
QWidget* thisWidget = (QWidget*)this;

2
src/GEOMBase/GEOM_GenericObjPtr.h
View File

@ -57,7 +57,7 @@ namespace GEOM
object that should be removed by the caller as soon as the object is no more required.
For example, function GetSubShape() of the GEOM_IShapesOperation interface always creates
new servant object and returns new object reference to it. If the object is not published
in the study, it has to be destroyed and the coresponding servant should be deleted.
in the study, it has to be destroyed and the corresponding servant should be deleted.
Examples:
\code

2
src/GEOMGUI/GEOM_Displayer.cxx
View File

@ -951,7 +951,7 @@ void GEOM_Displayer::updateShapeProperties( const Handle(GEOM_AISShape)& AISShap
study->setObjectProperty( aMgrId, entry, GEOM::propertyName( GEOM::Texture ), QString( GetTexture().c_str() ) );
study->setObjectProperty( aMgrId, entry, GEOM::propertyName( GEOM::DisplayMode ), 3 );
// Update propeties map
// Update properties map
propMap = getObjectProperties( study, entry, myViewFrame );
}
}

2
src/GEOMGUI/GEOM_Displayer.h
View File

@ -196,7 +196,7 @@ public:
virtual void BeforeErase ( SALOME_View*, const SALOME_OCCPrs* );
virtual void AfterErase ( SALOME_View*, const SALOME_OCCPrs* );
/* This methos is used for activisation/deactivisation of objects to be displayed*/
/* This methods is used for activisation/deactivisation of objects to be displayed*/
void SetToActivate( const bool );
bool ToActivate() const;

8
src/GEOMGUI/GEOM_msg_en.ts
View File

@ -970,7 +970,7 @@ Please, select face, shell or solid and try again</translation>
</message>
<message>
<source>GEOM_INERTIA_TITLE</source>
<translation>Calculs Of Inertia</translation>
<translation>Calculus Of Inertia</translation>
</message>
<message>
<source>GEOM_INF_LOADED</source>
@ -1150,7 +1150,7 @@ Please, select face, shell or solid and try again</translation>
</message>
<message>
<source>GEOM_MINDIST_TITLE</source>
<translation>Minimun Distance Between Two Objects</translation>
<translation>Minimum Distance Between Two Objects</translation>
</message>
<message>
<source>GEOM_MIRROR</source>
@ -1830,7 +1830,7 @@ Please, select face, shell or solid and try again</translation>
</message>
<message>
<source>GEOM_SKETCHER_ADD_PARAMS</source>
<translation>Additionnal Parameters</translation>
<translation>Additional Parameters</translation>
</message>
<message>
<source>GEOM_SKETCHER_ANGLE</source>
@ -5210,7 +5210,7 @@ Please, select face, shell or solid and try again</translation>
</message>
<message>
<source>GEOM_CLOSEDUNCLOSED</source>
<translation>Not defined, Closed or Opened. Possibly, error occured.</translation>
<translation>Not defined, Closed or Opened. Possibly, error occurred.</translation>
</message>
<message>
<source>GEOM_DISK_CIRCLE</source>

8
src/GEOMGUI/GeometryGUI.cxx
View File

@ -173,7 +173,7 @@ CORBA::Object_var GeometryGUI::ClientSObjectToObject (_PTR(SObject) theSObject)
anObj = anORB->string_to_object(aValue.c_str());
}
} catch(...) {
INFOS("ClientSObjectToObject - Unknown exception was occured!!!");
INFOS("ClientSObjectToObject - Unknown exception has occurred!!!");
}
return anObj._retn();
}
@ -624,7 +624,7 @@ void GeometryGUI::OnGUIEvent( int id, const QVariant& theParam )
case GEOMOp::OpFace: // MENU BUILD - FACE
case GEOMOp::OpShell: // MENU BUILD - SHELL
case GEOMOp::OpSolid: // MENU BUILD - SOLID
case GEOMOp::OpCompound: // MENU BUILD - COMPUND
case GEOMOp::OpCompound: // MENU BUILD - COMPOUND
libName = "BuildGUI";
break;
case GEOMOp::OpFuse: // MENU BOOLEAN - FUSE
@ -2980,7 +2980,7 @@ void GeometryGUI::storeVisualParameters (int savePoint)
_PTR(SObject) obj( studyDS->FindObjectID( o_it.key().toLatin1().data() ) );
if ( !obj || !(aProps.count() > 0))
continue;
// entry is "encoded" = it does NOT contain component adress, since it is a
// entry is "encoded" = it does NOT contain component address, since it is a
// subject to change on next component loading
std::string entry = ip->encodeEntry(o_it.key().toLatin1().data(), componentName);
@ -3154,7 +3154,7 @@ void GeometryGUI::restoreVisualParameters (int savePoint)
for (std::vector<std::string>::iterator entIt = entries.begin(); entIt != entries.end(); ++entIt)
{
// entry is a normal entry - it should be "decoded" (setting base adress of component)
// entry is a normal entry - it should be "decoded" (setting base address of component)
QString entry (ip->decodeEntry(*entIt).c_str());
// Check that the entry corresponds to a real object in the Study

6
src/GEOMImpl/GEOMImpl_BooleanDriver.cxx
View File

@ -450,7 +450,7 @@ TopoDS_Shape GEOMImpl_BooleanDriver::performOperation
TopoDS_Shape aStepResult = BO.Shape();
// check result of this step: if it is a compound (boolean operations
// allways return a compound), we add all sub-shapes of it.
// always return a compound), we add all sub-shapes of it.
// This allows to avoid adding empty compounds,
// resulting from COMMON on two non-intersecting shapes.
if (aStepResult.ShapeType() == TopAbs_COMPOUND) {
@ -513,7 +513,7 @@ TopoDS_Shape GEOMImpl_BooleanDriver::performOperation
}
if (isCompound) {
// check result of this step: if it is a compound (boolean operations
// allways return a compound), we add all sub-shapes of it.
// always return a compound), we add all sub-shapes of it.
// This allows to avoid adding empty compounds,
// resulting from CUT of parts
if (aCut.ShapeType() == TopAbs_COMPOUND) {
@ -620,7 +620,7 @@ TopoDS_Shape GEOMImpl_BooleanDriver::performOperation
TopoDS_Shape aStepResult = BO.Shape();
// check result of this step: if it is a compound (boolean operations
// allways return a compound), we add all sub-shapes of it.
// always return a compound), we add all sub-shapes of it.
// This allows to avoid adding empty compounds,
// resulting from SECTION on two non-intersecting shapes.
if (aStepResult.ShapeType() == TopAbs_COMPOUND) {

2
src/GEOMImpl/GEOMImpl_ChamferDriver.cxx
View File

@ -217,7 +217,7 @@ Standard_Integer GEOMImpl_ChamferDriver::Execute(LOGBOOK& log) const
}
else if (aType == CHAMFER_SHAPE_EDGES || aType == CHAMFER_SHAPE_EDGES_AD)
{
// chamfer on selected edges with lenght param D1 & D2.
// chamfer on selected edges with length param D1 & D2.
int aLen = aCI.GetLength();
int ind = 1;

4
src/GEOMImpl/GEOMImpl_GlueDriver.cxx
View File

@ -117,7 +117,7 @@ TopoDS_Shape GEOMImpl_GlueDriver::GlueFacesWithWarnings (const TopoDS_Shape& the
Standard_Failure::Raise(MSG_BAD_ARG_SHAPE);
break;
case 200:
Standard_Failure::Raise("Error occured during check of geometric coincidence");
Standard_Failure::Raise("Error occurred during check of geometric coincidence");
break;
default:
{
@ -236,7 +236,7 @@ TopoDS_Shape GEOMImpl_GlueDriver::GlueFaces (const TopoDS_Shape& theShape,
Standard_Failure::Raise("Result shape is Null");
break;
case 200:
Standard_Failure::Raise("Error occured during check of geometric coincidence");
Standard_Failure::Raise("Error occurred during check of geometric coincidence");
break;
default:
{

4
src/GEOMImpl/GEOMImpl_IMeasureOperations.cxx
View File

@ -154,10 +154,10 @@ GEOMImpl_IMeasureOperations::ShapeKind GEOMImpl_IMeasureOperations::KindOfShape
}
const GEOMAlgo_ShapeInfo& anInfo = aSF.Info();
// specific processing for some "advandced" objects
// specific processing for some "advanced" objects
switch ( geom_type ) {
case GEOM_MARKER:
// local coordinate systen
// local coordinate system
// (+) geompy.kind.LCS xc yc zc xx xy xz yx yy yz zx zy zz
TopoDS_Face aFace = TopoDS::Face( aShape );

2
src/GEOMImpl/GEOMImpl_IMeasureOperations.hxx
View File

@ -198,7 +198,7 @@ class GEOMImpl_IMeasureOperations : public GEOM_IOperations {
Standard_EXPORT Standard_Real GetAngleBtwVectors (Handle(GEOM_Object) theVec1, Handle(GEOM_Object) theVec2);
// Methods for recieving radiuses of curvature of curves and surfaces
// Methods for receiving radiuses of curvature of curves and surfaces
// in the given point
Standard_EXPORT Standard_Real CurveCurvatureByParam (Handle(GEOM_Object) theCurve,
Standard_Real& theParam);

4
src/GEOMImpl/GEOMImpl_IShapesOperations.cxx
View File

@ -3347,7 +3347,7 @@ Handle(TColStd_HSequenceOfInteger)
// Default value=3
aFinder.SetNbPntsMin(3);
// Sets the maximal number of inner points for edges or faces.
// It is usefull for the cases when this number is very big (e.g =2000) to improve
// It is useful for the cases when this number is very big (e.g =2000) to improve
// the performance. If this value =0, all inner points will be taken into account.
// Default value=0
aFinder.SetNbPntsMax(100);
@ -4275,7 +4275,7 @@ Handle(TColStd_HSequenceOfInteger)
// Default value=3
aFinder.SetNbPntsMin(3);
// Sets the maximal number of inner points for edges or faces.
// It is usefull for the cases when this number is very big (e.g =2000) to improve
// It is useful for the cases when this number is very big (e.g =2000) to improve
// the performance. If this value =0, all inner points will be taken into account.
// Default value=0
aFinder.SetNbPntsMax(100);

42
src/GEOMImpl/GEOMImpl_PipeDriver.cxx
View File

@ -146,7 +146,7 @@ GEOMImpl_PipeDriver::GEOMImpl_PipeDriver()
//=======================================================================
//function : EvaluateBestSweepMode
//purpose : auxilary for right call of MakePipe and MakePipeShell
//purpose : auxiliary for right call of MakePipe and MakePipeShell
//=======================================================================
static GeomFill_Trihedron EvaluateBestSweepMode(const TopoDS_Shape& Spine)
{
@ -202,7 +202,7 @@ static Standard_Boolean BuildPipeShell(BRepOffsetAPI_MakePipeShell &theBuilder)
//=======================================================================
//function : FillForOtherEdges
//purpose : auxilary for CreatePipeForShellSections()
//purpose : auxiliary for CreatePipeForShellSections()
//=======================================================================
static bool FillForOtherEdges(const TopoDS_Shape& F1,
const TopoDS_Shape& E1,
@ -278,7 +278,7 @@ static bool FillForOtherEdges(const TopoDS_Shape& F1,
//=======================================================================
//function : FillCorrespondingEdges
//purpose : auxilary for CreatePipeForShellSections()
//purpose : auxiliary for CreatePipeForShellSections()
//=======================================================================
static bool FillCorrespondingEdges(const TopoDS_Shape& FS1,
const TopoDS_Shape& FS2,
@ -406,7 +406,7 @@ static bool FillCorrespondingEdges(const TopoDS_Shape& FS1,
//=======================================================================
//function : FillCorrespondingEdges
//purpose : auxilary for CreatePipeShellsWithoutPath()
//purpose : auxiliary for CreatePipeShellsWithoutPath()
//=======================================================================
static bool FillCorrespondingEdges(const TopoDS_Shape& FS1,
const TopoDS_Shape& FS2,
@ -508,7 +508,7 @@ static bool FillCorrespondingEdges(const TopoDS_Shape& FS1,
//=======================================================================
//function : FindNextPairOfFaces
//purpose : auxilary for CreatePipeForShellSections()
//purpose : auxiliary for CreatePipeForShellSections()
//=======================================================================
static void FindNextPairOfFaces(const TopoDS_Shape& aCurFace,
TopTools_IndexedDataMapOfShapeListOfShape& aMapEdgeFaces1,
@ -578,7 +578,7 @@ static void FindNextPairOfFaces(const TopoDS_Shape& aCurFace,
//=======================================================================
//function : FindFirstPairFaces
//purpose : auxilary for Execute()
//purpose : auxiliary for Execute()
//=======================================================================
static void FindFirstPairFaces(const TopoDS_Shape& S1, const TopoDS_Shape& S2,
TopoDS_Vertex& V1, TopoDS_Vertex& V2,
@ -700,7 +700,7 @@ static void FindFirstPairFaces(const TopoDS_Shape& S1, const TopoDS_Shape& S2,
//function : RemoveFaces
//purpose : This function returns theShapeFrom without faces of the shape
// theFacesToRm. It returns a shell if theShapeFrom is a solid or
// a compound otherwise. Auxilary for CreatePipeWithDifferentSections
// a compound otherwise. Auxiliary for CreatePipeWithDifferentSections
// method.
//=======================================================================
static TopoDS_Shape RemoveFaces(const TopoDS_Shape &theShapeFrom,
@ -1309,7 +1309,7 @@ TopoDS_Shape GEOMImpl_PipeDriver::CreatePipeWithDifferentSections
//=======================================================================
//function : CreatePipeForShellSections
//purpose : auxilary for Execute()
//purpose : auxiliary for Execute()
//=======================================================================
static TopoDS_Shape CreatePipeForShellSections(const TopoDS_Wire& aWirePath,
GEOMImpl_IPipe* aCI)
@ -2034,7 +2034,7 @@ static TopoDS_Shape CreatePipeForShellSections(const TopoDS_Wire& aWirePath,
//=======================================================================
//function : CreatePipeShellsWithoutPath
//purpose : auxilary for Execute()
//purpose : auxiliary for Execute()
//=======================================================================
static TopoDS_Shape CreatePipeShellsWithoutPath(GEOMImpl_IPipe* aCI)
{
@ -2154,13 +2154,13 @@ static TopoDS_Shape CreatePipeShellsWithoutPath(GEOMImpl_IPipe* aCI)
if (aCI) delete aCI;
Standard_ConstructionError::Raise("Can not create correct pipe");
}
MESSAGE (" correspondences for sub-shapes of first pair of faces is found");
MESSAGE (" correspondences for sub-shapes of first pair of faces found");
FindNextPairOfFaces(FS1, aMapEdgeFaces1, aMapEdgeFaces2, FF, aCI);
MESSAGE (" other correspondences is found, make pipe for all pairs of faces");
MESSAGE (" other correspondences found, make pipe for all pairs of faces");
// make pipe for each pair of faces
// auxilary map vertex->edge for created pipe edges
// auxiliary map vertex->edge for created pipe edges
TopTools_IndexedDataMapOfShapeShape VPE;
ShapeAnalysis_Edge sae;
//cout<<"FF.Extent()="<<FF.Extent()<<endl;
@ -2225,7 +2225,7 @@ static TopoDS_Shape CreatePipeShellsWithoutPath(GEOMImpl_IPipe* aCI)
if (VPE.Contains(E1)) {
aNewFs.Append(VPE.FindFromKey(E1));
#ifdef _DEBUG_
MESSAGE (" using existed face");
MESSAGE (" using existing face");
#endif
continue;
}
@ -2542,7 +2542,7 @@ static TopoDS_Shape CreatePipeShellsWithoutPath(GEOMImpl_IPipe* aCI)
//=======================================================================
//function : CreatePipeBiNormalAlongVector
//purpose : auxilary for Execute()
//purpose : auxiliary for Execute()
//=======================================================================
static TopoDS_Shape CreatePipeBiNormalAlongVector(const TopoDS_Wire& aWirePath,
GEOMImpl_IPipe* aCI)
@ -2619,7 +2619,7 @@ static TopoDS_Shape CreatePipeBiNormalAlongVector(const TopoDS_Wire& aWirePath,
//=======================================================================
//function : FillGroups
//purpose : auxilary for DoGroups()
//purpose : auxiliary for DoGroups()
//=======================================================================
bool FillGroups(const TopTools_SequenceOfShape *theGroups,
const TopTools_IndexedMapOfShape &theIndices,
@ -2652,7 +2652,7 @@ bool FillGroups(const TopTools_SequenceOfShape *theGroups,
//=======================================================================
//function : StoreGroups
//purpose : auxilary for CreateGroups()
//purpose : auxiliary for CreateGroups()
//=======================================================================
void StoreGroups(GEOMImpl_IPipe *theCI,
Handle(TColStd_HArray1OfInteger) *theGroups)
@ -2680,7 +2680,7 @@ void StoreGroups(GEOMImpl_IPipe *theCI,
//=======================================================================
//function : CreateDownUpGroups
//purpose : auxilary for DoGroups()
//purpose : auxiliary for DoGroups()
//=======================================================================
static bool CreateDownUpGroups(BRepPrimAPI_MakeSweep *theSweep,
TopTools_SequenceOfShape *theGroups,
@ -2745,7 +2745,7 @@ static bool CreateDownUpGroups(BRepPrimAPI_MakeSweep *theSweep,
//=======================================================================
//function : DoGroups1
//purpose : auxilary for CreateGroups1()
//purpose : auxiliary for CreateGroups1()
//=======================================================================
bool DoGroups1 (const TopoDS_Shape &theProfile,
BRepOffsetAPI_MakePipeShell &theSweep,
@ -2856,7 +2856,7 @@ bool DoGroups1 (const TopoDS_Shape &theProfile,
//=======================================================================
//function : CreateGroups1
//purpose : auxilary for Execute()
//purpose : auxiliary for Execute()
//=======================================================================
bool CreateGroups1 (const TopoDS_Shape &theProfile,
BRepOffsetAPI_MakePipeShell &theSweep,
@ -2893,7 +2893,7 @@ bool CreateGroups1 (const TopoDS_Shape &theProfile,
//=======================================================================
//function : DoGroups2
//purpose : auxilary for CreateGroups()
//purpose : auxiliary for CreateGroups()
//=======================================================================
static bool DoGroups2(const TopoDS_Shape &theProfile,
const TopoDS_Shape &thePath,
@ -2981,7 +2981,7 @@ static bool DoGroups2(const TopoDS_Shape &theProfile,
//=======================================================================
//function : CreateGroups
//purpose : auxilary for Execute()
//purpose : auxiliary for Execute()
//=======================================================================
static bool CreateGroups2(const TopoDS_Shape &theProfile,
const TopoDS_Shape &thePath,

2
src/GEOMImpl/GEOMImpl_PrismDriver.cxx
View File

@ -197,7 +197,7 @@ Standard_Integer GEOMImpl_PrismDriver::Execute(LOGBOOK& log) const
Standard_Real anAngle = aCI.GetDraftAngle(); // Draft angle
Standard_Boolean isProtrusion = (aCI.GetFuseFlag()==1);
Standard_Boolean isInvert = aCI.GetInvertFlag();
// Flag to know wether the feature is a protrusion (fuse) or a depression (cut)
// Flag to know whether the feature is a protrusion (fuse) or a depression (cut)
// history of the Base wire (RefBase)
Handle(GEOM_Object) aSuppObj;

4
src/GEOMImpl/GEOMImpl_ThruSectionsDriver.cxx
View File

@ -127,8 +127,8 @@ Standard_Integer GEOMImpl_ThruSectionsDriver::Execute(LOGBOOK& log) const
}
if ( !GEOMUtils::CheckShape(aShape) && !GEOMUtils::FixShapeTolerance(aShape) ) {
//algoritm thru section creats on the arcs invalid shapes gka
// Standard_ConstructionError::Raise("Algorithm have produced an invalid shape result");
//algorithm through section creates on the arcs invalid shapes gka
// Standard_ConstructionError::Raise("Algorithm has produced an invalid shape result");
}
aFunction->SetValue(aShape);

2
src/GEOMUtils/GEOMUtils.hxx
View File

@ -323,7 +323,7 @@ namespace GEOMUtils
/*!
* \brief Extract single SOLID from COMPSOLID or COMPOUND.
*
* If the argument shape is a COMPUND or COMPSOLID and there's
* If the argument shape is a COMPOUND or COMPSOLID and there's
* only single simple-shape type inside, this sub-shape is returned as a result;
* otherwise, the shape is not changed.
*

6
src/GEOM_I/GEOM_Gen_i.cc
View File

@ -262,7 +262,7 @@ SALOMEDS::SObject_ptr GEOM_Gen_i::PublishInStudy(SALOMEDS::Study_ptr theStudy,
// BEGIN: try to find existed name for current shape
if ( !aShape->_is_nil() && mytype != GEOM_GROUP)
{
// recieve current TopoDS shape
// receive current TopoDS shape
CORBA::String_var entry = aShape->GetEntry();
HANDLE_NAMESPACE(GEOM_Object) aGShape = HANDLE_NAMESPACE(GEOM_Object)::DownCast
( _impl->GetObject( aShape->GetStudyID(), entry ));
@ -450,7 +450,7 @@ SALOMEDS::SObject_ptr GEOM_Gen_i::PublishInStudy(SALOMEDS::Study_ptr theStudy,
//============================================================================
// function : CreateAndPublishGroup
// purpose : auxilary for PublishNamedShapesInStudy
// purpose : auxiliary for PublishNamedShapesInStudy
//============================================================================
void GEOM_Gen_i::CreateAndPublishGroup(SALOMEDS::Study_ptr theStudy,
GEOM::GEOM_Object_var theMainShape,
@ -2516,7 +2516,7 @@ void GEOM_Gen_i::LoadPlugin(const std::string& theLibName)
// load plugin library
LibHandle libHandle = LoadLib( aPlatformLibName.c_str() );
if (!libHandle) {
// report any error, if occured
// report any error, if occurred
#ifndef WIN32
throw(SALOME_Exception(dlerror()));
#else

2
src/GEOM_I/GEOM_Gen_i.hh
View File

@ -364,7 +364,7 @@ class GEOM_I_EXPORT GEOM_Gen_i: virtual public POA_GEOM::GEOM_Gen, virtual publi
GEOM::find_shape_method theFindMethod,
CORBA::Boolean theAddPrefix);
// auxilary for PublishNamedShapesInStudy
// auxiliary for PublishNamedShapesInStudy
void CreateAndPublishGroup(SALOMEDS::Study_ptr theStudy,
GEOM::GEOM_Object_var theMainShape,
const TopTools_IndexedMapOfShape& anIndices,

2
src/GEOM_I/GEOM_IMeasureOperations_i.hh
View File

@ -141,7 +141,7 @@ class GEOM_I_EXPORT GEOM_IMeasureOperations_i :
CORBA::Double GetAngleBtwVectors (GEOM::GEOM_Object_ptr theShape1,
GEOM::GEOM_Object_ptr theShape2);
// Methods for recieving radiuses of curvature of curves and surfaces
// Methods for receiving radiuses of curvature of curves and surfaces
// in the given point
CORBA::Double CurveCurvatureByParam (GEOM::GEOM_Object_ptr theCurve,
CORBA::Double theParam);

10
src/GEOM_PY/geomtools.py
View File

@ -230,13 +230,13 @@ class GeomStudyTools:
## Display the geometrical shape whose entry is given by \em entry.
# You should prefer use this function instead of the
# displayShapeByName() which can have an unpredictible behavior in
# displayShapeByName() which can have an unpredictable behavior in
# the case where several objects exist with the same name in the study.
def displayShapeByEntry(self, shapeStudyEntry, color = None, fit=True):
"""
Display the geometrical shape whose entry is given by
`entry`. You should prefer use this function instead of the
displayShapeByName which can have an unpredictible behavior in
displayShapeByName which can have an unpredictable behavior in
the case where several objects exist with the same name in the
study.
"""
@ -271,7 +271,7 @@ class GeomStudyTools:
# Helper functions for a complete suppression of a shape from the
# SALOME session.
# ======================================================================
## This completly deletes a geom shape.
## This completely deletes a geom shape.
# \warning Please be aware that to delete a geom object,
# you have three operations to perform:
#
@ -280,7 +280,7 @@ class GeomStudyTools:
# 3. destroy the underlying geom object
def deleteShape(self,shapeStudyEntry):
"""
This completly deletes a geom shape.
This completely deletes a geom shape.
WARNING: please be aware that to delete a geom object, you have
three operations to perform:
@ -416,7 +416,7 @@ def TEST_createAndDeleteShape():
gst.eraseShapeByEntry(sphereStudyEntry)
# --------------------------------------------------
# In this last example, we completly delete an object from the
# In this last example, we completely delete an object from the
# SALOME session (erase from viewer, remove from study and finnaly
# destroy the object). This is done by a simple call to
# deleteShape().

2
src/GEOM_PY/sketcher.py
View File

@ -51,7 +51,7 @@ Example::
geompy = geomBuilder.New(salome.myStudy)
geompy.addToStudy( wire, 'mysketch' )
Additionnal examples can be found as unit tests in the source code.
Additional examples can be found as unit tests in the source code.
"""
geompyEnable = True

2
src/GEOM_SWIG/GEOM_TestAll.py
View File

@ -325,7 +325,7 @@ def TestAll (geompy, math):
MultiRot2Dt = geompy.MultiRotate2DNbTimes(Chamfer, vx, nbtimes1, step1, nbtimes2)
MultiRot2Ds = geompy.MultiRotate2DByStep(Chamfer, vx, angle1, nbtimes1, step1, nbtimes2)
#Create Informations objects
#Create Information objects
CDG = geompy.MakeCDG(Prism) #(GEOM_Object)->GEOM_Object
Archimede = geompy.Archimede(Box, weight, waterdensity,
meshingdeflection) #(GEOM_Object, 3 Doubles)->GEOM_Object

2
src/GEOM_SWIG/GEOM_TestOthers.py
View File

@ -818,7 +818,7 @@ def TestOtherOperations (geompy, math):
for aface in afaces:
ssname = "Reflection of face " + `ifa` + " of box " + `ibb` + " (by history)"
if ibb == 6 and (ifa == 2 or ifa == 4):
# use IDL interface directly to avoid error message appearence in Python console
# use IDL interface directly to avoid error message appearance in Python console
refl_box_face = geompy.ShapesOp.GetInPlaceByHistory(part, aface)
if refl_box_face is not None:
geompy.addToStudyInFather(part, refl_box_face, ssname)

8
src/GEOM_SWIG/GEOM_shellSolid.py
View File

@ -255,7 +255,7 @@ def MakeRotation(g, pt, ve, angle):
def MakeMirrorByPoint(s, point):
"""
Creates a symmetric object by point symetry
Creates a symmetric object by point symmetry
"""
return fkl
@ -263,7 +263,7 @@ def MakeMirrorByPoint(s, point):
def MakeMirrorByLine(s, line):
"""
Creates a symmetric object by line symetry
Creates a symmetric object by line symmetry
"""
return fkl
@ -271,7 +271,7 @@ def MakeMirrorByLine(s, line):
def MakeMirrorByPlane(s, pt, ve):
"""
Creates a symmetric object by plane symetry defined by a point and a normal vector
Creates a symmetric object by plane symmetry defined by a point and a normal vector
"""
p = plane(pt, ve)
r = geompy.MakeMirrorByplane(s, p)
@ -301,7 +301,7 @@ def mergePointsNearBy(l, v):
"""
return fkl
# Acces operators
# Access operators
# ---------------
def getCoords(v):