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

typo-fix by Kunda

Browse Source 
http://www.salome-platform.org/forum/forum_9/975195177
This commit is contained in:
eap 2018-02-27 14:28:54 +03:00
parent 8374f01623
commit 4fb9babd3f
13 changed files with 103 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
idl/GEOM_Gen.idl
View File

@ -2474,18 +2474,18 @@ module GEOM
* \param theShape Shape to find sub-shapes of. * \param theShape Shape to find sub-shapes of.
* \param theShapeType Type of sub-shapes to be retrieved. * \param theShapeType Type of sub-shapes to be retrieved.
* \param theTopLeftPoint Top left quadrangle corner * \param theTopLeftPoint Top left quadrangle corner
* \param theTopRigthPoint Top right quadrangle corner * \param theTopRightPoint Top right quadrangle corner
* \param theBottomLeftPoint Bottom left quadrangle corner * \param theBottomLeftPoint Bottom left quadrangle corner
* \param theBottomRigthPoint Bottom right quadrangle corner * \param theBottomRightPoint Bottom right quadrangle corner
* \param theState The state of the sub-shapes to find. * \param theState The state of the sub-shapes to find.
* \return List of all found sub-shapes. * \return List of all found sub-shapes.
*/ */
ListOfGO GetShapesOnQuadrangle (in GEOM_Object theShape, ListOfGO GetShapesOnQuadrangle (in GEOM_Object theShape,
in long theShapeType, in long theShapeType,
in GEOM_Object theTopLeftPoint, in GEOM_Object theTopLeftPoint,
in GEOM_Object theTopRigthPoint, in GEOM_Object theTopRightPoint,
in GEOM_Object theBottomLeftPoint, in GEOM_Object theBottomLeftPoint,
in GEOM_Object theBottomRigthPoint, in GEOM_Object theBottomRightPoint,
in shape_state theState); in shape_state theState);
/*! /*!
@ -2578,18 +2578,18 @@ module GEOM
* \param theShape Shape to find sub-shapes of. * \param theShape Shape to find sub-shapes of.
* \param theShapeType Type of sub-shapes to be retrieved. * \param theShapeType Type of sub-shapes to be retrieved.
* \param theTopLeftPoint Top left quadrangle corner * \param theTopLeftPoint Top left quadrangle corner
* \param theTopRigthPoint Top right quadrangle corner * \param theTopRightPoint Top right quadrangle corner
* \param theBottomLeftPoint Bottom left quadrangle corner * \param theBottomLeftPoint Bottom left quadrangle corner
* \param theBottomRigthPoint Bottom right quadrangle corner * \param theBottomRightPoint Bottom right quadrangle corner
* \param theState The state of the sub-shapes to find. * \param theState The state of the sub-shapes to find.
* \return List of IDs of all found sub-shapes. * \return List of IDs of all found sub-shapes.
*/ */
ListOfLong GetShapesOnQuadrangleIDs (in GEOM_Object theShape, ListOfLong GetShapesOnQuadrangleIDs (in GEOM_Object theShape,
in long theShapeType, in long theShapeType,
in GEOM_Object theTopLeftPoint, in GEOM_Object theTopLeftPoint,
in GEOM_Object theTopRigthPoint, in GEOM_Object theTopRightPoint,
in GEOM_Object theBottomLeftPoint, in GEOM_Object theBottomLeftPoint,
in GEOM_Object theBottomRigthPoint, in GEOM_Object theBottomRightPoint,
in shape_state theState); in shape_state theState);
/*! /*!

2
src/BlockFix/BlockFix_PeriodicSurfaceModifier.cxx
View File

@ -196,7 +196,7 @@ Standard_Boolean BlockFix_PeriodicSurfaceModifier::NewCurve2d(const TopoDS_Edge&
Handle(Geom_Curve) C3d = BRep_Tool::Curve ( E, LC, f, l ); Handle(Geom_Curve) C3d = BRep_Tool::Curve ( E, LC, f, l );
Handle(Geom_Surface) S = BRep_Tool::Surface(F, LS); Handle(Geom_Surface) S = BRep_Tool::Surface(F, LS);
//taking into accound the orientation of the seam //taking into account the orientation of the seam
C = BRep_Tool::CurveOnSurface(E,F,f,l); C = BRep_Tool::CurveOnSurface(E,F,f,l);
Tol = BRep_Tool::Tolerance(E); Tol = BRep_Tool::Tolerance(E);

2
src/BlockFix/BlockFix_SphereSpaceModifier.cxx
View File

@ -213,7 +213,7 @@ Standard_Boolean BlockFix_SphereSpaceModifier::NewCurve2d(const TopoDS_Edge& E,c
Handle(Geom_Curve) C3d = BRep_Tool::Curve ( E, LC, f, l ); Handle(Geom_Curve) C3d = BRep_Tool::Curve ( E, LC, f, l );
Handle(Geom_Surface) S = BRep_Tool::Surface(F, LS); Handle(Geom_Surface) S = BRep_Tool::Surface(F, LS);
//taking into accound the orientation of the seam //taking into account the orientation of the seam
C = BRep_Tool::CurveOnSurface(E,F,f,l); C = BRep_Tool::CurveOnSurface(E,F,f,l);
Tol = BRep_Tool::Tolerance(E); Tol = BRep_Tool::Tolerance(E);

6
src/EntityGUI/EntityGUI_3DSketcherDlg.cxx
View File

@ -1481,9 +1481,9 @@ void EntityGUI_3DSketcherDlg::displayDimensions (bool store)
0.0); 0.0);
// Express the coordinates in the reference coordinate system (OXY) // Express the coordinates in the reference coordinate system (OXY)
gp_Trsf aTranform = toReferenceSystem(P0); gp_Trsf aTransform = toReferenceSystem(P0);
P1.Transform(aTranform); P1.Transform(aTransform);
P2.Transform(aTranform); P2.Transform(aTransform);
P1.Translate(Origin, P0); P1.Translate(Origin, P0);
P2.Translate(Origin, P0); P2.Translate(Origin, P0);

16
src/GEOMAlgo/GEOMAlgo_ClsfQuad.cxx
View File

@ -54,14 +54,14 @@ GEOMAlgo_ClsfQuad::~GEOMAlgo_ClsfQuad()
//purpose : //purpose :
//======================================================================= //=======================================================================
void GEOMAlgo_ClsfQuad::SetCorners(const gp_Pnt &theTopLeftPoint, void GEOMAlgo_ClsfQuad::SetCorners(const gp_Pnt &theTopLeftPoint,
const gp_Pnt &theTopRigthPoint, const gp_Pnt &theTopRightPoint,
const gp_Pnt &theBottomLeftPoint, const gp_Pnt &theBottomLeftPoint,
const gp_Pnt &theBottomRigthPoint) const gp_Pnt &theBottomRightPoint)
{ {
myPoints.resize(6); myPoints.resize(6);
myPoints[0] = theTopLeftPoint; myPoints[0] = theTopLeftPoint;
myPoints[1] = theTopRigthPoint; myPoints[1] = theTopRightPoint;
myPoints[2] = theBottomRigthPoint; myPoints[2] = theBottomRightPoint;
myPoints[3] = theBottomLeftPoint; myPoints[3] = theBottomLeftPoint;
myPoints[4] = myPoints[0]; myPoints[4] = myPoints[0];
myPoints[5] = myPoints[1]; myPoints[5] = myPoints[1];
@ -118,15 +118,15 @@ void GEOMAlgo_ClsfQuad::SetCorners(const gp_Pnt &theTopLeftPoint,
//purpose : //purpose :
//======================================================================= //=======================================================================
void GEOMAlgo_ClsfQuad::GetCorners(gp_Pnt &theTopLeftPoint, void GEOMAlgo_ClsfQuad::GetCorners(gp_Pnt &theTopLeftPoint,
gp_Pnt &theTopRigthPoint, gp_Pnt &theTopRightPoint,
gp_Pnt &theBottomLeftPoint, gp_Pnt &theBottomLeftPoint,
gp_Pnt &theBottomRigthPoint) const gp_Pnt &theBottomRightPoint) const
{ {
if (myPoints.size() == 6) { if (myPoints.size() == 6) {
theTopLeftPoint = myPoints[0]; theTopLeftPoint = myPoints[0];
theTopRigthPoint = myPoints[1]; theTopRightPoint = myPoints[1];
theBottomLeftPoint = myPoints[3]; theBottomLeftPoint = myPoints[3];
theBottomRigthPoint = myPoints[2]; theBottomRightPoint = myPoints[2];
} }
} }

8
src/GEOMAlgo/GEOMAlgo_ClsfQuad.hxx
View File

@ -56,15 +56,15 @@ public:
Standard_EXPORT Standard_EXPORT
void SetCorners(const gp_Pnt &theTopLeftPoint, void SetCorners(const gp_Pnt &theTopLeftPoint,
const gp_Pnt &theTopRigthPoint, const gp_Pnt &theTopRightPoint,
const gp_Pnt &theBottomLeftPoint, const gp_Pnt &theBottomLeftPoint,
const gp_Pnt &theBottomRigthPoint); const gp_Pnt &theBottomRightPoint);
Standard_EXPORT Standard_EXPORT
void GetCorners(gp_Pnt &theTopLeftPoint, void GetCorners(gp_Pnt &theTopLeftPoint,
gp_Pnt &theTopRigthPoint, gp_Pnt &theTopRightPoint,
gp_Pnt &theBottomLeftPoint, gp_Pnt &theBottomLeftPoint,
gp_Pnt &theBottomRigthPoint) const; gp_Pnt &theBottomRightPoint) const;
Standard_EXPORT Standard_EXPORT
virtual void Perform(); virtual void Perform();

8
src/GEOMAlgo/GEOMAlgo_FinderShapeOnQuad.cxx
View File

@ -33,14 +33,14 @@
GEOMAlgo_FinderShapeOnQuad::GEOMAlgo_FinderShapeOnQuad(const gp_Pnt & theTopLeftPoint, GEOMAlgo_FinderShapeOnQuad::GEOMAlgo_FinderShapeOnQuad(const gp_Pnt & theTopLeftPoint,
const gp_Pnt & theTopRigthPoint, const gp_Pnt & theTopRightPoint,
const gp_Pnt & theBottomLeftPoint, const gp_Pnt & theBottomLeftPoint,
const gp_Pnt & theBottomRigthPoint) const gp_Pnt & theBottomRightPoint)
{ {
myPoints.resize(6); myPoints.resize(6);
myPoints[0] = theTopLeftPoint ; myPoints[0] = theTopLeftPoint ;
myPoints[1] = theTopRigthPoint ; myPoints[1] = theTopRightPoint ;
myPoints[2] = theBottomRigthPoint; myPoints[2] = theBottomRightPoint;
myPoints[3] = theBottomLeftPoint ; myPoints[3] = theBottomLeftPoint ;
myPoints[4] = myPoints[0]; myPoints[4] = myPoints[0];
myPoints[5] = myPoints[1]; myPoints[5] = myPoints[1];

4
src/GEOMAlgo/GEOMAlgo_FinderShapeOnQuad.hxx
View File

@ -40,9 +40,9 @@ public:
Standard_EXPORT Standard_EXPORT
GEOMAlgo_FinderShapeOnQuad(const gp_Pnt & theTopLeftPoint, GEOMAlgo_FinderShapeOnQuad(const gp_Pnt & theTopLeftPoint,
const gp_Pnt & theTopRigthPoint, const gp_Pnt & theTopRightPoint,
const gp_Pnt & theBottomLeftPoint, const gp_Pnt & theBottomLeftPoint,
const gp_Pnt & theBottomRigthPoint); const gp_Pnt & theBottomRightPoint);
protected: protected:

52
src/GEOMImpl/GEOMImpl_IShapesOperations.cxx
View File

@ -4179,9 +4179,9 @@ Handle(TColStd_HSequenceOfInteger) GEOMImpl_IShapesOperations::GetShapesOnSphere
* \param theShape - the shape to explore * \param theShape - the shape to explore
* \param theShapeType - type of sub-shape of theShape * \param theShapeType - type of sub-shape of theShape
* \param theTopLeftPoint - top left quadrangle corner * \param theTopLeftPoint - top left quadrangle corner
* \param theTopRigthPoint - top right quadrangle corner * \param theTopRightPoint - top right quadrangle corner
* \param theBottomLeftPoint - bottom left quadrangle corner * \param theBottomLeftPoint - bottom left quadrangle corner
* \param theBottomRigthPoint - bottom right quadrangle corner * \param theBottomRightPoint - bottom right quadrangle corner
* \param theState - required state * \param theState - required state
* \retval Handle(TColStd_HSequenceOfInteger) - IDs of found sub-shapes * \retval Handle(TColStd_HSequenceOfInteger) - IDs of found sub-shapes
*/ */
@ -4190,25 +4190,25 @@ Handle(TColStd_HSequenceOfInteger)
GEOMImpl_IShapesOperations::getShapesOnQuadrangleIDs (const Handle(GEOM_Object)& theShape, GEOMImpl_IShapesOperations::getShapesOnQuadrangleIDs (const Handle(GEOM_Object)& theShape,
const Standard_Integer theShapeType, const Standard_Integer theShapeType,
const Handle(GEOM_Object)& theTopLeftPoint, const Handle(GEOM_Object)& theTopLeftPoint,
const Handle(GEOM_Object)& theTopRigthPoint, const Handle(GEOM_Object)& theTopRightPoint,
const Handle(GEOM_Object)& theBottomLeftPoint, const Handle(GEOM_Object)& theBottomLeftPoint,
const Handle(GEOM_Object)& theBottomRigthPoint, const Handle(GEOM_Object)& theBottomRightPoint,
const GEOMAlgo_State theState) const GEOMAlgo_State theState)
{ {
SetErrorCode(KO); SetErrorCode(KO);
if ( theShape.IsNull() || if ( theShape.IsNull() ||
theTopLeftPoint.IsNull() || theTopLeftPoint.IsNull() ||
theTopRigthPoint.IsNull() || theTopRightPoint.IsNull() ||
theBottomLeftPoint.IsNull() || theBottomLeftPoint.IsNull() ||
theBottomRigthPoint.IsNull() ) theBottomRightPoint.IsNull() )
return NULL; return NULL;
TopoDS_Shape aShape = theShape->GetValue(); TopoDS_Shape aShape = theShape->GetValue();
TopoDS_Shape aTL = theTopLeftPoint->GetValue(); TopoDS_Shape aTL = theTopLeftPoint->GetValue();
TopoDS_Shape aTR = theTopRigthPoint->GetValue(); TopoDS_Shape aTR = theTopRightPoint->GetValue();
TopoDS_Shape aBL = theBottomLeftPoint->GetValue(); TopoDS_Shape aBL = theBottomLeftPoint->GetValue();
TopoDS_Shape aBR = theBottomRigthPoint->GetValue(); TopoDS_Shape aBR = theBottomRightPoint->GetValue();
if (aShape.IsNull() || if (aShape.IsNull() ||
aTL.IsNull() || aTL.IsNull() ||
@ -4308,9 +4308,9 @@ Handle(TColStd_HSequenceOfInteger)
* \param theShape - the shape to explore * \param theShape - the shape to explore
* \param theShapeType - type of sub-shape of theShape * \param theShapeType - type of sub-shape of theShape
* \param theTopLeftPoint - top left quadrangle corner * \param theTopLeftPoint - top left quadrangle corner
* \param theTopRigthPoint - top right quadrangle corner * \param theTopRightPoint - top right quadrangle corner
* \param theBottomLeftPoint - bottom left quadrangle corner * \param theBottomLeftPoint - bottom left quadrangle corner
* \param theBottomRigthPoint - bottom right quadrangle corner * \param theBottomRightPoint - bottom right quadrangle corner
* \param theState - required state * \param theState - required state
* \retval Handle(TColStd_HSequenceOfInteger) - IDs of found sub-shapes * \retval Handle(TColStd_HSequenceOfInteger) - IDs of found sub-shapes
*/ */
@ -4319,9 +4319,9 @@ Handle(TColStd_HSequenceOfTransient)
GEOMImpl_IShapesOperations::GetShapesOnQuadrangle (const Handle(GEOM_Object)& theShape, GEOMImpl_IShapesOperations::GetShapesOnQuadrangle (const Handle(GEOM_Object)& theShape,
const Standard_Integer theShapeType, const Standard_Integer theShapeType,
const Handle(GEOM_Object)& theTopLeftPoint, const Handle(GEOM_Object)& theTopLeftPoint,
const Handle(GEOM_Object)& theTopRigthPoint, const Handle(GEOM_Object)& theTopRightPoint,
const Handle(GEOM_Object)& theBottomLeftPoint, const Handle(GEOM_Object)& theBottomLeftPoint,
const Handle(GEOM_Object)& theBottomRigthPoint, const Handle(GEOM_Object)& theBottomRightPoint,
const GEOMAlgo_State theState) const GEOMAlgo_State theState)
{ {
// Find indices // Find indices
@ -4329,9 +4329,9 @@ Handle(TColStd_HSequenceOfTransient)
getShapesOnQuadrangleIDs( theShape, getShapesOnQuadrangleIDs( theShape,
theShapeType, theShapeType,
theTopLeftPoint, theTopLeftPoint,
theTopRigthPoint, theTopRightPoint,
theBottomLeftPoint, theBottomLeftPoint,
theBottomRigthPoint, theBottomRightPoint,
theState); theState);
if ( aSeqOfIDs.IsNull() || aSeqOfIDs->IsEmpty() ) if ( aSeqOfIDs.IsNull() || aSeqOfIDs->IsEmpty() )
return NULL; return NULL;
@ -4353,9 +4353,9 @@ Handle(TColStd_HSequenceOfTransient)
<< theShape << ", " << theShape << ", "
<< TopAbs_ShapeEnum(theShapeType) << ", " << TopAbs_ShapeEnum(theShapeType) << ", "
<< theTopLeftPoint << ", " << theTopLeftPoint << ", "
<< theTopRigthPoint << ", " << theTopRightPoint << ", "
<< theBottomLeftPoint << ", " << theBottomLeftPoint << ", "
<< theBottomRigthPoint << ", " << theBottomRightPoint << ", "
<< theState << ")"; << theState << ")";
SetErrorCode(OK); SetErrorCode(OK);
@ -4369,9 +4369,9 @@ Handle(TColStd_HSequenceOfTransient)
* \param theShape - the shape to explore * \param theShape - the shape to explore
* \param theShapeType - type of sub-shape of theShape * \param theShapeType - type of sub-shape of theShape
* \param theTopLeftPoint - top left quadrangle corner * \param theTopLeftPoint - top left quadrangle corner
* \param theTopRigthPoint - top right quadrangle corner * \param theTopRightPoint - top right quadrangle corner
* \param theBottomLeftPoint - bottom left quadrangle corner * \param theBottomLeftPoint - bottom left quadrangle corner
* \param theBottomRigthPoint - bottom right quadrangle corner * \param theBottomRightPoint - bottom right quadrangle corner
* \param theState - required state * \param theState - required state
* \retval Handle(TColStd_HSequenceOfInteger) - IDs of found sub-shapes * \retval Handle(TColStd_HSequenceOfInteger) - IDs of found sub-shapes
*/ */
@ -4380,9 +4380,9 @@ Handle(TColStd_HSequenceOfInteger)
GEOMImpl_IShapesOperations::GetShapesOnQuadrangleIDs (const Handle(GEOM_Object)& theShape, GEOMImpl_IShapesOperations::GetShapesOnQuadrangleIDs (const Handle(GEOM_Object)& theShape,
const Standard_Integer theShapeType, const Standard_Integer theShapeType,
const Handle(GEOM_Object)& theTopLeftPoint, const Handle(GEOM_Object)& theTopLeftPoint,
const Handle(GEOM_Object)& theTopRigthPoint, const Handle(GEOM_Object)& theTopRightPoint,
const Handle(GEOM_Object)& theBottomLeftPoint, const Handle(GEOM_Object)& theBottomLeftPoint,
const Handle(GEOM_Object)& theBottomRigthPoint, const Handle(GEOM_Object)& theBottomRightPoint,
const GEOMAlgo_State theState) const GEOMAlgo_State theState)
{ {
// Find indices // Find indices
@ -4390,9 +4390,9 @@ Handle(TColStd_HSequenceOfInteger)
getShapesOnQuadrangleIDs( theShape, getShapesOnQuadrangleIDs( theShape,
theShapeType, theShapeType,
theTopLeftPoint, theTopLeftPoint,
theTopRigthPoint, theTopRightPoint,
theBottomLeftPoint, theBottomLeftPoint,
theBottomRigthPoint, theBottomRightPoint,
theState); theState);
if ( aSeqOfIDs.IsNull() || aSeqOfIDs->IsEmpty() ) if ( aSeqOfIDs.IsNull() || aSeqOfIDs->IsEmpty() )
return NULL; return NULL;
@ -4401,8 +4401,8 @@ Handle(TColStd_HSequenceOfInteger)
// The GetShapesOnCylinder() doesn't change object so no new function is required. // The GetShapesOnCylinder() doesn't change object so no new function is required.
Handle(GEOM_BaseObject) lastObj = GEOM::GetCreatedLast(theShape,theTopLeftPoint); Handle(GEOM_BaseObject) lastObj = GEOM::GetCreatedLast(theShape,theTopLeftPoint);
lastObj = GEOM::GetCreatedLast(lastObj,theTopRigthPoint); lastObj = GEOM::GetCreatedLast(lastObj,theTopRightPoint);
lastObj = GEOM::GetCreatedLast(lastObj,theBottomRigthPoint); lastObj = GEOM::GetCreatedLast(lastObj,theBottomRightPoint);
lastObj = GEOM::GetCreatedLast(lastObj,theBottomLeftPoint); lastObj = GEOM::GetCreatedLast(lastObj,theBottomLeftPoint);
Handle(GEOM_Function) aFunction = lastObj->GetLastFunction(); Handle(GEOM_Function) aFunction = lastObj->GetLastFunction();
@ -4413,9 +4413,9 @@ Handle(TColStd_HSequenceOfInteger)
<< theShape << ", " << theShape << ", "
<< TopAbs_ShapeEnum(theShapeType) << ", " << TopAbs_ShapeEnum(theShapeType) << ", "
<< theTopLeftPoint << ", " << theTopLeftPoint << ", "
<< theTopRigthPoint << ", " << theTopRightPoint << ", "
<< theBottomLeftPoint << ", " << theBottomLeftPoint << ", "
<< theBottomRigthPoint << ", " << theBottomRightPoint << ", "
<< theState << ")"; << theState << ")";
#endif // DUMP_SUBSHAPE_IDS #endif // DUMP_SUBSHAPE_IDS

24
src/GEOMImpl/GEOMImpl_IShapesOperations.hxx
View File

@ -275,9 +275,9 @@ class GEOMImpl_IShapesOperations : public GEOM_IOperations
* \param theShape - the shape to explore * \param theShape - the shape to explore
* \param theShapeType - type of sub-shape of theShape * \param theShapeType - type of sub-shape of theShape
* \param theTopLeftPoint - top left quadrangle corner * \param theTopLeftPoint - top left quadrangle corner
* \param theTopRigthPoint - top right quadrangle corner * \param theTopRightPoint - top right quadrangle corner
* \param theBottomLeftPoint - bottom left quadrangle corner * \param theBottomLeftPoint - bottom left quadrangle corner
* \param theBottomRigthPoint - bottom right quadrangle corner * \param theBottomRightPoint - bottom right quadrangle corner
* \param theState - required state * \param theState - required state
* \retval Handle(TColStd_HSequenceOfInteger) - IDs of found sub-shapes * \retval Handle(TColStd_HSequenceOfInteger) - IDs of found sub-shapes
*/ */
@ -285,9 +285,9 @@ class GEOMImpl_IShapesOperations : public GEOM_IOperations
GetShapesOnQuadrangle (const Handle(GEOM_Object)& theShape, GetShapesOnQuadrangle (const Handle(GEOM_Object)& theShape,
const Standard_Integer theShapeType, const Standard_Integer theShapeType,
const Handle(GEOM_Object)& theTopLeftPoint, const Handle(GEOM_Object)& theTopLeftPoint,
const Handle(GEOM_Object)& theTopRigthPoint, const Handle(GEOM_Object)& theTopRightPoint,
const Handle(GEOM_Object)& theBottomLeftPoint, const Handle(GEOM_Object)& theBottomLeftPoint,
const Handle(GEOM_Object)& theBottomRigthPoint, const Handle(GEOM_Object)& theBottomRightPoint,
const GEOMAlgo_State theState); const GEOMAlgo_State theState);
/*! /*!
@ -295,9 +295,9 @@ class GEOMImpl_IShapesOperations : public GEOM_IOperations
* \param theShape - the shape to explore * \param theShape - the shape to explore
* \param theShapeType - type of sub-shape of theShape * \param theShapeType - type of sub-shape of theShape
* \param theTopLeftPoint - top left quadrangle corner * \param theTopLeftPoint - top left quadrangle corner
* \param theTopRigthPoint - top right quadrangle corner * \param theTopRightPoint - top right quadrangle corner
* \param theBottomLeftPoint - bottom left quadrangle corner * \param theBottomLeftPoint - bottom left quadrangle corner
* \param theBottomRigthPoint - bottom right quadrangle corner * \param theBottomRightPoint - bottom right quadrangle corner
* \param theState - required state * \param theState - required state
* \retval Handle(TColStd_HSequenceOfInteger) - IDs of found sub-shapes * \retval Handle(TColStd_HSequenceOfInteger) - IDs of found sub-shapes
*/ */
@ -305,9 +305,9 @@ class GEOMImpl_IShapesOperations : public GEOM_IOperations
GetShapesOnQuadrangleIDs (const Handle(GEOM_Object)& theShape, GetShapesOnQuadrangleIDs (const Handle(GEOM_Object)& theShape,
const Standard_Integer theShapeType, const Standard_Integer theShapeType,
const Handle(GEOM_Object)& theTopLeftPoint, const Handle(GEOM_Object)& theTopLeftPoint,
const Handle(GEOM_Object)& theTopRigthPoint, const Handle(GEOM_Object)& theTopRightPoint,
const Handle(GEOM_Object)& theBottomLeftPoint, const Handle(GEOM_Object)& theBottomLeftPoint,
const Handle(GEOM_Object)& theBottomRigthPoint, const Handle(GEOM_Object)& theBottomRightPoint,
const GEOMAlgo_State theState); const GEOMAlgo_State theState);
Standard_EXPORT Handle(GEOM_Object) GetShapesOnCylinderOld (Handle(GEOM_Object) theShape, Standard_EXPORT Handle(GEOM_Object) GetShapesOnCylinderOld (Handle(GEOM_Object) theShape,
@ -572,9 +572,9 @@ class GEOMImpl_IShapesOperations : public GEOM_IOperations
* \param theShape - the shape to explore * \param theShape - the shape to explore
* \param theShapeType - type of sub-shape of theShape * \param theShapeType - type of sub-shape of theShape
* \param theTopLeftPoint - top left quadrangle corner * \param theTopLeftPoint - top left quadrangle corner
* \param theTopRigthPoint - top right quadrangle corner * \param theTopRightPoint - top right quadrangle corner
* \param theBottomLeftPoint - bottom left quadrangle corner * \param theBottomLeftPoint - bottom left quadrangle corner
* \param theBottomRigthPoint - bottom right quadrangle corner * \param theBottomRightPoint - bottom right quadrangle corner
* \param theState - required state * \param theState - required state
* \retval Handle(TColStd_HSequenceOfInteger) - IDs of found sub-shapes * \retval Handle(TColStd_HSequenceOfInteger) - IDs of found sub-shapes
*/ */
@ -582,9 +582,9 @@ class GEOMImpl_IShapesOperations : public GEOM_IOperations
getShapesOnQuadrangleIDs (const Handle(GEOM_Object)& theShape, getShapesOnQuadrangleIDs (const Handle(GEOM_Object)& theShape,
const Standard_Integer theShapeType, const Standard_Integer theShapeType,
const Handle(GEOM_Object)& theTopLeftPoint, const Handle(GEOM_Object)& theTopLeftPoint,
const Handle(GEOM_Object)& theTopRigthPoint, const Handle(GEOM_Object)& theTopRightPoint,
const Handle(GEOM_Object)& theBottomLeftPoint, const Handle(GEOM_Object)& theBottomLeftPoint,
const Handle(GEOM_Object)& theBottomRigthPoint, const Handle(GEOM_Object)& theBottomRightPoint,
const GEOMAlgo_State theState); const GEOMAlgo_State theState);
/*! /*!

28
src/GEOM_I/GEOM_IShapesOperations_i.cc
View File

@ -1432,9 +1432,9 @@ GEOM::ListOfGO* GEOM_IShapesOperations_i::GetShapesOnQuadrangle
(GEOM::GEOM_Object_ptr theShape, (GEOM::GEOM_Object_ptr theShape,
CORBA::Long theShapeType, CORBA::Long theShapeType,
GEOM::GEOM_Object_ptr theTopLeftPoint, GEOM::GEOM_Object_ptr theTopLeftPoint,
GEOM::GEOM_Object_ptr theTopRigthPoint, GEOM::GEOM_Object_ptr theTopRightPoint,
GEOM::GEOM_Object_ptr theBottomLeftPoint, GEOM::GEOM_Object_ptr theBottomLeftPoint,
GEOM::GEOM_Object_ptr theBottomRigthPoint, GEOM::GEOM_Object_ptr theBottomRightPoint,
GEOM::shape_state theState) GEOM::shape_state theState)
{ {
GEOM::ListOfGO_var aSeq = new GEOM::ListOfGO; GEOM::ListOfGO_var aSeq = new GEOM::ListOfGO;
@ -1445,21 +1445,21 @@ GEOM::ListOfGO* GEOM_IShapesOperations_i::GetShapesOnQuadrangle
//Get the reference objects //Get the reference objects
Handle(::GEOM_Object) aShape = GetObjectImpl(theShape); Handle(::GEOM_Object) aShape = GetObjectImpl(theShape);
Handle(::GEOM_Object) aTopLeftPoint = GetObjectImpl(theTopLeftPoint); Handle(::GEOM_Object) aTopLeftPoint = GetObjectImpl(theTopLeftPoint);
Handle(::GEOM_Object) aTopRigthPoint = GetObjectImpl(theTopRigthPoint); Handle(::GEOM_Object) aTopRightPoint = GetObjectImpl(theTopRightPoint);
Handle(::GEOM_Object) aBottomLeftPoint = GetObjectImpl(theBottomLeftPoint); Handle(::GEOM_Object) aBottomLeftPoint = GetObjectImpl(theBottomLeftPoint);
Handle(::GEOM_Object) aBottomRigthPoint = GetObjectImpl(theBottomRigthPoint); Handle(::GEOM_Object) aBottomRightPoint = GetObjectImpl(theBottomRightPoint);
if (aShape.IsNull() || if (aShape.IsNull() ||
aTopLeftPoint.IsNull() || aTopLeftPoint.IsNull() ||
aTopRigthPoint.IsNull() || aTopRightPoint.IsNull() ||
aBottomLeftPoint.IsNull() || aBottomLeftPoint.IsNull() ||
aBottomRigthPoint.IsNull()) aBottomRightPoint.IsNull())
return aSeq._retn(); return aSeq._retn();
//Get Shapes On Quadrangle //Get Shapes On Quadrangle
Handle(TColStd_HSequenceOfTransient) aHSeq = GetOperations()->GetShapesOnQuadrangle Handle(TColStd_HSequenceOfTransient) aHSeq = GetOperations()->GetShapesOnQuadrangle
(aShape, theShapeType, (aShape, theShapeType,
aTopLeftPoint, aTopRigthPoint, aBottomLeftPoint, aBottomRigthPoint, aTopLeftPoint, aTopRightPoint, aBottomLeftPoint, aBottomRightPoint,
ShapeState(theState)); ShapeState(theState));
if (!GetOperations()->IsDone() || aHSeq.IsNull()) if (!GetOperations()->IsDone() || aHSeq.IsNull())
return aSeq._retn(); return aSeq._retn();
@ -1669,9 +1669,9 @@ GEOM::ListOfLong* GEOM_IShapesOperations_i::GetShapesOnQuadrangleIDs
(GEOM::GEOM_Object_ptr theShape, (GEOM::GEOM_Object_ptr theShape,
CORBA::Long theShapeType, CORBA::Long theShapeType,
GEOM::GEOM_Object_ptr theTopLeftPoint, GEOM::GEOM_Object_ptr theTopLeftPoint,
GEOM::GEOM_Object_ptr theTopRigthPoint, GEOM::GEOM_Object_ptr theTopRightPoint,
GEOM::GEOM_Object_ptr theBottomLeftPoint, GEOM::GEOM_Object_ptr theBottomLeftPoint,
GEOM::GEOM_Object_ptr theBottomRigthPoint, GEOM::GEOM_Object_ptr theBottomRightPoint,
GEOM::shape_state theState) GEOM::shape_state theState)
{ {
GEOM::ListOfLong_var aSeq = new GEOM::ListOfLong; GEOM::ListOfLong_var aSeq = new GEOM::ListOfLong;
@ -1682,21 +1682,21 @@ GEOM::ListOfLong* GEOM_IShapesOperations_i::GetShapesOnQuadrangleIDs
//Get the reference objects //Get the reference objects
Handle(::GEOM_Object) aShape = GetObjectImpl(theShape); Handle(::GEOM_Object) aShape = GetObjectImpl(theShape);
Handle(::GEOM_Object) aTopLeftPoint = GetObjectImpl(theTopLeftPoint); Handle(::GEOM_Object) aTopLeftPoint = GetObjectImpl(theTopLeftPoint);
Handle(::GEOM_Object) aTopRigthPoint = GetObjectImpl(theTopRigthPoint); Handle(::GEOM_Object) aTopRightPoint = GetObjectImpl(theTopRightPoint);
Handle(::GEOM_Object) aBottomLeftPoint = GetObjectImpl(theBottomLeftPoint); Handle(::GEOM_Object) aBottomLeftPoint = GetObjectImpl(theBottomLeftPoint);
Handle(::GEOM_Object) aBottomRigthPoint = GetObjectImpl(theBottomRigthPoint); Handle(::GEOM_Object) aBottomRightPoint = GetObjectImpl(theBottomRightPoint);
if (aShape.IsNull() || if (aShape.IsNull() ||
aTopLeftPoint.IsNull() || aTopLeftPoint.IsNull() ||
aTopRigthPoint.IsNull() || aTopRightPoint.IsNull() ||
aBottomLeftPoint.IsNull() || aBottomLeftPoint.IsNull() ||
aBottomRigthPoint.IsNull() ) aBottomRightPoint.IsNull() )
return aSeq._retn(); return aSeq._retn();
//Get Shapes On Quadrangle //Get Shapes On Quadrangle
Handle(TColStd_HSequenceOfInteger) aHSeq = GetOperations()->GetShapesOnQuadrangleIDs Handle(TColStd_HSequenceOfInteger) aHSeq = GetOperations()->GetShapesOnQuadrangleIDs
(aShape, theShapeType, (aShape, theShapeType,
aTopLeftPoint, aTopRigthPoint, aBottomLeftPoint, aBottomRigthPoint, aTopLeftPoint, aTopRightPoint, aBottomLeftPoint, aBottomRightPoint,
ShapeState(theState)); ShapeState(theState));
if (!GetOperations()->IsDone() || aHSeq.IsNull()) if (!GetOperations()->IsDone() || aHSeq.IsNull())
return aSeq._retn(); return aSeq._retn();

8
src/GEOM_I/GEOM_IShapesOperations_i.hh
View File

@ -201,9 +201,9 @@ class GEOM_I_EXPORT GEOM_IShapesOperations_i :
GEOM::ListOfGO* GetShapesOnQuadrangle (GEOM::GEOM_Object_ptr theShape, GEOM::ListOfGO* GetShapesOnQuadrangle (GEOM::GEOM_Object_ptr theShape,
CORBA::Long theShapeType, CORBA::Long theShapeType,
GEOM::GEOM_Object_ptr theTopLeftPoint, GEOM::GEOM_Object_ptr theTopLeftPoint,
GEOM::GEOM_Object_ptr theTopRigthPoint, GEOM::GEOM_Object_ptr theTopRightPoint,
GEOM::GEOM_Object_ptr theBottomLeftPoint, GEOM::GEOM_Object_ptr theBottomLeftPoint,
GEOM::GEOM_Object_ptr theBottomRigthPoint, GEOM::GEOM_Object_ptr theBottomRightPoint,
GEOM::shape_state theState); GEOM::shape_state theState);
GEOM::ListOfLong* GetShapesOnPlaneIDs (GEOM::GEOM_Object_ptr theShape, GEOM::ListOfLong* GetShapesOnPlaneIDs (GEOM::GEOM_Object_ptr theShape,
@ -239,9 +239,9 @@ class GEOM_I_EXPORT GEOM_IShapesOperations_i :
GEOM::ListOfLong* GetShapesOnQuadrangleIDs (GEOM::GEOM_Object_ptr theShape, GEOM::ListOfLong* GetShapesOnQuadrangleIDs (GEOM::GEOM_Object_ptr theShape,
CORBA::Long theShapeType, CORBA::Long theShapeType,
GEOM::GEOM_Object_ptr theTopLeftPoint, GEOM::GEOM_Object_ptr theTopLeftPoint,
GEOM::GEOM_Object_ptr theTopRigthPoint, GEOM::GEOM_Object_ptr theTopRightPoint,
GEOM::GEOM_Object_ptr theBottomLeftPoint, GEOM::GEOM_Object_ptr theBottomLeftPoint,
GEOM::GEOM_Object_ptr theBottomRigthPoint, GEOM::GEOM_Object_ptr theBottomRightPoint,
GEOM::shape_state theState); GEOM::shape_state theState);
GEOM::ListOfGO* GetShapesOnBox (GEOM::GEOM_Object_ptr theBox, GEOM::ListOfGO* GetShapesOnBox (GEOM::GEOM_Object_ptr theBox,

32
src/GEOM_SWIG/geomBuilder.py
View File

@ -5593,9 +5593,9 @@ class geomBuilder(object, GEOM._objref_GEOM_Gen):
# @param theShape Shape to find sub-shapes of. # @param theShape Shape to find sub-shapes of.
# @param theShapeType Type of sub-shapes to be retrieved (see ShapeType()) # @param theShapeType Type of sub-shapes to be retrieved (see ShapeType())
# @param theTopLeftPoint Point, specifying top left corner of a quadrangle # @param theTopLeftPoint Point, specifying top left corner of a quadrangle
# @param theTopRigthPoint Point, specifying top right corner of a quadrangle # @param theTopRightPoint Point, specifying top right corner of a quadrangle
# @param theBottomLeftPoint Point, specifying bottom left corner of a quadrangle # @param theBottomLeftPoint Point, specifying bottom left corner of a quadrangle
# @param theBottomRigthPoint Point, specifying bottom right corner of a quadrangle # @param theBottomRightPoint Point, specifying bottom right corner of a quadrangle
# @param theState The state of the sub-shapes to find (see GEOM::shape_state) # @param theState The state of the sub-shapes to find (see GEOM::shape_state)
# @param theName Object name; when specified, this parameter is used # @param theName Object name; when specified, this parameter is used
# for result publication in the study. Otherwise, if automatic # for result publication in the study. Otherwise, if automatic
@ -5606,8 +5606,8 @@ class geomBuilder(object, GEOM._objref_GEOM_Gen):
# @ref swig_GetShapesOnQuadrangle "Example" # @ref swig_GetShapesOnQuadrangle "Example"
@ManageTransactions("ShapesOp") @ManageTransactions("ShapesOp")
def GetShapesOnQuadrangle(self, theShape, theShapeType, def GetShapesOnQuadrangle(self, theShape, theShapeType,
theTopLeftPoint, theTopRigthPoint, theTopLeftPoint, theTopRightPoint,
theBottomLeftPoint, theBottomRigthPoint, theState, theName=None): theBottomLeftPoint, theBottomRightPoint, theState, theName=None):
""" """
Find in theShape all sub-shapes of type theShapeType, situated relatively Find in theShape all sub-shapes of type theShapeType, situated relatively
the specified quadrangle by the certain way, defined through theState parameter. the specified quadrangle by the certain way, defined through theState parameter.
@ -5616,9 +5616,9 @@ class geomBuilder(object, GEOM._objref_GEOM_Gen):
theShape Shape to find sub-shapes of. theShape Shape to find sub-shapes of.
theShapeType Type of sub-shapes to be retrieved (see geompy.ShapeType) theShapeType Type of sub-shapes to be retrieved (see geompy.ShapeType)
theTopLeftPoint Point, specifying top left corner of a quadrangle theTopLeftPoint Point, specifying top left corner of a quadrangle
theTopRigthPoint Point, specifying top right corner of a quadrangle theTopRightPoint Point, specifying top right corner of a quadrangle
theBottomLeftPoint Point, specifying bottom left corner of a quadrangle theBottomLeftPoint Point, specifying bottom left corner of a quadrangle
theBottomRigthPoint Point, specifying bottom right corner of a quadrangle theBottomRightPoint Point, specifying bottom right corner of a quadrangle
theState The state of the sub-shapes to find (see GEOM::shape_state) theState The state of the sub-shapes to find (see GEOM::shape_state)
theName Object name; when specified, this parameter is used theName Object name; when specified, this parameter is used
for result publication in the study. Otherwise, if automatic for result publication in the study. Otherwise, if automatic
@ -5629,8 +5629,8 @@ class geomBuilder(object, GEOM._objref_GEOM_Gen):
""" """
# Example: see GEOM_TestOthers.py # Example: see GEOM_TestOthers.py
aList = self.ShapesOp.GetShapesOnQuadrangle(theShape, theShapeType, aList = self.ShapesOp.GetShapesOnQuadrangle(theShape, theShapeType,
theTopLeftPoint, theTopRigthPoint, theTopLeftPoint, theTopRightPoint,
theBottomLeftPoint, theBottomRigthPoint, theState) theBottomLeftPoint, theBottomRightPoint, theState)
RaiseIfFailed("GetShapesOnQuadrangle", self.ShapesOp) RaiseIfFailed("GetShapesOnQuadrangle", self.ShapesOp)
self._autoPublish(aList, theName, "shapeOnQuadrangle") self._autoPublish(aList, theName, "shapeOnQuadrangle")
return aList return aList
@ -5640,9 +5640,9 @@ class geomBuilder(object, GEOM._objref_GEOM_Gen):
# @param theShape Shape to find sub-shapes of. # @param theShape Shape to find sub-shapes of.
# @param theShapeType Type of sub-shapes to be retrieved (see ShapeType()) # @param theShapeType Type of sub-shapes to be retrieved (see ShapeType())
# @param theTopLeftPoint Point, specifying top left corner of a quadrangle # @param theTopLeftPoint Point, specifying top left corner of a quadrangle
# @param theTopRigthPoint Point, specifying top right corner of a quadrangle # @param theTopRightPoint Point, specifying top right corner of a quadrangle
# @param theBottomLeftPoint Point, specifying bottom left corner of a quadrangle # @param theBottomLeftPoint Point, specifying bottom left corner of a quadrangle
# @param theBottomRigthPoint Point, specifying bottom right corner of a quadrangle # @param theBottomRightPoint Point, specifying bottom right corner of a quadrangle
# @param theState The state of the sub-shapes to find (see GEOM::shape_state) # @param theState The state of the sub-shapes to find (see GEOM::shape_state)
# #
# @return List of all found sub-shapes indices. # @return List of all found sub-shapes indices.
@ -5650,8 +5650,8 @@ class geomBuilder(object, GEOM._objref_GEOM_Gen):
# @ref swig_GetShapesOnQuadrangleIDs "Example" # @ref swig_GetShapesOnQuadrangleIDs "Example"
@ManageTransactions("ShapesOp") @ManageTransactions("ShapesOp")
def GetShapesOnQuadrangleIDs(self, theShape, theShapeType, def GetShapesOnQuadrangleIDs(self, theShape, theShapeType,
theTopLeftPoint, theTopRigthPoint, theTopLeftPoint, theTopRightPoint,
theBottomLeftPoint, theBottomRigthPoint, theState): theBottomLeftPoint, theBottomRightPoint, theState):
""" """
Find in theShape all sub-shapes of type theShapeType, situated relatively Find in theShape all sub-shapes of type theShapeType, situated relatively
the specified quadrangle by the certain way, defined through theState parameter. the specified quadrangle by the certain way, defined through theState parameter.
@ -5660,9 +5660,9 @@ class geomBuilder(object, GEOM._objref_GEOM_Gen):
theShape Shape to find sub-shapes of. theShape Shape to find sub-shapes of.
theShapeType Type of sub-shapes to be retrieved (see geompy.ShapeType) theShapeType Type of sub-shapes to be retrieved (see geompy.ShapeType)
theTopLeftPoint Point, specifying top left corner of a quadrangle theTopLeftPoint Point, specifying top left corner of a quadrangle
theTopRigthPoint Point, specifying top right corner of a quadrangle theTopRightPoint Point, specifying top right corner of a quadrangle
theBottomLeftPoint Point, specifying bottom left corner of a quadrangle theBottomLeftPoint Point, specifying bottom left corner of a quadrangle
theBottomRigthPoint Point, specifying bottom right corner of a quadrangle theBottomRightPoint Point, specifying bottom right corner of a quadrangle
theState The state of the sub-shapes to find (see GEOM::shape_state) theState The state of the sub-shapes to find (see GEOM::shape_state)
Returns: Returns:
@ -5671,8 +5671,8 @@ class geomBuilder(object, GEOM._objref_GEOM_Gen):
# Example: see GEOM_TestOthers.py # Example: see GEOM_TestOthers.py
aList = self.ShapesOp.GetShapesOnQuadrangleIDs(theShape, theShapeType, aList = self.ShapesOp.GetShapesOnQuadrangleIDs(theShape, theShapeType,
theTopLeftPoint, theTopRigthPoint, theTopLeftPoint, theTopRightPoint,
theBottomLeftPoint, theBottomRigthPoint, theState) theBottomLeftPoint, theBottomRightPoint, theState)
RaiseIfFailed("GetShapesOnQuadrangleIDs", self.ShapesOp) RaiseIfFailed("GetShapesOnQuadrangleIDs", self.ShapesOp)
return aList return aList