Salome HOME
projects
/
modules
/
geom.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bos #29468: Advanced geometry features: distance Edge-Edge & Face-Face
[modules/geom.git]
/
src
/
GEOM_I
/
GEOM_IBasicOperations_i.cc
diff --git
a/src/GEOM_I/GEOM_IBasicOperations_i.cc
b/src/GEOM_I/GEOM_IBasicOperations_i.cc
index e5ce813cf5b8740550985e4d2a10c091c21c9e7a..4859ba64f036c34e6390538051b34ad2b87bfb10 100644
(file)
--- a/
src/GEOM_I/GEOM_IBasicOperations_i.cc
+++ b/
src/GEOM_I/GEOM_IBasicOperations_i.cc
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
13
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-20
22
CEA/DEN, EDF R&D, OPEN CASCADE
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@
-6,7
+6,7
@@
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License
, or (at your option) any later version
.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-69,7
+69,7
@@
GEOM::GEOM_Object_ptr GEOM_IBasicOperations_i::MakePointXYZ
GetOperations()->SetNotDone();
//Create the point
GetOperations()->SetNotDone();
//Create the point
- Handle(GEOM_Object) anObject = GetOperations()->MakePointXYZ(theX, theY, theZ);
+ Handle(
::
GEOM_Object) anObject = GetOperations()->MakePointXYZ(theX, theY, theZ);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
@@
-90,11
+90,11
@@
GEOM::GEOM_Object_ptr GEOM_IBasicOperations_i::MakePointWithReference
GetOperations()->SetNotDone();
//Get the reference point
GetOperations()->SetNotDone();
//Get the reference point
- Handle(GEOM_Object) aReference = GetObjectImpl(theReference);
+ Handle(
::
GEOM_Object) aReference = GetObjectImpl(theReference);
if (aReference.IsNull()) return aGEOMObject._retn();
//Create the point
if (aReference.IsNull()) return aGEOMObject._retn();
//Create the point
- Handle(GEOM_Object) anObject =
+ Handle(
::
GEOM_Object) anObject =
GetOperations()->MakePointWithReference(aReference, theX, theY, theZ);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->MakePointWithReference(aReference, theX, theY, theZ);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
@@
-116,12
+116,12
@@
GEOM::GEOM_Object_ptr GEOM_IBasicOperations_i::MakePointOnLinesIntersection
GetOperations()->SetNotDone();
//Get the reference Lines
GetOperations()->SetNotDone();
//Get the reference Lines
- Handle(GEOM_Object) aRef1 = GetObjectImpl(theLine1);
- Handle(GEOM_Object) aRef2 = GetObjectImpl(theLine2);
+ Handle(
::
GEOM_Object) aRef1 = GetObjectImpl(theLine1);
+ Handle(
::
GEOM_Object) aRef2 = GetObjectImpl(theLine2);
if (aRef1.IsNull() || aRef2.IsNull()) return aGEOMObject._retn();
//Create the point
if (aRef1.IsNull() || aRef2.IsNull()) return aGEOMObject._retn();
//Create the point
- Handle(GEOM_Object) anObject =
+ Handle(
::
GEOM_Object) anObject =
GetOperations()->MakePointOnLinesIntersection(aRef1, aRef2);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->MakePointOnLinesIntersection(aRef1, aRef2);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
@@
-135,7
+135,9
@@
GEOM::GEOM_Object_ptr GEOM_IBasicOperations_i::MakePointOnLinesIntersection
*/
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_IBasicOperations_i::MakePointOnCurve
*/
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_IBasicOperations_i::MakePointOnCurve
- (GEOM::GEOM_Object_ptr theCurve, CORBA::Double theParameter)
+ (GEOM::GEOM_Object_ptr theCurve,
+ CORBA::Double theParameter,
+ CORBA::Boolean takeOrientationIntoAccount)
{
GEOM::GEOM_Object_var aGEOMObject;
{
GEOM::GEOM_Object_var aGEOMObject;
@@
-143,12
+145,12
@@
GEOM::GEOM_Object_ptr GEOM_IBasicOperations_i::MakePointOnCurve
GetOperations()->SetNotDone();
//Get the reference curve
GetOperations()->SetNotDone();
//Get the reference curve
- Handle(GEOM_Object) aReference = GetObjectImpl(theCurve);
+ Handle(
::
GEOM_Object) aReference = GetObjectImpl(theCurve);
if (aReference.IsNull()) return aGEOMObject._retn();
//Create the point
if (aReference.IsNull()) return aGEOMObject._retn();
//Create the point
- Handle(
GEOM_Object) anObject =
-
GetOperations()->MakePointOnCurve(aReference, theParameter
);
+ Handle(
::GEOM_Object) anObject = GetOperations()->MakePointOnCurve
+
(aReference, theParameter, takeOrientationIntoAccount
);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
@@
-171,17
+173,17
@@
GEOM::GEOM_Object_ptr GEOM_IBasicOperations_i::MakePointOnCurveByLength
GetOperations()->SetNotDone();
//Get the reference curve
GetOperations()->SetNotDone();
//Get the reference curve
- Handle(GEOM_Object) aReference = GetObjectImpl(theCurve);
+ Handle(
::
GEOM_Object) aReference = GetObjectImpl(theCurve);
if (aReference.IsNull()) return aGEOMObject._retn();
//Get the reference point (can be NULL)
if (aReference.IsNull()) return aGEOMObject._retn();
//Get the reference point (can be NULL)
- Handle(GEOM_Object) aRefPoint;
+ Handle(
::
GEOM_Object) aRefPoint;
if (!CORBA::is_nil(theStartPoint)) {
aRefPoint = GetObjectImpl(theStartPoint);
}
//Create the point
if (!CORBA::is_nil(theStartPoint)) {
aRefPoint = GetObjectImpl(theStartPoint);
}
//Create the point
- Handle(GEOM_Object) anObject =
+ Handle(
::
GEOM_Object) anObject =
GetOperations()->MakePointOnCurveByLength(aReference, theLength, aRefPoint);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->MakePointOnCurveByLength(aReference, theLength, aRefPoint);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
@@
-206,11
+208,11
@@
GEOM::GEOM_Object_ptr GEOM_IBasicOperations_i::MakePointOnCurveByCoord
GetOperations()->SetNotDone();
//Get the reference curve
GetOperations()->SetNotDone();
//Get the reference curve
- Handle(GEOM_Object) aReference = GetObjectImpl(theCurve);
+ Handle(
::
GEOM_Object) aReference = GetObjectImpl(theCurve);
if (aReference.IsNull()) return aGEOMObject._retn();
//Create the point
if (aReference.IsNull()) return aGEOMObject._retn();
//Create the point
- Handle(GEOM_Object) anObject =
+ Handle(
::
GEOM_Object) anObject =
GetOperations()->MakePointOnCurveByCoord(aReference, theXParameter,
theYParameter, theZParameter);
if (!GetOperations()->IsDone() || anObject.IsNull())
GetOperations()->MakePointOnCurveByCoord(aReference, theXParameter,
theYParameter, theZParameter);
if (!GetOperations()->IsDone() || anObject.IsNull())
@@
-235,11
+237,11
@@
GEOM::GEOM_Object_ptr GEOM_IBasicOperations_i::MakePointOnSurface
GetOperations()->SetNotDone();
//Get the reference surface
GetOperations()->SetNotDone();
//Get the reference surface
- Handle(GEOM_Object) aReference = GetObjectImpl(theSurface);
+ Handle(
::
GEOM_Object) aReference = GetObjectImpl(theSurface);
if (aReference.IsNull()) return aGEOMObject._retn();
//Create the point
if (aReference.IsNull()) return aGEOMObject._retn();
//Create the point
- Handle(GEOM_Object) anObject =
+ Handle(
::
GEOM_Object) anObject =
GetOperations()->MakePointOnSurface(aReference, theUParameter, theVParameter);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->MakePointOnSurface(aReference, theUParameter, theVParameter);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
@@
-264,11
+266,11
@@
GEOM::GEOM_Object_ptr GEOM_IBasicOperations_i::MakePointOnSurfaceByCoord
GetOperations()->SetNotDone();
//Get the reference surface
GetOperations()->SetNotDone();
//Get the reference surface
- Handle(GEOM_Object) aReference = GetObjectImpl(theSurface);
+ Handle(
::
GEOM_Object) aReference = GetObjectImpl(theSurface);
if (aReference.IsNull()) return aGEOMObject._retn();
//Create the point
if (aReference.IsNull()) return aGEOMObject._retn();
//Create the point
- Handle(GEOM_Object) anObject =
+ Handle(
::
GEOM_Object) anObject =
GetOperations()->MakePointOnSurfaceByCoord(aReference, theXParameter,
theYParameter, theZParameter);
if (!GetOperations()->IsDone() || anObject.IsNull())
GetOperations()->MakePointOnSurfaceByCoord(aReference, theXParameter,
theYParameter, theZParameter);
if (!GetOperations()->IsDone() || anObject.IsNull())
@@
-282,7
+284,8
@@
GEOM::GEOM_Object_ptr GEOM_IBasicOperations_i::MakePointOnSurfaceByCoord
* MakePointOnFace
*/
//=============================================================================
* MakePointOnFace
*/
//=============================================================================
-GEOM::GEOM_Object_ptr GEOM_IBasicOperations_i::MakePointOnFace (GEOM::GEOM_Object_ptr theFace)
+GEOM::GEOM_Object_ptr GEOM_IBasicOperations_i::MakePointOnFace (GEOM::GEOM_Object_ptr theFace,
+ CORBA::Long theNumberOfPnts)
{
GEOM::GEOM_Object_var aGEOMObject;
{
GEOM::GEOM_Object_var aGEOMObject;
@@
-290,11
+293,11
@@
GEOM::GEOM_Object_ptr GEOM_IBasicOperations_i::MakePointOnFace (GEOM::GEOM_Objec
GetOperations()->SetNotDone();
//Get the reference face
GetOperations()->SetNotDone();
//Get the reference face
- Handle(GEOM_Object) aReference = GetObjectImpl(theFace);
+ Handle(
::
GEOM_Object) aReference = GetObjectImpl(theFace);
if (aReference.IsNull()) return aGEOMObject._retn();
//Create the point
if (aReference.IsNull()) return aGEOMObject._retn();
//Create the point
- Handle(
GEOM_Object) anObject = GetOperations()->MakePointOnFace(aReference
);
+ Handle(
::GEOM_Object) anObject = GetOperations()->MakePointOnFace(aReference, theNumberOfPnts
);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
@@
-315,11
+318,11
@@
GEOM::GEOM_Object_ptr GEOM_IBasicOperations_i::MakeTangentOnCurve
GetOperations()->SetNotDone();
//Get the reference curve
GetOperations()->SetNotDone();
//Get the reference curve
- Handle(GEOM_Object) aReference = GetObjectImpl(theCurve);
+ Handle(
::
GEOM_Object) aReference = GetObjectImpl(theCurve);
if (aReference.IsNull()) return aGEOMObject._retn();
//Create the vector
if (aReference.IsNull()) return aGEOMObject._retn();
//Create the vector
- Handle(GEOM_Object) anObject =
+ Handle(
::
GEOM_Object) anObject =
GetOperations()->MakeTangentOnCurve(aReference, theParameter);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->MakeTangentOnCurve(aReference, theParameter);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
@@
-342,7
+345,7
@@
GEOM::GEOM_Object_ptr GEOM_IBasicOperations_i::MakeVectorDXDYDZ
//Create the Vector
//Create the Vector
- Handle(GEOM_Object) anObject = GetOperations()->MakeVectorDXDYDZ(theDX, theDY, theDZ);
+ Handle(
::
GEOM_Object) anObject = GetOperations()->MakeVectorDXDYDZ(theDX, theDY, theDZ);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
@@
-363,12
+366,12
@@
GEOM::GEOM_Object_ptr GEOM_IBasicOperations_i::MakeVectorTwoPnt
GetOperations()->SetNotDone();
//Get the reference points
GetOperations()->SetNotDone();
//Get the reference points
- Handle(GEOM_Object) aRef1 = GetObjectImpl(thePnt1);
- Handle(GEOM_Object) aRef2 = GetObjectImpl(thePnt2);
+ Handle(
::
GEOM_Object) aRef1 = GetObjectImpl(thePnt1);
+ Handle(
::
GEOM_Object) aRef2 = GetObjectImpl(thePnt2);
if (aRef1.IsNull() || aRef2.IsNull()) return aGEOMObject._retn();
//Create the vector
if (aRef1.IsNull() || aRef2.IsNull()) return aGEOMObject._retn();
//Create the vector
- Handle(GEOM_Object) anObject = GetOperations()->MakeVectorTwoPnt(aRef1, aRef2);
+ Handle(
::
GEOM_Object) anObject = GetOperations()->MakeVectorTwoPnt(aRef1, aRef2);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
@@
-390,12
+393,12
@@
GEOM::GEOM_Object_ptr GEOM_IBasicOperations_i::MakeLine
GetOperations()->SetNotDone();
//Get the reference objects
GetOperations()->SetNotDone();
//Get the reference objects
- Handle(GEOM_Object) aRef1 = GetObjectImpl(thePnt);
- Handle(GEOM_Object) aRef2 = GetObjectImpl(theDir);
+ Handle(
::
GEOM_Object) aRef1 = GetObjectImpl(thePnt);
+ Handle(
::
GEOM_Object) aRef2 = GetObjectImpl(theDir);
if (aRef1.IsNull() || aRef2.IsNull()) return aGEOMObject._retn();
//Create the Line
if (aRef1.IsNull() || aRef2.IsNull()) return aGEOMObject._retn();
//Create the Line
- Handle(GEOM_Object) anObject = GetOperations()->MakeLine(aRef1, aRef2);
+ Handle(
::
GEOM_Object) anObject = GetOperations()->MakeLine(aRef1, aRef2);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
@@
-416,12
+419,12
@@
GEOM::GEOM_Object_ptr GEOM_IBasicOperations_i::MakeLineTwoPnt
GetOperations()->SetNotDone();
//Get the reference points
GetOperations()->SetNotDone();
//Get the reference points
- Handle(GEOM_Object) aRef1 = GetObjectImpl(thePnt1);
- Handle(GEOM_Object) aRef2 = GetObjectImpl(thePnt2);
+ Handle(
::
GEOM_Object) aRef1 = GetObjectImpl(thePnt1);
+ Handle(
::
GEOM_Object) aRef2 = GetObjectImpl(thePnt2);
if (aRef1.IsNull() || aRef2.IsNull()) return aGEOMObject._retn();
//Create the Line
if (aRef1.IsNull() || aRef2.IsNull()) return aGEOMObject._retn();
//Create the Line
- Handle(GEOM_Object) anObject = GetOperations()->MakeLineTwoPnt(aRef1, aRef2);
+ Handle(
::
GEOM_Object) anObject = GetOperations()->MakeLineTwoPnt(aRef1, aRef2);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
@@
-442,12
+445,12
@@
GEOM::GEOM_Object_ptr GEOM_IBasicOperations_i::MakeLineTwoFaces
GetOperations()->SetNotDone();
//Get the reference points
GetOperations()->SetNotDone();
//Get the reference points
- Handle(GEOM_Object) aRef1 = GetObjectImpl(theFace1);
- Handle(GEOM_Object) aRef2 = GetObjectImpl(theFace2);
+ Handle(
::
GEOM_Object) aRef1 = GetObjectImpl(theFace1);
+ Handle(
::
GEOM_Object) aRef2 = GetObjectImpl(theFace2);
if (aRef1.IsNull() || aRef2.IsNull()) return aGEOMObject._retn();
//Create the Line
if (aRef1.IsNull() || aRef2.IsNull()) return aGEOMObject._retn();
//Create the Line
- Handle(GEOM_Object) anObject =
+ Handle(
::
GEOM_Object) anObject =
GetOperations()->MakeLineTwoFaces(aRef1, aRef2);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->MakeLineTwoFaces(aRef1, aRef2);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
@@
-471,12
+474,12
@@
GEOM::GEOM_Object_ptr GEOM_IBasicOperations_i::MakePlanePntVec
GetOperations()->SetNotDone();
//Get the references
GetOperations()->SetNotDone();
//Get the references
- Handle(GEOM_Object) aRef1 = GetObjectImpl(thePnt);
- Handle(GEOM_Object) aRef2 = GetObjectImpl(theVec);
+ Handle(
::
GEOM_Object) aRef1 = GetObjectImpl(thePnt);
+ Handle(
::
GEOM_Object) aRef2 = GetObjectImpl(theVec);
if (aRef1.IsNull() || aRef2.IsNull()) return aGEOMObject._retn();
//Create the plane
if (aRef1.IsNull() || aRef2.IsNull()) return aGEOMObject._retn();
//Create the plane
- Handle(GEOM_Object) anObject =
+ Handle(
::
GEOM_Object) anObject =
GetOperations()->MakePlanePntVec(aRef1, aRef2, theTrimSize);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->MakePlanePntVec(aRef1, aRef2, theTrimSize);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
@@
-499,14
+502,14
@@
GEOM::GEOM_Object_ptr GEOM_IBasicOperations_i::MakePlaneThreePnt
GetOperations()->SetNotDone();
//Get the reference points
GetOperations()->SetNotDone();
//Get the reference points
- Handle(GEOM_Object) aRef1 = GetObjectImpl(thePnt1);
- Handle(GEOM_Object) aRef2 = GetObjectImpl(thePnt2);
- Handle(GEOM_Object) aRef3 = GetObjectImpl(thePnt3);
+ Handle(
::
GEOM_Object) aRef1 = GetObjectImpl(thePnt1);
+ Handle(
::
GEOM_Object) aRef2 = GetObjectImpl(thePnt2);
+ Handle(
::
GEOM_Object) aRef3 = GetObjectImpl(thePnt3);
if (aRef1.IsNull() || aRef2.IsNull() || aRef3.IsNull())
return aGEOMObject._retn();
//Create the plane
if (aRef1.IsNull() || aRef2.IsNull() || aRef3.IsNull())
return aGEOMObject._retn();
//Create the plane
- Handle(GEOM_Object) anObject =
+ Handle(
::
GEOM_Object) anObject =
GetOperations()->MakePlaneThreePnt(aRef1, aRef2, aRef3, theTrimSize);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->MakePlaneThreePnt(aRef1, aRef2, aRef3, theTrimSize);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
@@
-528,11
+531,11
@@
GEOM::GEOM_Object_ptr GEOM_IBasicOperations_i::MakePlaneFace
GetOperations()->SetNotDone();
//Get the reference face
GetOperations()->SetNotDone();
//Get the reference face
- Handle(GEOM_Object) aRef = GetObjectImpl(theFace);
+ Handle(
::
GEOM_Object) aRef = GetObjectImpl(theFace);
if (aRef.IsNull()) return aGEOMObject._retn();
//Create the plane
if (aRef.IsNull()) return aGEOMObject._retn();
//Create the plane
- Handle(GEOM_Object) anObject =
+ Handle(
::
GEOM_Object) anObject =
GetOperations()->MakePlaneFace(aRef, theTrimSize);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->MakePlaneFace(aRef, theTrimSize);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
@@
-555,12
+558,12
@@
GEOM::GEOM_Object_ptr GEOM_IBasicOperations_i::MakePlane2Vec
GetOperations()->SetNotDone();
//Get the references
GetOperations()->SetNotDone();
//Get the references
- Handle(GEOM_Object) aRef1 = GetObjectImpl(theVec1);
- Handle(GEOM_Object) aRef2 = GetObjectImpl(theVec2);
+ Handle(
::
GEOM_Object) aRef1 = GetObjectImpl(theVec1);
+ Handle(
::
GEOM_Object) aRef2 = GetObjectImpl(theVec2);
if (aRef1.IsNull() || aRef2.IsNull()) return aGEOMObject._retn();
//Create the plane
if (aRef1.IsNull() || aRef2.IsNull()) return aGEOMObject._retn();
//Create the plane
- Handle(GEOM_Object) anObject =
+ Handle(
::
GEOM_Object) anObject =
GetOperations()->MakePlane2Vec(aRef1, aRef2, theTrimSize);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->MakePlane2Vec(aRef1, aRef2, theTrimSize);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
@@
-583,10
+586,10
@@
GEOM::GEOM_Object_ptr GEOM_IBasicOperations_i::MakePlaneLCS
GetOperations()->SetNotDone();
//Get the references
GetOperations()->SetNotDone();
//Get the references
- Handle(GEOM_Object) aRef1 = GetObjectImpl(theLCS);
+ Handle(
::
GEOM_Object) aRef1 = GetObjectImpl(theLCS);
//Create the plane
//Create the plane
- Handle(GEOM_Object) anObject =
+ Handle(
::
GEOM_Object) anObject =
GetOperations()->MakePlaneLCS(aRef1, theTrimSize, theOrientation);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->MakePlaneLCS(aRef1, theTrimSize, theOrientation);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
@@
-610,7
+613,7
@@
GEOM::GEOM_Object_ptr GEOM_IBasicOperations_i::MakeMarker
GetOperations()->SetNotDone();
//Create the point
GetOperations()->SetNotDone();
//Create the point
- Handle(GEOM_Object) anObject = GetOperations()->MakeMarker(theOX , theOY , theOZ,
+ Handle(
::
GEOM_Object) anObject = GetOperations()->MakeMarker(theOX , theOY , theOZ,
theXDX, theXDY, theXDZ,
theYDX, theYDY, theYDZ);
if (!GetOperations()->IsDone() || anObject.IsNull())
theXDX, theXDY, theXDZ,
theYDX, theYDY, theYDZ);
if (!GetOperations()->IsDone() || anObject.IsNull())
@@
-633,11
+636,11
@@
GEOM::GEOM_Object_ptr GEOM_IBasicOperations_i::MakeMarkerFromShape
GetOperations()->SetNotDone();
//Get the referenced object
GetOperations()->SetNotDone();
//Get the referenced object
- Handle(GEOM_Object) aRef = GetObjectImpl(theShape);
+ Handle(
::
GEOM_Object) aRef = GetObjectImpl(theShape);
if (aRef.IsNull()) return aGEOMObject._retn();
//Create the point
if (aRef.IsNull()) return aGEOMObject._retn();
//Create the point
- Handle(GEOM_Object) anObject = GetOperations()->MakeMarkerFromShape(aRef);
+ Handle(
::
GEOM_Object) anObject = GetOperations()->MakeMarkerFromShape(aRef);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
@@
-660,13
+663,13
@@
GEOM::GEOM_Object_ptr GEOM_IBasicOperations_i::MakeMarkerPntTwoVec
GetOperations()->SetNotDone();
//Get the referenced objects
GetOperations()->SetNotDone();
//Get the referenced objects
- Handle(GEOM_Object) aRef1 = GetObjectImpl(theOrigin);
- Handle(GEOM_Object) aRef2 = GetObjectImpl(theXVec);
- Handle(GEOM_Object) aRef3 = GetObjectImpl(theYVec);
+ Handle(
::
GEOM_Object) aRef1 = GetObjectImpl(theOrigin);
+ Handle(
::
GEOM_Object) aRef2 = GetObjectImpl(theXVec);
+ Handle(
::
GEOM_Object) aRef3 = GetObjectImpl(theYVec);
if (aRef1.IsNull() || aRef2.IsNull() || aRef3.IsNull()) return aGEOMObject._retn();
//Create the point
if (aRef1.IsNull() || aRef2.IsNull() || aRef3.IsNull()) return aGEOMObject._retn();
//Create the point
- Handle(GEOM_Object) anObject = GetOperations()->MakeMarkerPntTwoVec(aRef1,
+ Handle(
::
GEOM_Object) anObject = GetOperations()->MakeMarkerPntTwoVec(aRef1,
aRef2,
aRef3);
if (!GetOperations()->IsDone() || anObject.IsNull())
aRef2,
aRef3);
if (!GetOperations()->IsDone() || anObject.IsNull())
@@
-693,11
+696,11
@@
GEOM::GEOM_Object_ptr GEOM_IBasicOperations_i::MakeTangentPlaneOnFace
GetOperations()->SetNotDone();
//Get the reference face
GetOperations()->SetNotDone();
//Get the reference face
- Handle(GEOM_Object) aRef = GetObjectImpl(theFace);
+ Handle(
::
GEOM_Object) aRef = GetObjectImpl(theFace);
if (aRef.IsNull()) return aGEOMObject._retn();
//Create the plane
if (aRef.IsNull()) return aGEOMObject._retn();
//Create the plane
- Handle(GEOM_Object) anObject =
+ Handle(
::
GEOM_Object) anObject =
GetOperations()->MakeTangentPlaneOnFace(aRef, theParameterU,theParameterV,theTrimSize);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->MakeTangentPlaneOnFace(aRef, theParameterU,theParameterV,theTrimSize);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();