SET(${PROJECT_NAME_UC}_PATCH_VERSION 0)
SET(${PROJECT_NAME_UC}_VERSION
${${PROJECT_NAME_UC}_MAJOR_VERSION}.${${PROJECT_NAME_UC}_MINOR_VERSION}.${${PROJECT_NAME_UC}_PATCH_VERSION})
-SET(${PROJECT_NAME_UC}_VERSION_DEV 0)
+SET(${PROJECT_NAME_UC}_VERSION_DEV 1)
# Common CMake macros
# ===================
# 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:
##
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:
# - 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
#
#=======================================================
-# 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:",
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
<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
- 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
- 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
<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>.
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>
\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.
\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.
/*!
* \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);
void StartOperation();
/*!
- * \brief Closes the previously opened trasaction
+ * \brief Closes the previously opened transaction
*/
void FinishOperation();
/*!
* 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.
*
* 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.
*/
* \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.
*/
/*!
* \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.
*
* \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.
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,
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,
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,
* \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,
};
/*!
- * \brief Sequence of non-topological information tranfer data.
+ * \brief Sequence of non-topological information transfer data.
*/
typedef sequence<TransferDatum> ListOfTransferDatum;
* \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,
* 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.
* 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.
* 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.
// 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);
// 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);
//=======================================================================
//function : FixResult
-//purpose : auxilary
+//purpose : auxiliary
//=======================================================================
static void FixResult(const TopoDS_Shape& result,
Handle(ShapeBuild_ReShape)& Context,
//=======================================================================
//function : ModifySurface
-//purpose : auxilary
+//purpose : auxiliary
//=======================================================================
static Standard_Boolean ModifySurface(const TopoDS_Face& aFace,
const Handle(Geom_Surface)& aSurface,
//=======================================================================
//function : MergeEdges
-//purpose : auxilary
+//purpose : auxiliary
//=======================================================================
static Standard_Boolean MergeEdges(const TopTools_SequenceOfShape& SeqEdges,
const Standard_Real Tol,
//=======================================================================
//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
//=======================================================================
//function : ClearRts
-//purpose : auxilary
+//purpose : auxiliary
//=======================================================================
static Handle(Geom_Surface) ClearRts(const Handle(Geom_Surface)& aSurface)
{
//=======================================================================
//function : IsFacesOfSameSolids
-//purpose : auxilary
+//purpose : auxiliary
//=======================================================================
static Standard_Boolean IsFacesOfSameSolids
(const TopoDS_Face &theFace1,
sfw->SetMaxTolerance(Max(1.,myTolerance*1000.));
sfw->SetFace(aFace);
for (TopoDS_Iterator iter (aFace,Standard_False); iter.More(); iter.Next()) {
- TopoDS_Wire wire = TopoDS::Wire(iter.Value());
- sfw->Load(wire);
- sfw->FixReorder();
- sfw->FixShifted();
+ TopoDS_Shape aFaceCont = iter.Value();
+ if (!aFaceCont.IsNull() && aFaceCont.ShapeType() == TopAbs_WIRE) {
+ TopoDS_Wire wire = TopoDS::Wire(iter.Value());
+ sfw->Load(wire);
+ sfw->FixReorder();
+ sfw->FixShifted();
+ }
}
}
} // end processing each solid
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;
//=================================================================================
// 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 )
{
ic->UpdateCurrentViewer();
}
catch( Standard_Failure ) {
- MESSAGE( "Exception catched in EntityGUI::DisplaySimulationShape" );
+ MESSAGE( "Exception caught in EntityGUI::DisplaySimulationShape" );
}
}
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())
{
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);
//================================================================
// 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,
//================================================================
// 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,
// 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
// 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();
{
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);
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;
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();
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;
}
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();
// 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;
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
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;
{
//================================================================================
/*!
- * \brief Returns a funtion with a given type OR the 1st function
+ * \brief Returns a function with a given type OR the 1st function
*/
//================================================================================
{
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 );
{
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 );
//================================================================================
/*!
- * \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
*/
//================================================================================
//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
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();
//
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);
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
//
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();
//================================================================
// 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 )
catch( const SALOME::SALOME_Exception& e ) {
SalomeApp_Tools::QtCatchCorbaException( e );
abortCommand();
- MESSAGE("Exception catched")
+ MESSAGE("Exception caught")
}
updateViewer();
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;
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
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 );
}
}
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;
</message>
<message>
<source>GEOM_INERTIA_TITLE</source>
- <translation>Calculs Of Inertia</translation>
+ <translation>Calculus Of Inertia</translation>
</message>
<message>
<source>GEOM_INF_LOADED</source>
</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>
</message>
<message>
<source>GEOM_SKETCHER_ADD_PARAMS</source>
- <translation>Additionnal Parameters</translation>
+ <translation>Additional Parameters</translation>
</message>
<message>
<source>GEOM_SKETCHER_ANGLE</source>
</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>
anObj = anORB->string_to_object(aValue.c_str());
}
} catch(...) {
- INFOS("ClientSObjectToObject - Unknown exception was occured!!!");
+ INFOS("ClientSObjectToObject - Unknown exception has occurred!!!");
}
return anObj._retn();
}
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
_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);
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
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) {
}
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) {
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) {
}
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;
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:
{
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:
{
}
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 );
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);
// 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);
// 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);
//=======================================================================
//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)
{
//=======================================================================
//function : FillForOtherEdges
-//purpose : auxilary for CreatePipeForShellSections()
+//purpose : auxiliary for CreatePipeForShellSections()
//=======================================================================
static bool FillForOtherEdges(const TopoDS_Shape& F1,
const TopoDS_Shape& E1,
//=======================================================================
//function : FillCorrespondingEdges
-//purpose : auxilary for CreatePipeForShellSections()
+//purpose : auxiliary for CreatePipeForShellSections()
//=======================================================================
static bool FillCorrespondingEdges(const TopoDS_Shape& FS1,
const TopoDS_Shape& FS2,
//=======================================================================
//function : FillCorrespondingEdges
-//purpose : auxilary for CreatePipeShellsWithoutPath()
+//purpose : auxiliary for CreatePipeShellsWithoutPath()
//=======================================================================
static bool FillCorrespondingEdges(const TopoDS_Shape& FS1,
const TopoDS_Shape& FS2,
//=======================================================================
//function : FindNextPairOfFaces
-//purpose : auxilary for CreatePipeForShellSections()
+//purpose : auxiliary for CreatePipeForShellSections()
//=======================================================================
static void FindNextPairOfFaces(const TopoDS_Shape& aCurFace,
TopTools_IndexedDataMapOfShapeListOfShape& aMapEdgeFaces1,
//=======================================================================
//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,
//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,
//=======================================================================
//function : CreatePipeForShellSections
-//purpose : auxilary for Execute()
+//purpose : auxiliary for Execute()
//=======================================================================
static TopoDS_Shape CreatePipeForShellSections(const TopoDS_Wire& aWirePath,
GEOMImpl_IPipe* aCI)
//=======================================================================
//function : CreatePipeShellsWithoutPath
-//purpose : auxilary for Execute()
+//purpose : auxiliary for Execute()
//=======================================================================
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;
if (VPE.Contains(E1)) {
aNewFs.Append(VPE.FindFromKey(E1));
#ifdef _DEBUG_
- MESSAGE (" using existed face");
+ MESSAGE (" using existing face");
#endif
continue;
}
//=======================================================================
//function : CreatePipeBiNormalAlongVector
-//purpose : auxilary for Execute()
+//purpose : auxiliary for Execute()
//=======================================================================
static TopoDS_Shape CreatePipeBiNormalAlongVector(const TopoDS_Wire& aWirePath,
GEOMImpl_IPipe* aCI)
//=======================================================================
//function : FillGroups
-//purpose : auxilary for DoGroups()
+//purpose : auxiliary for DoGroups()
//=======================================================================
bool FillGroups(const TopTools_SequenceOfShape *theGroups,
const TopTools_IndexedMapOfShape &theIndices,
//=======================================================================
//function : StoreGroups
-//purpose : auxilary for CreateGroups()
+//purpose : auxiliary for CreateGroups()
//=======================================================================
void StoreGroups(GEOMImpl_IPipe *theCI,
Handle(TColStd_HArray1OfInteger) *theGroups)
//=======================================================================
//function : CreateDownUpGroups
-//purpose : auxilary for DoGroups()
+//purpose : auxiliary for DoGroups()
//=======================================================================
static bool CreateDownUpGroups(BRepPrimAPI_MakeSweep *theSweep,
TopTools_SequenceOfShape *theGroups,
//=======================================================================
//function : DoGroups1
-//purpose : auxilary for CreateGroups1()
+//purpose : auxiliary for CreateGroups1()
//=======================================================================
bool DoGroups1 (const TopoDS_Shape &theProfile,
BRepOffsetAPI_MakePipeShell &theSweep,
//=======================================================================
//function : CreateGroups1
-//purpose : auxilary for Execute()
+//purpose : auxiliary for Execute()
//=======================================================================
bool CreateGroups1 (const TopoDS_Shape &theProfile,
BRepOffsetAPI_MakePipeShell &theSweep,
//=======================================================================
//function : DoGroups2
-//purpose : auxilary for CreateGroups()
+//purpose : auxiliary for CreateGroups()
//=======================================================================
static bool DoGroups2(const TopoDS_Shape &theProfile,
const TopoDS_Shape &thePath,
//=======================================================================
//function : CreateGroups
-//purpose : auxilary for Execute()
+//purpose : auxiliary for Execute()
//=======================================================================
static bool CreateGroups2(const TopoDS_Shape &theProfile,
const TopoDS_Shape &thePath,
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;
}
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);
/*!
* \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.
*
// 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(::GEOM_Object) aGShape = Handle(::GEOM_Object)::DownCast
( _impl->GetObject( aShape->GetStudyID(), entry ));
//============================================================================
// function : CreateAndPublishGroup
-// purpose : auxilary for PublishNamedShapesInStudy
+// purpose : auxiliary for PublishNamedShapesInStudy
//============================================================================
void GEOM_Gen_i::CreateAndPublishGroup(SALOMEDS::Study_ptr theStudy,
GEOM::GEOM_Object_var theMainShape,
// 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
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,
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);
## 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.
"""
# 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:
#
# 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:
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().
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
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
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)
def MakeMirrorByPoint(s, point):
"""
- Creates a symmetric object by point symetry
+ Creates a symmetric object by point symmetry
"""
return fkl
def MakeMirrorByLine(s, line):
"""
- Creates a symmetric object by line symetry
+ Creates a symmetric object by line symmetry
"""
return fkl
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)
"""
return fkl
-# Acces operators
+# Access operators
# ---------------
def getCoords(v):
## vertices = geompy.SubShapeAll(box, geomBuilder.ShapeType['VERTEX'])
## # only 5 first vertices will be published, with default names
## print len(vertices)
-## # note, that result value still containes all 8 vertices
+## # note, that result value still contains all 8 vertices
## geompy.addToStudyAuto(-1) # disable automatic publication
## @endcode
##
# 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.
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.
# 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.
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.
return anObj
## Create 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.
# @param theName Object name; when specified, this parameter is used
def MakeLine(self, thePnt, theDir, theName=None):
"""
Create a line, passing through the given point
- and parrallel to the given direction
+ and parallel to the given direction
Parameters:
thePnt Point. The resulting line will pass through it.
# possible to generate groups along with the result by means of
# setting the flag \a IsGenerateGroups.<BR>
# If \a thePath is a closed edge or wire and \a IsGenerateGroups is
- # set, an error is occured. If \a thePath is not closed edge/wire,
+ # set, an error is occurred. If \a thePath is not closed edge/wire,
# the following groups are returned:
# - If \a theBase is unclosed edge or wire: "Down", "Up", "Side1",
# "Side2";
possible to generate groups along with the result by means of
setting the flag IsGenerateGroups.
If thePath is a closed edge or wire and IsGenerateGroups is
- set, an error is occured. If thePath is not closed edge/wire,
+ set, an error is occurred. If thePath is not closed edge/wire,
the following groups are returned:
- If theBase is unclosed edge or wire: "Down", "Up", "Side1",
"Side2";
## Create a shape by extrusion of the profile shape along
# the path shape. This function is used only for debug pipe
# functionality - it is a version of function MakePipeWithShellSections()
- # which give a possibility to recieve information about
+ # which give a possibility to receive information about
# creating pipe between each pair of sections step by step.
@ManageTransactions("PrimOp")
def MakePipeWithShellSectionsBySteps(self, theSeqBases, theSeqSubBases,
the path shape. This function is used only for debug pipe
functionality - it is a version of previous function
geompy.MakePipeWithShellSections() which give a possibility to
- recieve information about creating pipe between each pair of
+ receive information about creating pipe between each pair of
sections step by step.
"""
res = []
# publication is switched on, default value is used for result name.
#
# @return [\a status, \a theClosedWires, \a theOpenWires]
- # \n \a status: FALSE, if an error(s) occured during the method execution.
+ # \n \a status: FALSE, if an error(s) occurred during the method execution.
# \n \a theClosedWires: Closed wires on the free boundary of the given shape.
# \n \a theOpenWires: Open wires on the free boundary of the given shape.
#
Returns:
[status, theClosedWires, theOpenWires]
- status: FALSE, if an error(s) occured during the method execution.
+ status: FALSE, if an error(s) occurred during the method execution.
theClosedWires: Closed wires on the free boundary of the given shape.
theOpenWires: Open wires on the free boundary of the given shape.
"""
# @param ListRemoveInside Shapes, inside which the results will be deleted.
# Each shape from theRemoveInside must belong to theShapes also.
# @param RemoveWebs If TRUE, perform Glue 3D algorithm.
- # @param ListMaterials Material indices for each shape. Make sence,
+ # @param ListMaterials Material indices for each shape. Make sense,
# only if theRemoveWebs is TRUE.
#
# @return New GEOM.GEOM_Object, containing the result shapes.
ListRemoveInside Shapes, inside which the results will be deleted.
Each shape from theRemoveInside must belong to theShapes also.
RemoveWebs If TRUE, perform Glue 3D algorithm.
- ListMaterials Material indices for each shape. Make sence, only if theRemoveWebs is TRUE.
+ ListMaterials Material indices for each shape. Make sense, only if theRemoveWebs is TRUE.
Returns:
New GEOM.GEOM_Object, containing the result shapes.
self._autoPublish(anObj, theName, "chamfer")
return anObj
- ## The Same that MakeChamferFaces() but with params theD is chamfer lenght and
+ ## The Same that MakeChamferFaces() but with params theD is chamfer length and
# theAngle is Angle of chamfer (angle in radians or a name of variable which defines angle in degrees)
#
# @ref swig_FilletChamfer "Example"
@ManageTransactions("LocalOp")
def MakeChamferFacesAD(self, theShape, theD, theAngle, theFaces, theName=None):
"""
- The Same that geompy.MakeChamferFaces but with params theD is chamfer lenght and
+ The Same that geompy.MakeChamferFaces but with params theD is chamfer length and
theAngle is Angle of chamfer (angle in radians or a name of variable which defines angle in degrees)
"""
flag = False
self._autoPublish(anObj, theName, "chamfer")
return anObj
- ## The Same that MakeChamferEdges() but with params theD is chamfer lenght and
+ ## The Same that MakeChamferEdges() but with params theD is chamfer length and
# theAngle is Angle of chamfer (angle in radians or a name of variable which defines angle in degrees)
@ManageTransactions("LocalOp")
def MakeChamferEdgesAD(self, theShape, theD, theAngle, theEdges, theName=None):
"""
- The Same that geompy.MakeChamferEdges but with params theD is chamfer lenght and
+ The Same that geompy.MakeChamferEdges but with params theD is chamfer length and
theAngle is Angle of chamfer (angle in radians or a name of variable which defines angle in degrees)
"""
flag = False
## Build all possible propagation groups.
# 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.
# @param theName Object name; when specified, this parameter is used
# for result publication in the study. Otherwise, if automatic
Build all possible propagation groups.
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.
Parameters:
theShape Shape to build propagation groups on.
return aType
## Convert a type of geom object from id to string value
- # @param theId is a GEOM obect type id.
+ # @param theId is a GEOM object type id.
# @return type of geom object (POINT, VECTOR, PLANE, LINE, TORUS, ... )
# @ref swig_GetType "Example"
def ShapeIdToType(self, theId):
Convert a type of geom object from id to string value
Parameters:
- theId is a GEOM obect type id.
+ theId is a GEOM object type id.
Returns:
type of geom object (POINT, VECTOR, PLANE, LINE, TORUS, ... )
# # update object browser
# salome.sg.updateObjBrowser(True)
# @endcode
-# @n Additionnal examples can be found as unit tests in the source code.
+# @n Additional examples can be found as unit tests in the source code.
# @}
"""
/*!
\brief Set number of iso-lines to the presentation
\param theEntry geometry object's entry
- \param theNbU number of iso-lines along U axis (interger value >= 0)
- \param theNbV number of iso-lines along V axis (interger value >= 0)
+ \param theNbU number of iso-lines along U axis (integer value >= 0)
+ \param theNbV number of iso-lines along V axis (integer value >= 0)
\param theUpdateViewer \c true to update active view's contents
*/
void GEOM_Swig::setIsos( const char* theEntry, int theNbU, int theNbV, bool theUpdateViewer )
// local selection
if (!myMainObj->_is_nil() &&
!myEditCurrentArgument &&
- myIsShapeType) // check if shape type is already choosen by user
+ myIsShapeType) // check if shape type is already chosen by user
{
GEOM_Displayer* aDisplayer = getDisplayer();
/*!
* \class MeasureGUI_AnnotationInteractor
* \brief Class implementing logical layer for interactive dragging of annotation
- * labels. It includes two components: listener for GUI events occuring
+ * labels. It includes two components: listener for GUI events occurring
* inside of OCCT 3D viewer and processor for hooked events to perform
* interactive modification of the selected annotation within current
* AIS context.
Handle(AIS_DiameterDimension) aDimension = new AIS_DiameterDimension( aRuledCirc, aPln );
// if flyout is extended in tangent direction to circle, the default flyout value is used
- // if flyout is extended in plane of circle, the zero flyout value is choosen initially
+ // if flyout is extended in plane of circle, the zero flyout value is chosen initially
Standard_Real aFlyout = aCircN.IsParallel( aPln.Axis().Direction(), Precision::Angular() ) ? 0.0 : Settings.DefaultFlyout;
aDimension->SetFlyout(aFlyout);
// flyout plane to best match the current view projection (if any)
// The points are aligned to XOY, YOZ, ZOX planes.
// The flyout takes into account bounding box of main shape of face normal
-// vector. The flyouts tangetial to the circle plane are directed in
+// vector. The flyouts tangential to the circle plane are directed in
// accordance with the face normal (if not-null), otherwise the flyouts
// are turned to direct to the closest border of bounding box.
//=================================================================================
//=================================================================================
void MeasureGUI_ManageDimensionsDlg::OnShowAll()
{
- // read propety data
+ // read property data
SalomeApp_Application* anApp = myGeomGUI->getApp();
if ( !anApp )
{
//=================================================================================
void MeasureGUI_ManageDimensionsDlg::OnHideAll()
{
- // read propety data
+ // read property data
SalomeApp_Application* anApp = myGeomGUI->getApp();
if ( !anApp )
{
void MeasureGUI_Skeleton::LineEditReturnPressed()
{
/* 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. */
if ( mySelEdit ) {
//! screen, while its position is a 3D point defined in world's coordinate system.
Standard_EXPORT void SetIsScreenFixed( const Standard_Boolean theIsFixed );
- //! Retuns value of "screen fixed" positioning mode.
+ //! Returns value of "screen fixed" positioning mode.
Standard_Boolean GetIsScreenFixed() const { return myIsScreenFixed; }
//! Converts annotation position to screen fixed coordinates and
#include "RepairGUI_ShapeProcessDlg.h" // Method PROCESS SHAPE
#include "RepairGUI_CloseContourDlg.h" // Method CLOSE CONTOUR
#include "RepairGUI_RemoveIntWiresDlg.h"// Method REMOVE INTERNAL WIRES
-#include "RepairGUI_DivideEdgeDlg.h" // Method DEVIDE EDGE
+#include "RepairGUI_DivideEdgeDlg.h" // Method DIVIDE EDGE
#include "RepairGUI_FreeBoundDlg.h" // Method FREE BOUNDARIES
#include "RepairGUI_FreeFacesDlg.h" // Method FREE FACES
#include "RepairGUI_GlueDlg.h" // Method GLUE FACES
//================================================================
// 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 RepairGUI_GlueDlg::onAcceptLocal()
//================================================================
// 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 RepairGUI_LimitToleranceDlg::onAcceptLocal()
}
if ( !anErrorObjNames.empty() )
- MESSAGE( "ERRORS occured while processing the following objects: " << anErrorObjNames.join( " " ).toLatin1().data() );
+ MESSAGE( "ERRORS occurred while processing the following objects: " << anErrorObjNames.join( " " ).toLatin1().data() );
return anErrorObjNames.size() < myObjects->length(); // true if at least one object was OK, false if ALL objects were nil after Healing.
}
}
catch (Standard_Failure)
{
- //THROW_SALOME_CORBA_EXCEPTION("Exception catched in STEPExport", SALOME::BAD_PARAM);
+ //THROW_SALOME_CORBA_EXCEPTION("Exception caught in STEPExport", SALOME::BAD_PARAM);
}
return 0;
}
}
catch( Standard_Failure )
{
- //THROW_SALOME_CORBA_EXCEPTION("Exception catched in ExportSTL", SALOME::BAD_PARAM);
+ //THROW_SALOME_CORBA_EXCEPTION("Exception caught in ExportSTL", SALOME::BAD_PARAM);
}
return 0;
}
/// Copy constructor
Standard_EXPORT ShHealOper_ChangeOrientation (const TopoDS_Shape& theShape);
- //Method for initalization by whole shape.
+ //Method for initialization by whole shape.
Standard_EXPORT virtual void Init(const TopoDS_Shape& theShape);
- //Method for initalization by whole shape.
+ //Method for initialization by whole shape.
Standard_EXPORT Standard_Boolean Perform();
//Change orientation
//checks that all specified edges belong the one face or not.
Standard_Boolean isOneFace = checkOneFace(theSewd,aCommonFaces);
- //add edge or increase max tolerance in dependance on specified VertexMode.
+ //add edge or increase max tolerance in dependence on specified VertexMode.
//if all edges belong the one face that gap will be closed in the 2D by line
//else gap will be closed in the 3D by line.
myDone = fixGaps(theSewd,aCommonFaces);
//Initalizes by whole shape.
Standard_EXPORT virtual void Init(const TopoDS_Shape& theShape);
- //Method for initalization by whole shape.
+ //Method for initialization by whole shape.
Standard_EXPORT Standard_Boolean Perform(const TopTools_SequenceOfShape& theSeqEdges,
const Standard_Boolean theModeVertex = Standard_False,
has2d = Standard_False,
hasPCurves = Standard_False;
- //computation of the split values in dependance from specified mode and values.
+ //computation of the split values in dependence from specified mode and values.
if(!computeValues(theValues, has3d,has2d,hasPCurves)) {
myErrorStatus = ShHealOper_InvalidParameters;
return Standard_False;
return Standard_False;
}
- //split 3d curve and pcurve for each face reffering to edge.
+ //split 3d curve and pcurve for each face referring to edge.
Standard_Boolean isDone = Standard_True;
if(hasPCurves) {
const TopTools_ListOfShape& lfaces = myMapEdgesFace.FindFromKey(myEdge);
/// Constructor initializes by shape.
Standard_EXPORT virtual void Init(const TopoDS_Shape& theShape);
- //Method for initalization by whole shape.
+ //Method for initialization by whole shape.
Standard_EXPORT Standard_Boolean Perform(const TopoDS_Shape& theEdge,
const Standard_Real theValue,
aB.Range (anEdge, aFace, aF, aL);
// Set orientation of the edge: orientation should be changed
- // if its orientation does not make sence with curve orientation
+ // if its orientation does not make sense with curve orientation
// recommended by GeomPlate
if ((anEdge.Orientation() == TopAbs_FORWARD) ==
(theSenses->Value (theOrders->Value (aInd)) == 1)) {
Standard_EXPORT ShHealOper_FillHoles (const TopoDS_Shape& theShape);
Standard_EXPORT virtual void Init(const TopoDS_Shape& theShape);
- //Method for initalization by whole shape.
+ //Method for initialization by whole shape.
Standard_EXPORT void InitParameters(Standard_Integer theDegree = 3,//3(2)
Standard_Integer theNbPtsOnCur =5,//3,
Standard_EXPORT ShHealOper_RemoveFace (const TopoDS_Shape& theShape);
// Constructor initialized by shape from which faces will be removed.
Standard_EXPORT virtual void Init(const TopoDS_Shape& theShape);
- //Method for initalization by whole shape.
+ //Method for initialization by whole shape.
Standard_EXPORT Standard_Boolean Perform();
//Removes all faces from specified shape.
/// Copy constructor
Standard_EXPORT ShHealOper_RemoveInternalWires (const TopoDS_Shape& theShape);
- //Method for initalization by whole shape.
+ //Method for initialization by whole shape.
Standard_EXPORT virtual void Init(const TopoDS_Shape& theShape);
- //Method for initalization by whole shape.
+ //Method for initialization by whole shape.
Standard_EXPORT Standard_Boolean Remove();
//Removes all internal wires from all faces of the shape
Standard_EXPORT ShHealOper_Sewing (const TopoDS_Shape& theShape,
const Standard_Real theTolerance);
- //Constructor for initalization by shape and tolerance.
+ //Constructor for initialization by shape and tolerance.
Standard_EXPORT virtual void Init(const TopoDS_Shape& theShape);
- //Method for initalization by whole shape.
+ //Method for initialization by whole shape.
Standard_EXPORT Standard_Boolean Perform();
//Performs sewing specified whole shape.
// Constructor initialized by shape from which faces will be removed.
Standard_EXPORT virtual void Init(const TopoDS_Shape& theShape);
- //Method for initalization by whole shape.
+ //Method for initialization by whole shape.
inline const TopoDS_Shape& GetResultShape() const
{
detected_edges = cv::Mat(binary_backproject);
}
- // else if ( detection_method == RIDGE_DETECTOR ) // Method adapted for engineering drawings (e.g. watershed functionnality could be used here cf.OpenCV documentation and samples)
+ // else if ( detection_method == RIDGE_DETECTOR ) // Method adapted for engineering drawings (e.g. watershed functionality could be used here cf.OpenCV documentation and samples)
// {
// // TODO
// return false;
aWriter->SetFileName( aFileName.ToCString() );
aWriter->Write();
aWriter->Delete();
- pd->Delete(); //instanciated by the GEOM::GetData(...) method
+ pd->Delete(); //instantiated by the GEOM::GetData(...) method
return 1;
}
catch( Standard_Failure )
{
- //THROW_SALOME_CORBA_EXCEPTION("Exception catched in ExportVTK", SALOME::BAD_PARAM);
+ //THROW_SALOME_CORBA_EXCEPTION("Exception caught in ExportVTK", SALOME::BAD_PARAM);
}
return 0;
}
void BrepGeometry::initIds()
{
- // intialization of Ids
+ // initialization of Ids
initListIds(TopAbs_VERTEX, m_vertices);
initListIds(TopAbs_EDGE, m_edges);
initListIds(TopAbs_FACE, m_faces);
protected:
/**
* Constructor.
- * @param dimension the dimension ot the field.
+ * @param dimension the dimension of the field.
* @param nbElements the number of elements.
* @param nbComponents the number of components.
* @param name the name of the field.
