// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
+
#ifdef WNT
#pragma warning( disable:4786 )
#endif
GEOM::GEOM_Object_ptr GEOM_Gen_i::AddSubShape (GEOM::GEOM_Object_ptr theMainShape,
const GEOM::ListOfLong& theIndices)
{
- if(theMainShape == NULL || theIndices.length() < 1) return GEOM::GEOM_Object::_nil();
- Handle(GEOM_Object) aMainsShape = _impl->GetObject(theMainShape->GetStudyID(), theMainShape->GetEntry());
+ if (CORBA::is_nil(theMainShape) || theIndices.length() < 1)
+ return GEOM::GEOM_Object::_nil();
+ CORBA::String_var entry = theMainShape->GetEntry();
+ Handle(GEOM_Object) aMainsShape = _impl->GetObject(theMainShape->GetStudyID(), entry);
if (aMainsShape.IsNull()) return GEOM::GEOM_Object::_nil();
Handle(TColStd_HArray1OfInteger) anArray = new TColStd_HArray1OfInteger(1, theIndices.length());
{
GEOM::GEOM_Object_var obj;
Handle(GEOM_Object) handle_object = _impl->GetObject(theStudyID, (char*)theEntry);
- if (handle_object.IsNull()) return NULL;
+ if (handle_object.IsNull()) return obj._retn();
TCollection_AsciiString stringIOR = handle_object->GetIOR();
if (stringIOR.Length() > 1) {
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
+
#include <Standard_Stream.hxx>
#include "GEOM_IBlocksOperations_i.hh"
*/
//=============================================================================
GEOM_IBlocksOperations_i::GEOM_IBlocksOperations_i (PortableServer::POA_ptr thePOA,
- GEOM::GEOM_Gen_ptr theEngine,
- ::GEOMImpl_IBlocksOperations* theImpl)
+ GEOM::GEOM_Gen_ptr theEngine,
+ ::GEOMImpl_IBlocksOperations* theImpl)
:GEOM_IOperations_i(thePOA, theEngine, theImpl)
{
MESSAGE("GEOM_IBlocksOperations_i::GEOM_IBlocksOperations_i");
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_IBlocksOperations_i::MakeQuad
(GEOM::GEOM_Object_ptr theEdge1, GEOM::GEOM_Object_ptr theEdge2,
- GEOM::GEOM_Object_ptr theEdge3, GEOM::GEOM_Object_ptr theEdge4)
+ GEOM::GEOM_Object_ptr theEdge3, GEOM::GEOM_Object_ptr theEdge4)
{
GEOM::GEOM_Object_var aGEOMObject;
//Set a not done flag
GetOperations()->SetNotDone();
- if (theEdge1 == NULL || theEdge2 == NULL ||
- theEdge3 == NULL || theEdge4 == NULL) return aGEOMObject._retn();
-
//Get the reference edges
- Handle(GEOM_Object) anEdge1 = GetOperations()->GetEngine()->GetObject
- (theEdge1->GetStudyID(), theEdge1->GetEntry());
- Handle(GEOM_Object) anEdge2 = GetOperations()->GetEngine()->GetObject
- (theEdge2->GetStudyID(), theEdge2->GetEntry());
- Handle(GEOM_Object) anEdge3 = GetOperations()->GetEngine()->GetObject
- (theEdge3->GetStudyID(), theEdge3->GetEntry());
- Handle(GEOM_Object) anEdge4 = GetOperations()->GetEngine()->GetObject
- (theEdge4->GetStudyID(), theEdge4->GetEntry());
+ Handle(GEOM_Object) anEdge1 = GetObjectImpl(theEdge1);
+ Handle(GEOM_Object) anEdge2 = GetObjectImpl(theEdge2);
+ Handle(GEOM_Object) anEdge3 = GetObjectImpl(theEdge3);
+ Handle(GEOM_Object) anEdge4 = GetObjectImpl(theEdge4);
if (anEdge1.IsNull() || anEdge2.IsNull() ||
anEdge3.IsNull() || anEdge4.IsNull()) return aGEOMObject._retn();
//Set a not done flag
GetOperations()->SetNotDone();
- if (theEdge1 == NULL || theEdge2 == NULL) return aGEOMObject._retn();
-
//Get the reference edges
- Handle(GEOM_Object) anEdge1 = GetOperations()->GetEngine()->GetObject
- (theEdge1->GetStudyID(), theEdge1->GetEntry());
- Handle(GEOM_Object) anEdge2 = GetOperations()->GetEngine()->GetObject
- (theEdge2->GetStudyID(), theEdge2->GetEntry());
+ Handle(GEOM_Object) anEdge1 = GetObjectImpl(theEdge1);
+ Handle(GEOM_Object) anEdge2 = GetObjectImpl(theEdge2);
if (anEdge1.IsNull() || anEdge2.IsNull()) return aGEOMObject._retn();
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_IBlocksOperations_i::MakeQuad4Vertices
(GEOM::GEOM_Object_ptr thePnt1, GEOM::GEOM_Object_ptr thePnt2,
- GEOM::GEOM_Object_ptr thePnt3, GEOM::GEOM_Object_ptr thePnt4)
+ GEOM::GEOM_Object_ptr thePnt3, GEOM::GEOM_Object_ptr thePnt4)
{
GEOM::GEOM_Object_var aGEOMObject;
//Set a not done flag
GetOperations()->SetNotDone();
- if (thePnt1 == NULL || thePnt2 == NULL ||
- thePnt3 == NULL || thePnt4 == NULL) return aGEOMObject._retn();
-
//Get the reference points
- Handle(GEOM_Object) aPnt1 = GetOperations()->GetEngine()->GetObject
- (thePnt1->GetStudyID(), thePnt1->GetEntry());
- Handle(GEOM_Object) aPnt2 = GetOperations()->GetEngine()->GetObject
- (thePnt2->GetStudyID(), thePnt2->GetEntry());
- Handle(GEOM_Object) aPnt3 = GetOperations()->GetEngine()->GetObject
- (thePnt3->GetStudyID(), thePnt3->GetEntry());
- Handle(GEOM_Object) aPnt4 = GetOperations()->GetEngine()->GetObject
- (thePnt4->GetStudyID(), thePnt4->GetEntry());
+ Handle(GEOM_Object) aPnt1 = GetObjectImpl(thePnt1);
+ Handle(GEOM_Object) aPnt2 = GetObjectImpl(thePnt2);
+ Handle(GEOM_Object) aPnt3 = GetObjectImpl(thePnt3);
+ Handle(GEOM_Object) aPnt4 = GetObjectImpl(thePnt4);
if (aPnt1.IsNull() || aPnt2.IsNull() ||
aPnt3.IsNull() || aPnt4.IsNull()) return aGEOMObject._retn();
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_IBlocksOperations_i::MakeHexa
(GEOM::GEOM_Object_ptr theFace1, GEOM::GEOM_Object_ptr theFace2,
- GEOM::GEOM_Object_ptr theFace3, GEOM::GEOM_Object_ptr theFace4,
- GEOM::GEOM_Object_ptr theFace5, GEOM::GEOM_Object_ptr theFace6)
+ GEOM::GEOM_Object_ptr theFace3, GEOM::GEOM_Object_ptr theFace4,
+ GEOM::GEOM_Object_ptr theFace5, GEOM::GEOM_Object_ptr theFace6)
{
GEOM::GEOM_Object_var aGEOMObject;
//Set a not done flag
GetOperations()->SetNotDone();
- if (theFace1 == NULL || theFace2 == NULL ||
- theFace3 == NULL || theFace4 == NULL ||
- theFace5 == NULL || theFace6 == NULL) return aGEOMObject._retn();
-
//Get the reference Faces
- Handle(GEOM_Object) anFace1 = GetOperations()->GetEngine()->GetObject
- (theFace1->GetStudyID(), theFace1->GetEntry());
- Handle(GEOM_Object) anFace2 = GetOperations()->GetEngine()->GetObject
- (theFace2->GetStudyID(), theFace2->GetEntry());
- Handle(GEOM_Object) anFace3 = GetOperations()->GetEngine()->GetObject
- (theFace3->GetStudyID(), theFace3->GetEntry());
- Handle(GEOM_Object) anFace4 = GetOperations()->GetEngine()->GetObject
- (theFace4->GetStudyID(), theFace4->GetEntry());
- Handle(GEOM_Object) anFace5 = GetOperations()->GetEngine()->GetObject
- (theFace5->GetStudyID(), theFace5->GetEntry());
- Handle(GEOM_Object) anFace6 = GetOperations()->GetEngine()->GetObject
- (theFace6->GetStudyID(), theFace6->GetEntry());
+ Handle(GEOM_Object) anFace1 = GetObjectImpl(theFace1);
+ Handle(GEOM_Object) anFace2 = GetObjectImpl(theFace2);
+ Handle(GEOM_Object) anFace3 = GetObjectImpl(theFace3);
+ Handle(GEOM_Object) anFace4 = GetObjectImpl(theFace4);
+ Handle(GEOM_Object) anFace5 = GetObjectImpl(theFace5);
+ Handle(GEOM_Object) anFace6 = GetObjectImpl(theFace6);
if (anFace1.IsNull() || anFace2.IsNull() ||
anFace3.IsNull() || anFace4.IsNull() ||
//Set a not done flag
GetOperations()->SetNotDone();
- if (theFace1 == NULL || theFace2 == NULL) return aGEOMObject._retn();
-
//Get the reference Faces
- Handle(GEOM_Object) anFace1 = GetOperations()->GetEngine()->GetObject
- (theFace1->GetStudyID(), theFace1->GetEntry());
- Handle(GEOM_Object) anFace2 = GetOperations()->GetEngine()->GetObject
- (theFace2->GetStudyID(), theFace2->GetEntry());
+ Handle(GEOM_Object) anFace1 = GetObjectImpl(theFace1);
+ Handle(GEOM_Object) anFace2 = GetObjectImpl(theFace2);
if (anFace1.IsNull() || anFace2.IsNull()) return aGEOMObject._retn();
//Set a not done flag
GetOperations()->SetNotDone();
- if (theCompound == NULL) return aGEOMObject._retn();
-
//Get the reference Compound
- Handle(GEOM_Object) aCompound = GetOperations()->GetEngine()->GetObject
- (theCompound->GetStudyID(), theCompound->GetEntry());
-
+ Handle(GEOM_Object) aCompound = GetObjectImpl(theCompound);
if (aCompound.IsNull()) return aGEOMObject._retn();
//Create the Blocks Compound
*/
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_IBlocksOperations_i::GetPoint (GEOM::GEOM_Object_ptr theShape,
- const CORBA::Double theX,
- const CORBA::Double theY,
- const CORBA::Double theZ,
- const CORBA::Double theEpsilon)
+ const CORBA::Double theX,
+ const CORBA::Double theY,
+ const CORBA::Double theZ,
+ const CORBA::Double theEpsilon)
{
GEOM::GEOM_Object_var aGEOMObject;
//Set a not done flag
GetOperations()->SetNotDone();
- if (theShape == NULL) return aGEOMObject._retn();
-
//Get the reference Objects
- Handle(GEOM_Object) aShape = GetOperations()->GetEngine()->GetObject
- (theShape->GetStudyID(), theShape->GetEntry());
-
+ Handle(GEOM_Object) aShape = GetObjectImpl(theShape);
if (aShape.IsNull()) return aGEOMObject._retn();
//Create the Point
*/
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_IBlocksOperations_i::GetEdge (GEOM::GEOM_Object_ptr theShape,
- GEOM::GEOM_Object_ptr thePoint1,
- GEOM::GEOM_Object_ptr thePoint2)
+ GEOM::GEOM_Object_ptr thePoint1,
+ GEOM::GEOM_Object_ptr thePoint2)
{
GEOM::GEOM_Object_var aGEOMObject;
//Set a not done flag
GetOperations()->SetNotDone();
- if (theShape == NULL ||
- thePoint1 == NULL || thePoint2 == NULL) return aGEOMObject._retn();
-
//Get the reference Objects
- Handle(GEOM_Object) aShape = GetOperations()->GetEngine()->GetObject
- (theShape->GetStudyID(), theShape->GetEntry());
- Handle(GEOM_Object) aPoint1 = GetOperations()->GetEngine()->GetObject
- (thePoint1->GetStudyID(), thePoint1->GetEntry());
- Handle(GEOM_Object) aPoint2 = GetOperations()->GetEngine()->GetObject
- (thePoint2->GetStudyID(), thePoint2->GetEntry());
+ Handle(GEOM_Object) aShape = GetObjectImpl(theShape);
+ Handle(GEOM_Object) aPoint1 = GetObjectImpl(thePoint1);
+ Handle(GEOM_Object) aPoint2 = GetObjectImpl(thePoint2);
if (aShape.IsNull() ||
aPoint1.IsNull() || aPoint2.IsNull()) return aGEOMObject._retn();
*/
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_IBlocksOperations_i::GetEdgeNearPoint (GEOM::GEOM_Object_ptr theShape,
- GEOM::GEOM_Object_ptr thePoint)
+ GEOM::GEOM_Object_ptr thePoint)
{
GEOM::GEOM_Object_var aGEOMObject;
//Set a not done flag
GetOperations()->SetNotDone();
- if (theShape == NULL || thePoint == NULL) return aGEOMObject._retn();
-
//Get the reference Objects
- Handle(GEOM_Object) aShape = GetOperations()->GetEngine()->GetObject
- (theShape->GetStudyID(), theShape->GetEntry());
- Handle(GEOM_Object) aPoint = GetOperations()->GetEngine()->GetObject
- (thePoint->GetStudyID(), thePoint->GetEntry());
+ Handle(GEOM_Object) aShape = GetObjectImpl(theShape);
+ Handle(GEOM_Object) aPoint = GetObjectImpl(thePoint);
if (aShape.IsNull() || aPoint.IsNull()) return aGEOMObject._retn();
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_IBlocksOperations_i::GetFaceByPoints
(GEOM::GEOM_Object_ptr theShape,
- GEOM::GEOM_Object_ptr thePoint1,
- GEOM::GEOM_Object_ptr thePoint2,
- GEOM::GEOM_Object_ptr thePoint3,
- GEOM::GEOM_Object_ptr thePoint4)
+ GEOM::GEOM_Object_ptr thePoint1,
+ GEOM::GEOM_Object_ptr thePoint2,
+ GEOM::GEOM_Object_ptr thePoint3,
+ GEOM::GEOM_Object_ptr thePoint4)
{
GEOM::GEOM_Object_var aGEOMObject;
//Set a not done flag
GetOperations()->SetNotDone();
- if (theShape == NULL ||
- thePoint1 == NULL || thePoint2 == NULL ||
- thePoint3 == NULL || thePoint4 == NULL) return aGEOMObject._retn();
-
//Get the reference Objects
- Handle(GEOM_Object) aShape = GetOperations()->GetEngine()->GetObject
- (theShape->GetStudyID(), theShape->GetEntry());
- Handle(GEOM_Object) aPoint1 = GetOperations()->GetEngine()->GetObject
- (thePoint1->GetStudyID(), thePoint1->GetEntry());
- Handle(GEOM_Object) aPoint2 = GetOperations()->GetEngine()->GetObject
- (thePoint2->GetStudyID(), thePoint2->GetEntry());
- Handle(GEOM_Object) aPoint3 = GetOperations()->GetEngine()->GetObject
- (thePoint3->GetStudyID(), thePoint3->GetEntry());
- Handle(GEOM_Object) aPoint4 = GetOperations()->GetEngine()->GetObject
- (thePoint4->GetStudyID(), thePoint4->GetEntry());
+ Handle(GEOM_Object) aShape = GetObjectImpl(theShape);
+ Handle(GEOM_Object) aPoint1 = GetObjectImpl(thePoint1);
+ Handle(GEOM_Object) aPoint2 = GetObjectImpl(thePoint2);
+ Handle(GEOM_Object) aPoint3 = GetObjectImpl(thePoint3);
+ Handle(GEOM_Object) aPoint4 = GetObjectImpl(thePoint4);
if (aShape.IsNull() ||
aPoint1.IsNull() || aPoint2.IsNull() ||
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_IBlocksOperations_i::GetFaceByEdges
(GEOM::GEOM_Object_ptr theShape,
- GEOM::GEOM_Object_ptr theEdge1,
- GEOM::GEOM_Object_ptr theEdge2)
+ GEOM::GEOM_Object_ptr theEdge1,
+ GEOM::GEOM_Object_ptr theEdge2)
{
GEOM::GEOM_Object_var aGEOMObject;
//Set a not done flag
GetOperations()->SetNotDone();
- if (theShape == NULL ||
- theEdge1 == NULL || theEdge2 == NULL) return aGEOMObject._retn();
-
//Get the reference Objects
- Handle(GEOM_Object) aShape = GetOperations()->GetEngine()->GetObject
- (theShape->GetStudyID(), theShape->GetEntry());
- Handle(GEOM_Object) anEdge1 = GetOperations()->GetEngine()->GetObject
- (theEdge1->GetStudyID(), theEdge1->GetEntry());
- Handle(GEOM_Object) anEdge2 = GetOperations()->GetEngine()->GetObject
- (theEdge2->GetStudyID(), theEdge2->GetEntry());
+ Handle(GEOM_Object) aShape = GetObjectImpl(theShape);
+ Handle(GEOM_Object) anEdge1 = GetObjectImpl(theEdge1);
+ Handle(GEOM_Object) anEdge2 = GetObjectImpl(theEdge2);
if (aShape.IsNull() ||
anEdge1.IsNull() || anEdge2.IsNull()) return aGEOMObject._retn();
*/
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_IBlocksOperations_i::GetOppositeFace (GEOM::GEOM_Object_ptr theShape,
- GEOM::GEOM_Object_ptr theFace)
+ GEOM::GEOM_Object_ptr theFace)
{
GEOM::GEOM_Object_var aGEOMObject;
//Set a not done flag
GetOperations()->SetNotDone();
- if (theShape == NULL || theFace == NULL) return aGEOMObject._retn();
-
//Get the reference Objects
- Handle(GEOM_Object) aShape = GetOperations()->GetEngine()->GetObject
- (theShape->GetStudyID(), theShape->GetEntry());
- Handle(GEOM_Object) aFace = GetOperations()->GetEngine()->GetObject
- (theFace->GetStudyID(), theFace->GetEntry());
+ Handle(GEOM_Object) aShape = GetObjectImpl(theShape);
+ Handle(GEOM_Object) aFace = GetObjectImpl(theFace);
if (aShape.IsNull() || aFace.IsNull()) return aGEOMObject._retn();
*/
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_IBlocksOperations_i::GetFaceNearPoint (GEOM::GEOM_Object_ptr theShape,
- GEOM::GEOM_Object_ptr thePoint)
+ GEOM::GEOM_Object_ptr thePoint)
{
GEOM::GEOM_Object_var aGEOMObject;
//Set a not done flag
GetOperations()->SetNotDone();
- if (theShape == NULL || thePoint == NULL) return aGEOMObject._retn();
-
//Get the reference Objects
- Handle(GEOM_Object) aShape = GetOperations()->GetEngine()->GetObject
- (theShape->GetStudyID(), theShape->GetEntry());
- Handle(GEOM_Object) aPoint = GetOperations()->GetEngine()->GetObject
- (thePoint->GetStudyID(), thePoint->GetEntry());
+ Handle(GEOM_Object) aShape = GetObjectImpl(theShape);
+ Handle(GEOM_Object) aPoint = GetObjectImpl(thePoint);
if (aShape.IsNull() || aPoint.IsNull()) return aGEOMObject._retn();
*/
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_IBlocksOperations_i::GetFaceByNormale (GEOM::GEOM_Object_ptr theShape,
- GEOM::GEOM_Object_ptr theVector)
+ GEOM::GEOM_Object_ptr theVector)
{
GEOM::GEOM_Object_var aGEOMObject;
//Set a not done flag
GetOperations()->SetNotDone();
- if (theShape == NULL || theVector == NULL) return aGEOMObject._retn();
-
//Get the reference Objects
- Handle(GEOM_Object) aShape = GetOperations()->GetEngine()->GetObject
- (theShape->GetStudyID(), theShape->GetEntry());
- Handle(GEOM_Object) aVector = GetOperations()->GetEngine()->GetObject
- (theVector->GetStudyID(), theVector->GetEntry());
+ Handle(GEOM_Object) aShape = GetObjectImpl(theShape);
+ Handle(GEOM_Object) aVector = GetObjectImpl(theVector);
if (aShape.IsNull() || aVector.IsNull()) return aGEOMObject._retn();
//=============================================================================
GEOM::ListOfGO* GEOM_IBlocksOperations_i::ExplodeCompoundOfBlocks
(GEOM::GEOM_Object_ptr theCompound,
- const CORBA::Long theMinNbFaces,
- const CORBA::Long theMaxNbFaces)
+ const CORBA::Long theMinNbFaces,
+ const CORBA::Long theMaxNbFaces)
{
GEOM::ListOfGO_var aSeq = new GEOM::ListOfGO;
//Set a not done flag
GetOperations()->SetNotDone();
- if (theCompound == NULL) return aSeq._retn();
-
//Get the reference Compound
- Handle(GEOM_Object) aCompound = GetOperations()->GetEngine()->GetObject
- (theCompound->GetStudyID(), theCompound->GetEntry());
-
+ Handle(GEOM_Object) aCompound = GetObjectImpl(theCompound);
if (aCompound.IsNull()) return aSeq._retn();
//Explode
//=============================================================================
CORBA::Boolean GEOM_IBlocksOperations_i::IsCompoundOfBlocks
(GEOM::GEOM_Object_ptr theCompound,
- const CORBA::Long theMinNbFaces,
- const CORBA::Long theMaxNbFaces,
- CORBA::Long& theNbBlocks)
+ const CORBA::Long theMinNbFaces,
+ const CORBA::Long theMaxNbFaces,
+ CORBA::Long& theNbBlocks)
{
theNbBlocks = 0;
CORBA::Boolean isComp = false;
//Set a not done flag
GetOperations()->SetNotDone();
- if (theCompound == NULL) return isComp;
-
//Get the reference Compound
- Handle(GEOM_Object) aCompound = GetOperations()->GetEngine()->GetObject
- (theCompound->GetStudyID(), theCompound->GetEntry());
-
+ Handle(GEOM_Object) aCompound = GetObjectImpl(theCompound);
if (aCompound.IsNull()) return isComp;
//Check
Standard_Integer nbBlocks = 0;
isComp = GetOperations()->IsCompoundOfBlocks(aCompound,
- theMinNbFaces,
- theMaxNbFaces,
- nbBlocks);
+ theMinNbFaces,
+ theMaxNbFaces,
+ nbBlocks);
if (!GetOperations()->IsDone())
return isComp;
//=============================================================================
CORBA::Boolean GEOM_IBlocksOperations_i::CheckCompoundOfBlocks
(GEOM::GEOM_Object_ptr theCompound,
- GEOM::GEOM_IBlocksOperations::BCErrors_out theErrors)
+ GEOM::GEOM_IBlocksOperations::BCErrors_out theErrors)
{
CORBA::Boolean isComp = false;
//Set a not done flag
GetOperations()->SetNotDone();
- if (theCompound == NULL) return isComp;
-
//Get the reference Compound
- Handle(GEOM_Object) aCompound = GetOperations()->GetEngine()->GetObject
- (theCompound->GetStudyID(), theCompound->GetEntry());
-
+ Handle(GEOM_Object) aCompound = GetObjectImpl(theCompound);
if (aCompound.IsNull()) return isComp;
//Check
//=============================================================================
char* GEOM_IBlocksOperations_i::PrintBCErrors
(GEOM::GEOM_Object_ptr theCompound,
- const GEOM::GEOM_IBlocksOperations::BCErrors& theErrors)
+ const GEOM::GEOM_IBlocksOperations::BCErrors& theErrors)
{
//Get the reference Compound
- if (theCompound == NULL) return NULL;
- Handle(GEOM_Object) aCompound = GetOperations()->GetEngine()->GetObject
- (theCompound->GetStudyID(), theCompound->GetEntry());
+ Handle(GEOM_Object) aCompound = GetObjectImpl(theCompound);
if (aCompound.IsNull()) return NULL;
// Convert the errors sequence
}
TCollection_AsciiString aDescr = GetOperations()->PrintBCErrors(aCompound, anErrors);
- return CORBA::string_dup(aDescr.ToCString());
+ return CORBA::string_dup(aDescr.ToCString());
}
//=============================================================================
//Set a not done flag
GetOperations()->SetNotDone();
- if (theShape == NULL) return aGEOMObject._retn();
-
//Get the reference Objects
- Handle(GEOM_Object) aShape = GetOperations()->GetEngine()->GetObject
- (theShape->GetStudyID(), theShape->GetEntry());
-
+ Handle(GEOM_Object) aShape = GetObjectImpl(theShape);
if (aShape.IsNull()) return aGEOMObject._retn();
//Get the result
//Set a not done flag
GetOperations()->SetNotDone();
- if (theCompound == NULL) return aGEOMObject._retn();
-
//Get the reference Objects
- Handle(GEOM_Object) aCompound = GetOperations()->GetEngine()->GetObject
- (theCompound->GetStudyID(), theCompound->GetEntry());
-
+ Handle(GEOM_Object) aCompound = GetObjectImpl(theCompound);
if (aCompound.IsNull()) return aGEOMObject._retn();
//Get the result
*/
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_IBlocksOperations_i::GetBlockNearPoint (GEOM::GEOM_Object_ptr theCompound,
- GEOM::GEOM_Object_ptr thePoint)
+ GEOM::GEOM_Object_ptr thePoint)
{
GEOM::GEOM_Object_var aGEOMObject;
//Set a not done flag
GetOperations()->SetNotDone();
- if (theCompound == NULL || thePoint == NULL) return aGEOMObject._retn();
-
//Get the reference Objects
- Handle(GEOM_Object) aCompound = GetOperations()->GetEngine()->GetObject
- (theCompound->GetStudyID(), theCompound->GetEntry());
- Handle(GEOM_Object) aPoint = GetOperations()->GetEngine()->GetObject
- (thePoint->GetStudyID(), thePoint->GetEntry());
+ Handle(GEOM_Object) aCompound = GetObjectImpl(theCompound);
+ Handle(GEOM_Object) aPoint = GetObjectImpl(thePoint);
if (aCompound.IsNull() || aPoint.IsNull()) return aGEOMObject._retn();
*/
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_IBlocksOperations_i::GetBlockByParts (GEOM::GEOM_Object_ptr theCompound,
- const GEOM::ListOfGO& theParts)
+ const GEOM::ListOfGO& theParts)
{
GEOM::GEOM_Object_var aGEOMObject;
//Set a not done flag
GetOperations()->SetNotDone();
- if (theCompound == NULL) return aGEOMObject._retn();
-
//Get the reference Compound
- Handle(GEOM_Object) aCompound = GetOperations()->GetEngine()->GetObject
- (theCompound->GetStudyID(), theCompound->GetEntry());
-
+ Handle(GEOM_Object) aCompound = GetObjectImpl(theCompound);
if (aCompound.IsNull()) return aGEOMObject._retn();
//Get the parts
aLen = theParts.length();
for (ind = 0; ind < aLen; ind++) {
- if (theParts[ind] == NULL) return aGEOMObject._retn();
- Handle(GEOM_Object) aSh = GetOperations()->GetEngine()->GetObject
- (theParts[ind]->GetStudyID(), theParts[ind]->GetEntry());
+ Handle(GEOM_Object) aSh = GetObjectImpl(theParts[ind]);
if (aSh.IsNull()) return aGEOMObject._retn();
aParts->Append(aSh);
}
*/
//=============================================================================
GEOM::ListOfGO* GEOM_IBlocksOperations_i::GetBlocksByParts (GEOM::GEOM_Object_ptr theCompound,
- const GEOM::ListOfGO& theParts)
+ const GEOM::ListOfGO& theParts)
{
GEOM::ListOfGO_var aSeq = new GEOM::ListOfGO;
//Set a not done flag
GetOperations()->SetNotDone();
- if (theCompound == NULL) return aSeq._retn();
-
//Get the reference Compound
- Handle(GEOM_Object) aCompound = GetOperations()->GetEngine()->GetObject
- (theCompound->GetStudyID(), theCompound->GetEntry());
-
+ Handle(GEOM_Object) aCompound = GetObjectImpl(theCompound);
if (aCompound.IsNull()) return aSeq._retn();
//Get the parts
aLen = theParts.length();
for (ind = 0; ind < aLen; ind++) {
- if (theParts[ind] == NULL) return aSeq._retn();
- Handle(GEOM_Object) aSh = GetOperations()->GetEngine()->GetObject
- (theParts[ind]->GetStudyID(), theParts[ind]->GetEntry());
+ Handle(GEOM_Object) aSh = GetObjectImpl(theParts[ind]);
if (aSh.IsNull()) return aSeq._retn();
aParts->Append(aSh);
}
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_IBlocksOperations_i::MakeMultiTransformation1D
(GEOM::GEOM_Object_ptr theBlock,
- const CORBA::Long theDirFace1,
- const CORBA::Long theDirFace2,
- const CORBA::Long theNbTimes)
+ const CORBA::Long theDirFace1,
+ const CORBA::Long theDirFace2,
+ const CORBA::Long theNbTimes)
{
GEOM::GEOM_Object_var aGEOMObject;
- //Set a not done flag
+ //Set a not done flag
GetOperations()->SetNotDone();
- if (theBlock == NULL) return aGEOMObject._retn();
-
- //Get the object itself and the vector of translation
- Handle(GEOM_Object) aBasicObject = GetOperations()->GetEngine()->GetObject
- (theBlock->GetStudyID(), theBlock->GetEntry());
-
- if (aBasicObject.IsNull()) return aGEOMObject._retn();
+ //Get the object itself and the vector of translation
+ Handle(GEOM_Object) aBasicObject = GetObjectImpl(theBlock);
+ if (aBasicObject.IsNull()) return aGEOMObject._retn();
- //Perform the transformation
- Handle(GEOM_Object) anObject = GetOperations()->MakeMultiTransformation1D
- (aBasicObject, theDirFace1, theDirFace2, theNbTimes);
- if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn();
+ //Perform the transformation
+ Handle(GEOM_Object) anObject = GetOperations()->MakeMultiTransformation1D
+ (aBasicObject, theDirFace1, theDirFace2, theNbTimes);
+ if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn();
- return GetObject(anObject);
+ return GetObject(anObject);
}
//=============================================================================
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_IBlocksOperations_i::MakeMultiTransformation2D
(GEOM::GEOM_Object_ptr theBlock,
- const CORBA::Long theDirFace1U,
- const CORBA::Long theDirFace2U,
- const CORBA::Long theNbTimesU,
- const CORBA::Long theDirFace1V,
- const CORBA::Long theDirFace2V,
- const CORBA::Long theNbTimesV)
+ const CORBA::Long theDirFace1U,
+ const CORBA::Long theDirFace2U,
+ const CORBA::Long theNbTimesU,
+ const CORBA::Long theDirFace1V,
+ const CORBA::Long theDirFace2V,
+ const CORBA::Long theNbTimesV)
{
GEOM::GEOM_Object_var aGEOMObject;
//Set a not done flag
GetOperations()->SetNotDone();
- if (theBlock == NULL) return aGEOMObject._retn();
-
//Get the object itself
- Handle(GEOM_Object) aBasicObject = GetOperations()->GetEngine()->GetObject
- (theBlock->GetStudyID(), theBlock->GetEntry());
-
+ Handle(GEOM_Object) aBasicObject = GetObjectImpl(theBlock);
if (aBasicObject.IsNull()) return aGEOMObject._retn();
//Perform the transformation
//Set a not done flag
GetOperations()->SetNotDone();
- if (theShape == NULL) return aSeq._retn();
-
//Get the reference Shape
- Handle(GEOM_Object) aShape = GetOperations()->GetEngine()->GetObject
- (theShape->GetStudyID(), theShape->GetEntry());
-
+ Handle(GEOM_Object) aShape = GetObjectImpl(theShape);
if (aShape.IsNull()) return aSeq._retn();
//Get the Propagation chains
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
+
#include <Standard_Stream.hxx>
#include "GEOM_IBooleanOperations_i.hh"
*/
//=============================================================================
GEOM_IBooleanOperations_i::GEOM_IBooleanOperations_i (PortableServer::POA_ptr thePOA,
- GEOM::GEOM_Gen_ptr theEngine,
- ::GEOMImpl_IBooleanOperations* theImpl)
+ GEOM::GEOM_Gen_ptr theEngine,
+ ::GEOMImpl_IBooleanOperations* theImpl)
:GEOM_IOperations_i(thePOA, theEngine, theImpl)
{
MESSAGE("GEOM_IBooleanOperations_i::GEOM_IBooleanOperations_i");
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_IBooleanOperations_i::MakeBoolean
(GEOM::GEOM_Object_ptr theShape1,
- GEOM::GEOM_Object_ptr theShape2,
- CORBA::Long theOp)
+ GEOM::GEOM_Object_ptr theShape2,
+ CORBA::Long theOp)
{
GEOM::GEOM_Object_var aGEOMObject;
//Set a not done flag
GetOperations()->SetNotDone();
- if (theShape1 == NULL || theShape2 == NULL) return aGEOMObject._retn();
-
//Get the reference shapes
- CORBA::String_var entry=theShape1->GetEntry();
- Handle(GEOM_Object) aSh1 = GetOperations()->GetEngine()->GetObject
- (theShape1->GetStudyID(), entry);
- entry=theShape2->GetEntry();
- Handle(GEOM_Object) aSh2 = GetOperations()->GetEngine()->GetObject
- (theShape2->GetStudyID(), entry);
+ Handle(GEOM_Object) aSh1 = GetObjectImpl(theShape1);
+ Handle(GEOM_Object) aSh2 = GetObjectImpl(theShape2);
if (aSh1.IsNull() || aSh2.IsNull()) return aGEOMObject._retn();
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_IBooleanOperations_i::MakePartition
(const GEOM::ListOfGO& theShapes,
- const GEOM::ListOfGO& theTools,
- const GEOM::ListOfGO& theKeepIns,
- const GEOM::ListOfGO& theRemoveIns,
- CORBA::Short theLimit,
- CORBA::Boolean theRemoveWebs,
- const GEOM::ListOfLong& theMaterials,
- CORBA::Short theKeepNonlimitShapes)
+ const GEOM::ListOfGO& theTools,
+ const GEOM::ListOfGO& theKeepIns,
+ const GEOM::ListOfGO& theRemoveIns,
+ CORBA::Short theLimit,
+ CORBA::Boolean theRemoveWebs,
+ const GEOM::ListOfLong& theMaterials,
+ CORBA::Short theKeepNonlimitShapes)
{
GEOM::GEOM_Object_var aGEOMObject;
//Get the shapes
aLen = theShapes.length();
for (ind = 0; ind < aLen; ind++) {
- if (theShapes[ind] == NULL) return aGEOMObject._retn();
- Handle(GEOM_Object) aSh = GetOperations()->GetEngine()->GetObject
- (theShapes[ind]->GetStudyID(), theShapes[ind]->GetEntry());
+ Handle(GEOM_Object) aSh = GetObjectImpl(theShapes[ind]);
if (aSh.IsNull()) return aGEOMObject._retn();
aShapes->Append(aSh);
}
//Get the tools
aLen = theTools.length();
for (ind = 0; ind < aLen; ind++) {
- if (theTools[ind] == NULL) return aGEOMObject._retn();
- Handle(GEOM_Object) aSh = GetOperations()->GetEngine()->GetObject
- (theTools[ind]->GetStudyID(), theTools[ind]->GetEntry());
+ Handle(GEOM_Object) aSh = GetObjectImpl(theTools[ind]);
if (aSh.IsNull()) return aGEOMObject._retn();
aTools->Append(aSh);
}
//Get the keep inside shapes
aLen = theKeepIns.length();
for (ind = 0; ind < aLen; ind++) {
- if (theKeepIns[ind] == NULL) return aGEOMObject._retn();
- Handle(GEOM_Object) aSh = GetOperations()->GetEngine()->GetObject
- (theKeepIns[ind]->GetStudyID(), theKeepIns[ind]->GetEntry());
+ Handle(GEOM_Object) aSh = GetObjectImpl(theKeepIns[ind]);
if (aSh.IsNull()) return aGEOMObject._retn();
aKeepIns->Append(aSh);
}
//Get the remove inside shapes
aLen = theRemoveIns.length();
for (ind = 0; ind < aLen; ind++) {
- if (theRemoveIns[ind] == NULL) return aGEOMObject._retn();
- Handle(GEOM_Object) aSh = GetOperations()->GetEngine()->GetObject
- (theRemoveIns[ind]->GetStudyID(), theRemoveIns[ind]->GetEntry());
+ Handle(GEOM_Object) aSh = GetObjectImpl(theRemoveIns[ind]);
if (aSh.IsNull()) return aGEOMObject._retn();
aRemIns->Append(aSh);
}
// Make Partition
Handle(GEOM_Object) anObject =
GetOperations()->MakePartition(aShapes, aTools, aKeepIns, aRemIns,
- theLimit, theRemoveWebs, aMaterials,
- theKeepNonlimitShapes,
- /*PerformSelfIntersections*/Standard_True);
+ theLimit, theRemoveWebs, aMaterials,
+ theKeepNonlimitShapes,
+ /*PerformSelfIntersections*/Standard_True);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_IBooleanOperations_i::MakePartitionNonSelfIntersectedShape
(const GEOM::ListOfGO& theShapes,
- const GEOM::ListOfGO& theTools,
- const GEOM::ListOfGO& theKeepIns,
- const GEOM::ListOfGO& theRemoveIns,
- CORBA::Short theLimit,
- CORBA::Boolean theRemoveWebs,
- const GEOM::ListOfLong& theMaterials,
- CORBA::Short theKeepNonlimitShapes)
+ const GEOM::ListOfGO& theTools,
+ const GEOM::ListOfGO& theKeepIns,
+ const GEOM::ListOfGO& theRemoveIns,
+ CORBA::Short theLimit,
+ CORBA::Boolean theRemoveWebs,
+ const GEOM::ListOfLong& theMaterials,
+ CORBA::Short theKeepNonlimitShapes)
{
GEOM::GEOM_Object_var aGEOMObject;
//Get the shapes
aLen = theShapes.length();
for (ind = 0; ind < aLen; ind++) {
- if (theShapes[ind] == NULL) return aGEOMObject._retn();
- Handle(GEOM_Object) aSh = GetOperations()->GetEngine()->GetObject
- (theShapes[ind]->GetStudyID(), theShapes[ind]->GetEntry());
+ Handle(GEOM_Object) aSh = GetObjectImpl(theShapes[ind]);
if (aSh.IsNull()) return aGEOMObject._retn();
aShapes->Append(aSh);
}
//Get the tools
aLen = theTools.length();
for (ind = 0; ind < aLen; ind++) {
- if (theTools[ind] == NULL) return aGEOMObject._retn();
- Handle(GEOM_Object) aSh = GetOperations()->GetEngine()->GetObject
- (theTools[ind]->GetStudyID(), theTools[ind]->GetEntry());
+ Handle(GEOM_Object) aSh = GetObjectImpl(theTools[ind]);
if (aSh.IsNull()) return aGEOMObject._retn();
aTools->Append(aSh);
}
//Get the keep inside shapes
aLen = theKeepIns.length();
for (ind = 0; ind < aLen; ind++) {
- if (theKeepIns[ind] == NULL) return aGEOMObject._retn();
- Handle(GEOM_Object) aSh = GetOperations()->GetEngine()->GetObject
- (theKeepIns[ind]->GetStudyID(), theKeepIns[ind]->GetEntry());
+ Handle(GEOM_Object) aSh = GetObjectImpl(theKeepIns[ind]);
if (aSh.IsNull()) return aGEOMObject._retn();
aKeepIns->Append(aSh);
}
//Get the remove inside shapes
aLen = theRemoveIns.length();
for (ind = 0; ind < aLen; ind++) {
- if (theRemoveIns[ind] == NULL) return aGEOMObject._retn();
- Handle(GEOM_Object) aSh = GetOperations()->GetEngine()->GetObject
- (theRemoveIns[ind]->GetStudyID(), theRemoveIns[ind]->GetEntry());
+ Handle(GEOM_Object) aSh = GetObjectImpl(theRemoveIns[ind]);
if (aSh.IsNull()) return aGEOMObject._retn();
aRemIns->Append(aSh);
}
// Make Partition
Handle(GEOM_Object) anObject =
GetOperations()->MakePartition(aShapes, aTools, aKeepIns, aRemIns,
- theLimit, theRemoveWebs, aMaterials,
- theKeepNonlimitShapes,
- /*PerformSelfIntersections*/Standard_False);
+ theLimit, theRemoveWebs, aMaterials,
+ theKeepNonlimitShapes,
+ /*PerformSelfIntersections*/Standard_False);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_IBooleanOperations_i::MakeHalfPartition
(GEOM::GEOM_Object_ptr theShape,
- GEOM::GEOM_Object_ptr thePlane)
+ GEOM::GEOM_Object_ptr thePlane)
{
GEOM::GEOM_Object_var aGEOMObject;
//Set a not done flag
GetOperations()->SetNotDone();
- if (theShape == NULL || thePlane == NULL) return aGEOMObject._retn();
-
//Get the reference shapes
- Handle(GEOM_Object) aSh = GetOperations()->GetEngine()->GetObject
- (theShape->GetStudyID(), theShape->GetEntry());
- Handle(GEOM_Object) aPl = GetOperations()->GetEngine()->GetObject
- (thePlane->GetStudyID(), thePlane->GetEntry());
+ Handle(GEOM_Object) aSh = GetObjectImpl(theShape);
+ Handle(GEOM_Object) aPl = GetObjectImpl(thePlane);
if (aSh.IsNull() || aPl.IsNull()) return aGEOMObject._retn();
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
+
#include <Standard_Stream.hxx>
#include "GEOM_ICurvesOperations_i.hh"
*/
//=============================================================================
GEOM_ICurvesOperations_i::GEOM_ICurvesOperations_i (PortableServer::POA_ptr thePOA,
- GEOM::GEOM_Gen_ptr theEngine,
- ::GEOMImpl_ICurvesOperations* theImpl)
+ GEOM::GEOM_Gen_ptr theEngine,
+ ::GEOMImpl_ICurvesOperations* theImpl)
:GEOM_IOperations_i(thePOA, theEngine, theImpl)
{
MESSAGE("GEOM_ICurvesOperations_i::GEOM_ICurvesOperations_i");
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_ICurvesOperations_i::MakeCirclePntVecR
(GEOM::GEOM_Object_ptr thePnt, GEOM::GEOM_Object_ptr theVec,
- CORBA::Double theR)
+ CORBA::Double theR)
{
GEOM::GEOM_Object_var aGEOMObject;
//Get the arguments
Handle(GEOM_Object) aPnt, aVec;
if (!CORBA::is_nil(thePnt)) {
- aPnt = GetOperations()->GetEngine()->GetObject
- (thePnt->GetStudyID(), thePnt->GetEntry());
+ aPnt = GetObjectImpl(thePnt);
if (aPnt.IsNull()) return aGEOMObject._retn();
}
if (!CORBA::is_nil(theVec)) {
- aVec = GetOperations()->GetEngine()->GetObject
- (theVec->GetStudyID(), theVec->GetEntry());
+ aVec = GetObjectImpl(theVec);
if (aVec.IsNull()) return aGEOMObject._retn();
}
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_ICurvesOperations_i::MakeCircleThreePnt
(GEOM::GEOM_Object_ptr thePnt1, GEOM::GEOM_Object_ptr thePnt2,
- GEOM::GEOM_Object_ptr thePnt3)
+ GEOM::GEOM_Object_ptr thePnt3)
{
GEOM::GEOM_Object_var aGEOMObject;
//Set a not done flag
GetOperations()->SetNotDone();
- if (thePnt1 == NULL || thePnt2 == NULL || thePnt3 == NULL) return aGEOMObject._retn();
-
//Get the reference points
- Handle(GEOM_Object) aPnt1 = GetOperations()->GetEngine()->GetObject
- (thePnt1->GetStudyID(), thePnt1->GetEntry());
- Handle(GEOM_Object) aPnt2 = GetOperations()->GetEngine()->GetObject
- (thePnt2->GetStudyID(), thePnt2->GetEntry());
- Handle(GEOM_Object) aPnt3 = GetOperations()->GetEngine()->GetObject
- (thePnt3->GetStudyID(), thePnt3->GetEntry());
+ Handle(GEOM_Object) aPnt1 = GetObjectImpl(thePnt1);
+ Handle(GEOM_Object) aPnt2 = GetObjectImpl(thePnt2);
+ Handle(GEOM_Object) aPnt3 = GetObjectImpl(thePnt3);
if (aPnt1.IsNull() || aPnt2.IsNull() || aPnt3.IsNull()) return aGEOMObject._retn();
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_ICurvesOperations_i::MakeCircleCenter2Pnt
(GEOM::GEOM_Object_ptr thePnt1, GEOM::GEOM_Object_ptr thePnt2,
- GEOM::GEOM_Object_ptr thePnt3)
+ GEOM::GEOM_Object_ptr thePnt3)
{
GEOM::GEOM_Object_var aGEOMObject;
//Set a not done flag
GetOperations()->SetNotDone();
- if (thePnt1 == NULL || thePnt2 == NULL || thePnt3 == NULL) return aGEOMObject._retn();
-
//Get the reference points
- Handle(GEOM_Object) aPnt1 = GetOperations()->GetEngine()->GetObject
- (thePnt1->GetStudyID(), thePnt1->GetEntry());
- Handle(GEOM_Object) aPnt2 = GetOperations()->GetEngine()->GetObject
- (thePnt2->GetStudyID(), thePnt2->GetEntry());
- Handle(GEOM_Object) aPnt3 = GetOperations()->GetEngine()->GetObject
- (thePnt3->GetStudyID(), thePnt3->GetEntry());
+ Handle(GEOM_Object) aPnt1 = GetObjectImpl(thePnt1);
+ Handle(GEOM_Object) aPnt2 = GetObjectImpl(thePnt2);
+ Handle(GEOM_Object) aPnt3 = GetObjectImpl(thePnt3);
if (aPnt1.IsNull() || aPnt2.IsNull() || aPnt3.IsNull()) return aGEOMObject._retn();
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_ICurvesOperations_i::MakeEllipse
(GEOM::GEOM_Object_ptr thePnt, GEOM::GEOM_Object_ptr theVec,
- CORBA::Double theRMajor, double theRMinor)
+ CORBA::Double theRMajor, double theRMinor)
{
GEOM::GEOM_Object_var aGEOMObject;
//Get the arguments
Handle(GEOM_Object) aPnt, aVec, aVecMaj;
if (!CORBA::is_nil(thePnt)) {
- aPnt = GetOperations()->GetEngine()->GetObject
- (thePnt->GetStudyID(), thePnt->GetEntry());
+ aPnt = GetObjectImpl(thePnt);
if (aPnt.IsNull()) return aGEOMObject._retn();
}
if (!CORBA::is_nil(theVec)) {
- aVec = GetOperations()->GetEngine()->GetObject
- (theVec->GetStudyID(), theVec->GetEntry());
+ aVec = GetObjectImpl(theVec);
if (aVec.IsNull()) return aGEOMObject._retn();
}
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_ICurvesOperations_i::MakeEllipseVec
(GEOM::GEOM_Object_ptr thePnt, GEOM::GEOM_Object_ptr theVec,
- CORBA::Double theRMajor, double theRMinor,
- GEOM::GEOM_Object_ptr theVecMaj)
+ CORBA::Double theRMajor, double theRMinor,
+ GEOM::GEOM_Object_ptr theVecMaj)
{
GEOM::GEOM_Object_var aGEOMObject;
//Get the arguments
Handle(GEOM_Object) aPnt, aVec, aVecMaj;
if (!CORBA::is_nil(thePnt)) {
- aPnt = GetOperations()->GetEngine()->GetObject
- (thePnt->GetStudyID(), thePnt->GetEntry());
+ aPnt = GetObjectImpl(thePnt);
if (aPnt.IsNull()) return aGEOMObject._retn();
}
if (!CORBA::is_nil(theVec)) {
- aVec = GetOperations()->GetEngine()->GetObject
- (theVec->GetStudyID(), theVec->GetEntry());
+ aVec = GetObjectImpl(theVec);
if (aVec.IsNull()) return aGEOMObject._retn();
}
if (!CORBA::is_nil(theVecMaj)) {
- aVecMaj = GetOperations()->GetEngine()->GetObject
- (theVecMaj->GetStudyID(), theVecMaj->GetEntry());
+ aVecMaj = GetObjectImpl(theVecMaj);
if (aVecMaj.IsNull()) return aGEOMObject._retn();
}
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_ICurvesOperations_i::MakeArc
(GEOM::GEOM_Object_ptr thePnt1,
- GEOM::GEOM_Object_ptr thePnt2,
- GEOM::GEOM_Object_ptr thePnt3)
+ GEOM::GEOM_Object_ptr thePnt2,
+ GEOM::GEOM_Object_ptr thePnt3)
{
GEOM::GEOM_Object_var aGEOMObject;
//Set a not done flag
GetOperations()->SetNotDone();
- if (thePnt1 == NULL || thePnt2 == NULL || thePnt3 == NULL) return aGEOMObject._retn();
-
//Get the reference points
- Handle(GEOM_Object) aPnt1 = GetOperations()->GetEngine()->GetObject
- (thePnt1->GetStudyID(), thePnt1->GetEntry());
- Handle(GEOM_Object) aPnt2 = GetOperations()->GetEngine()->GetObject
- (thePnt2->GetStudyID(), thePnt2->GetEntry());
- Handle(GEOM_Object) aPnt3 = GetOperations()->GetEngine()->GetObject
- (thePnt3->GetStudyID(), thePnt3->GetEntry());
+ Handle(GEOM_Object) aPnt1 = GetObjectImpl(thePnt1);
+ Handle(GEOM_Object) aPnt2 = GetObjectImpl(thePnt2);
+ Handle(GEOM_Object) aPnt3 = GetObjectImpl(thePnt3);
if (aPnt1.IsNull() || aPnt2.IsNull() || aPnt3.IsNull()) return aGEOMObject._retn();
//Set a not done flag
GetOperations()->SetNotDone();
- if (thePnt1 == NULL || thePnt2 == NULL || thePnt3 == NULL) return aGEOMObject._retn();
-
//Get the reference points
- Handle(GEOM_Object) aPnt1 = GetOperations()->GetEngine()->GetObject
- (thePnt1->GetStudyID(), thePnt1->GetEntry());
- Handle(GEOM_Object) aPnt2 = GetOperations()->GetEngine()->GetObject
- (thePnt2->GetStudyID(), thePnt2->GetEntry());
- Handle(GEOM_Object) aPnt3 = GetOperations()->GetEngine()->GetObject
- (thePnt3->GetStudyID(), thePnt3->GetEntry());
+ Handle(GEOM_Object) aPnt1 = GetObjectImpl(thePnt1);
+ Handle(GEOM_Object) aPnt2 = GetObjectImpl(thePnt2);
+ Handle(GEOM_Object) aPnt3 = GetObjectImpl(thePnt3);
if (aPnt1.IsNull() || aPnt2.IsNull() || aPnt3.IsNull()) return aGEOMObject._retn();
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_ICurvesOperations_i::MakeArcOfEllipse
(GEOM::GEOM_Object_ptr thePnt1,
- GEOM::GEOM_Object_ptr thePnt2,
- GEOM::GEOM_Object_ptr thePnt3)
+ GEOM::GEOM_Object_ptr thePnt2,
+ GEOM::GEOM_Object_ptr thePnt3)
{
GEOM::GEOM_Object_var aGEOMObject;
//Set a not done flag
GetOperations()->SetNotDone();
- if (thePnt1 == NULL || thePnt2 == NULL || thePnt3 == NULL) return aGEOMObject._retn();
-
//Get the reference points
- Handle(GEOM_Object) aPnt1 = GetOperations()->GetEngine()->GetObject
- (thePnt1->GetStudyID(), thePnt1->GetEntry());
- Handle(GEOM_Object) aPnt2 = GetOperations()->GetEngine()->GetObject
- (thePnt2->GetStudyID(), thePnt2->GetEntry());
- Handle(GEOM_Object) aPnt3 = GetOperations()->GetEngine()->GetObject
- (thePnt3->GetStudyID(), thePnt3->GetEntry());
+ Handle(GEOM_Object) aPnt1 = GetObjectImpl(thePnt1);
+ Handle(GEOM_Object) aPnt2 = GetObjectImpl(thePnt2);
+ Handle(GEOM_Object) aPnt3 = GetObjectImpl(thePnt3);
if (aPnt1.IsNull() || aPnt2.IsNull() || aPnt3.IsNull()) return aGEOMObject._retn();
int aLen = thePoints.length();
list<Handle(GEOM_Object)> aPoints;
for (; ind < aLen; ind++) {
- if (thePoints[ind] == NULL) return aGEOMObject._retn();
-
- Handle(GEOM_Object) aPnt = GetOperations()->GetEngine()->GetObject
- (thePoints[ind]->GetStudyID(), thePoints[ind]->GetEntry());
-
+ Handle(GEOM_Object) aPnt = GetObjectImpl(thePoints[ind]);
if (aPnt.IsNull()) return aGEOMObject._retn();
aPoints.push_back(aPnt);
}
int aLen = thePoints.length();
list<Handle(GEOM_Object)> aPoints;
for (; ind < aLen; ind++) {
- if (thePoints[ind] == NULL) return aGEOMObject._retn();
-
- Handle(GEOM_Object) aPnt = GetOperations()->GetEngine()->GetObject
- (thePoints[ind]->GetStudyID(), thePoints[ind]->GetEntry());
-
+ Handle(GEOM_Object) aPnt = GetObjectImpl(thePoints[ind]);
if (aPnt.IsNull()) return aGEOMObject._retn();
aPoints.push_back(aPnt);
}
int aLen = thePoints.length();
list<Handle(GEOM_Object)> aPoints;
for (; ind < aLen; ind++) {
- if (thePoints[ind] == NULL) return aGEOMObject._retn();
-
- Handle(GEOM_Object) aPnt = GetOperations()->GetEngine()->GetObject
- (thePoints[ind]->GetStudyID(), thePoints[ind]->GetEntry());
-
+ Handle(GEOM_Object) aPnt = GetObjectImpl(thePoints[ind]);
if (aPnt.IsNull()) return aGEOMObject._retn();
aPoints.push_back(aPnt);
}
//Set a not done flag
GetOperations()->SetNotDone();
- Handle(GEOM_Object) aWorkingPlane = GetOperations()->GetEngine()->GetObject
- (theWorkingPlane->GetStudyID(), theWorkingPlane->GetEntry());
+ Handle(GEOM_Object) aWorkingPlane = GetObjectImpl(theWorkingPlane);
// Make Sketcher
Handle(GEOM_Object) anObject =
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
+
#include <Standard_Stream.hxx>
#include "GEOM_IGroupOperations_i.hh"
*/
//=============================================================================
GEOM_IGroupOperations_i::GEOM_IGroupOperations_i (PortableServer::POA_ptr thePOA,
- GEOM::GEOM_Gen_ptr theEngine,
- ::GEOMImpl_IGroupOperations* theImpl)
+ GEOM::GEOM_Gen_ptr theEngine,
+ ::GEOMImpl_IGroupOperations* theImpl)
:GEOM_IOperations_i(thePOA, theEngine, theImpl)
{
MESSAGE("GEOM_IGroupOperations_i::GEOM_IGroupOperations_i");
/*!
* CreateGroup
*/
-//=============================================================================
-GEOM::GEOM_Object_ptr GEOM_IGroupOperations_i::CreateGroup(GEOM::GEOM_Object_ptr theMainShape, CORBA::Long theShapeType)
+//=============================================================================
+GEOM::GEOM_Object_ptr GEOM_IGroupOperations_i::CreateGroup(GEOM::GEOM_Object_ptr theMainShape,
+ CORBA::Long theShapeType)
{
GEOM::GEOM_Object_var aGEOMObject;
//Set a not done flag
GetOperations()->SetNotDone();
- if (theMainShape == NULL || theShapeType < 0) return aGEOMObject._retn();
+ if (theShapeType < 0) return aGEOMObject._retn();
//Get the reference shape
- Handle(GEOM_Object) aShapeRef = GetOperations()->GetEngine()->GetObject(theMainShape->GetStudyID(), theMainShape->GetEntry());
-
+ Handle(GEOM_Object) aShapeRef = GetObjectImpl(theMainShape);
if (aShapeRef.IsNull()) return aGEOMObject._retn();
//Create the Fillet
* AddObject
*/
//=============================================================================
-void GEOM_IGroupOperations_i::AddObject(GEOM::GEOM_Object_ptr theGroup, CORBA::Long theSubShapeId)
+void GEOM_IGroupOperations_i::AddObject(GEOM::GEOM_Object_ptr theGroup, CORBA::Long theSubShapeId)
{
//Set a not done flag
GetOperations()->SetNotDone();
- if (theGroup == NULL) return;
-
//Get the reference group
- Handle(GEOM_Object) aGroupRef = GetOperations()->GetEngine()->GetObject(theGroup->GetStudyID(), theGroup->GetEntry());
+ Handle(GEOM_Object) aGroupRef = GetObjectImpl(theGroup);
if (aGroupRef.IsNull()) return;
GetOperations()->AddObject(aGroupRef, theSubShapeId);
- return;
}
//=============================================================================
/*!
* RemoveObject
*/
-//=============================================================================
-void GEOM_IGroupOperations_i::RemoveObject(GEOM::GEOM_Object_ptr theGroup, CORBA::Long theSubShapeId)
+//=============================================================================
+void GEOM_IGroupOperations_i::RemoveObject(GEOM::GEOM_Object_ptr theGroup, CORBA::Long theSubShapeId)
{
//Set a not done flag
GetOperations()->SetNotDone();
- if (theGroup == NULL) return;
-
//Get the reference group
- Handle(GEOM_Object) aGroupRef = GetOperations()->GetEngine()->GetObject(theGroup->GetStudyID(), theGroup->GetEntry());
+ Handle(GEOM_Object) aGroupRef = GetObjectImpl(theGroup);
if (aGroupRef.IsNull()) return;
GetOperations()->RemoveObject(aGroupRef, theSubShapeId);
-
- return;
}
//=============================================================================
*/
//=============================================================================
void GEOM_IGroupOperations_i::UnionList (GEOM::GEOM_Object_ptr theGroup,
- const GEOM::ListOfGO& theSubShapes)
+ const GEOM::ListOfGO& theSubShapes)
{
//Set a not done flag
GetOperations()->SetNotDone();
- if (theGroup == NULL) return;
-
//Get the reference group
- Handle(GEOM_Object) aGroupRef = GetOperations()->GetEngine()->GetObject
- (theGroup->GetStudyID(), theGroup->GetEntry());
+ Handle(GEOM_Object) aGroupRef = GetObjectImpl(theGroup);
if (aGroupRef.IsNull()) return;
//Get sub-shape to add
int ind, aLen = theSubShapes.length();
for (ind = 0; ind < aLen; ind++) {
- if (theSubShapes[ind] == NULL) return;
- Handle(GEOM_Object) aSh = GetOperations()->GetEngine()->GetObject
- (theSubShapes[ind]->GetStudyID(), theSubShapes[ind]->GetEntry());
+ Handle(GEOM_Object) aSh = GetObjectImpl(theSubShapes[ind]);
if (aSh.IsNull()) return;
aSubShapes->Append(aSh);
}
//Perform the operation
GetOperations()->UnionList(aGroupRef, aSubShapes);
- return;
}
//=============================================================================
*/
//=============================================================================
void GEOM_IGroupOperations_i::DifferenceList (GEOM::GEOM_Object_ptr theGroup,
- const GEOM::ListOfGO& theSubShapes)
+ const GEOM::ListOfGO& theSubShapes)
{
//Set a not done flag
GetOperations()->SetNotDone();
- if (theGroup == NULL) return;
-
//Get the reference group
- Handle(GEOM_Object) aGroupRef = GetOperations()->GetEngine()->GetObject
- (theGroup->GetStudyID(), theGroup->GetEntry());
+ Handle(GEOM_Object) aGroupRef = GetObjectImpl(theGroup);
if (aGroupRef.IsNull()) return;
//Get sub-shape to remove
int ind, aLen = theSubShapes.length();
for (ind = 0; ind < aLen; ind++) {
- if (theSubShapes[ind] == NULL) return;
- Handle(GEOM_Object) aSh = GetOperations()->GetEngine()->GetObject
- (theSubShapes[ind]->GetStudyID(), theSubShapes[ind]->GetEntry());
+ Handle(GEOM_Object) aSh = GetObjectImpl(theSubShapes[ind]);
if (aSh.IsNull()) return;
aSubShapes->Append(aSh);
}
//Perform the operation
GetOperations()->DifferenceList(aGroupRef, aSubShapes);
- return;
}
//=============================================================================
*/
//=============================================================================
void GEOM_IGroupOperations_i::UnionIDs (GEOM::GEOM_Object_ptr theGroup,
- const GEOM::ListOfLong& theSubShapes)
+ const GEOM::ListOfLong& theSubShapes)
{
//Set a not done flag
GetOperations()->SetNotDone();
- if (theGroup == NULL) return;
-
//Get the reference group
- Handle(GEOM_Object) aGroupRef = GetOperations()->GetEngine()->GetObject
- (theGroup->GetStudyID(), theGroup->GetEntry());
+ Handle(GEOM_Object) aGroupRef = GetObjectImpl(theGroup);
if (aGroupRef.IsNull()) return;
//Get sub-shape to add
*/
//=============================================================================
void GEOM_IGroupOperations_i::DifferenceIDs (GEOM::GEOM_Object_ptr theGroup,
- const GEOM::ListOfLong& theSubShapes)
+ const GEOM::ListOfLong& theSubShapes)
{
//Set a not done flag
GetOperations()->SetNotDone();
- if (theGroup == NULL) return;
-
//Get the reference group
- Handle(GEOM_Object) aGroupRef = GetOperations()->GetEngine()->GetObject
- (theGroup->GetStudyID(), theGroup->GetEntry());
+ Handle(GEOM_Object) aGroupRef = GetObjectImpl(theGroup);
if (aGroupRef.IsNull()) return;
//Get sub-shape to remove
/*!
* GetType
*/
-//=============================================================================
+//=============================================================================
CORBA::Long GEOM_IGroupOperations_i::GetType(GEOM::GEOM_Object_ptr theGroup)
{
//Set a not done flag
GetOperations()->SetNotDone();
- if (theGroup == NULL) return -1;
-
//Get the reference group
- Handle(GEOM_Object) aGroupRef = GetOperations()->GetEngine()->GetObject(theGroup->GetStudyID(), theGroup->GetEntry());
-
+ Handle(GEOM_Object) aGroupRef = GetObjectImpl(theGroup);
if (aGroupRef.IsNull()) return -1;
return GetOperations()->GetType(aGroupRef);
/*!
* GetMainShape
*/
-//=============================================================================
+//=============================================================================
GEOM::GEOM_Object_ptr GEOM_IGroupOperations_i::GetMainShape(GEOM::GEOM_Object_ptr theGroup)
{
GEOM::GEOM_Object_var aGEOMObject;
//Set a not done flag
GetOperations()->SetNotDone();
- if (theGroup == NULL) return aGEOMObject._retn();
-
//Get the reference group
- Handle(GEOM_Object) aGroupRef = GetOperations()->GetEngine()->GetObject(theGroup->GetStudyID(), theGroup->GetEntry());
+ Handle(GEOM_Object) aGroupRef = GetObjectImpl(theGroup);
if (aGroupRef.IsNull()) return aGEOMObject._retn();
Handle(GEOM_Object) anObject = GetOperations()->GetMainShape(aGroupRef);
/*!
* GetObjects
*/
-//=============================================================================
+//=============================================================================
GEOM::ListOfLong* GEOM_IGroupOperations_i::GetObjects(GEOM::GEOM_Object_ptr theGroup)
{
GEOM::ListOfLong_var aList;
//Set a not done flag
GetOperations()->SetNotDone();
- if (theGroup == NULL) return aList._retn();
-
//Get the reference group
- Handle(GEOM_Object) aGroupRef = GetOperations()->GetEngine()->GetObject(theGroup->GetStudyID(), theGroup->GetEntry());
+ Handle(GEOM_Object) aGroupRef = GetObjectImpl(theGroup);
if (aGroupRef.IsNull()) return aList._retn();
- aList = new GEOM::ListOfLong;
+ aList = new GEOM::ListOfLong;
Handle(TColStd_HArray1OfInteger) aSeq = GetOperations()->GetObjects(aGroupRef);
if (!GetOperations()->IsDone() || aSeq.IsNull()) return aList._retn();
-
+
aList->length(aSeq->Length());
for(int i = 1; i<=aSeq->Length(); i++) aList[i-1] = aSeq->Value(i);
return aList._retn();
}
-
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
+
#include <Standard_Stream.hxx>
#include <list>
//=============================================================================
GEOM_IHealingOperations_i::GEOM_IHealingOperations_i (PortableServer::POA_ptr thePOA,
- GEOM::GEOM_Gen_ptr theEngine,
- ::GEOMImpl_IHealingOperations* theImpl)
+ GEOM::GEOM_Gen_ptr theEngine,
+ ::GEOMImpl_IHealingOperations* theImpl)
:GEOM_IOperations_i(thePOA, theEngine, theImpl)
{
MESSAGE("GEOM_IHealingOperations_i::GEOM_IHealingOperations_i");
*/
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_IHealingOperations_i::ProcessShape (GEOM::GEOM_Object_ptr theObject,
- const GEOM::string_array& theOperations,
- const GEOM::string_array& theParams,
- const GEOM::string_array& theValues)
+ const GEOM::string_array& theOperations,
+ const GEOM::string_array& theParams,
+ const GEOM::string_array& theValues)
{
GEOM::GEOM_Object_var aGEOMObject;
// Set a not done flag
GetOperations()->SetNotDone();
- // Check parameters
- if ( CORBA::is_nil(theObject) )
- return aGEOMObject._retn();
-
// Check if theOperations has more than 0 elements and theParams and theValues have the same length
-// if ( theOperations.length() <= 0 || theParams.length() != theValues.length() )
-// return aGEOMObject._retn();
+ //if (theOperations.length() <= 0 || theParams.length() != theValues.length())
+ // return aGEOMObject._retn();
// Get the object itself
- Handle(GEOM_Object) anObject =
- GetOperations()->GetEngine()->GetObject(theObject->GetStudyID(), theObject->GetEntry());
- if ( anObject.IsNull() )
+ Handle(GEOM_Object) anObject = GetObjectImpl(theObject);
+ if (anObject.IsNull())
return aGEOMObject._retn();
// Perform
anOpArray[i] = CORBA::string_dup( (*opIt).c_str() );
for ( i = 0, parIt = paramsList.begin(), valIt = valuesList.begin();
- parIt != paramsList.end(); i++, ++parIt,++valIt ) {
+ parIt != paramsList.end(); i++, ++parIt,++valIt ) {
aParArray[i] = CORBA::string_dup( (*parIt).c_str() );
aValArray[i] = CORBA::string_dup( (*valIt).c_str() );
}
* GetOperatorParameters
*/
//=============================================================================
-void GEOM_IHealingOperations_i::GetOperatorParameters (const char* theOperator,
- GEOM::string_array_out theParams,
- GEOM::string_array_out theValues)
+void GEOM_IHealingOperations_i::GetOperatorParameters (const char* theOperator,
+ GEOM::string_array_out theParams,
+ GEOM::string_array_out theValues)
{
GEOM::string_array_var aParArray = new GEOM::string_array();
GEOM::string_array_var aValArray = new GEOM::string_array();
int i;
for ( i = 0, parIt = paramsList.begin(), valIt = valuesList.begin();
parIt != paramsList.end(); i++, ++parIt,++valIt ) {
- aParArray[i] = CORBA::string_dup( (*parIt).c_str() );
- aValArray[i] = CORBA::string_dup( (*valIt).c_str() );
+ aParArray[i] = CORBA::string_dup( (*parIt).c_str() );
+ aValArray[i] = CORBA::string_dup( (*valIt).c_str() );
}
}
}
*/
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_IHealingOperations_i::SuppressFaces (GEOM::GEOM_Object_ptr theObject,
- const GEOM::short_array& theFaces)
+ const GEOM::short_array& theFaces)
{
GEOM::GEOM_Object_var aGEOMObject;
// Set a not done flag
GetOperations()->SetNotDone();
- // Check parameters
- if ( CORBA::is_nil(theObject) ) // if theFaces is empty - it's OK, it means that ALL faces must be removed
- return aGEOMObject._retn();
-
// Get the object itself
- Handle(GEOM_Object) anObject =
- GetOperations()->GetEngine()->GetObject(theObject->GetStudyID(), theObject->GetEntry());
+ Handle(GEOM_Object) anObject = GetObjectImpl(theObject);
if (anObject.IsNull())
return aGEOMObject._retn();
+ // if theFaces is empty - it's OK, it means that ALL faces must be removed
+
// Perform
Handle(GEOM_Object) aNewObject =
GetOperations()->SuppressFaces( anObject, Convert( theFaces ) );
*/
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_IHealingOperations_i::CloseContour (GEOM::GEOM_Object_ptr theObject,
- const GEOM::short_array& theWires,
- CORBA::Boolean isCommonVertex)
+ const GEOM::short_array& theWires,
+ CORBA::Boolean isCommonVertex)
{
GEOM::GEOM_Object_var aGEOMObject;
// Set a not done flag
GetOperations()->SetNotDone();
- // Check parameters
- if ( CORBA::is_nil(theObject) )
- return aGEOMObject._retn();
-
// Get the object itself
- Handle(GEOM_Object) anObject =
- GetOperations()->GetEngine()->GetObject(theObject->GetStudyID(), theObject->GetEntry());
+ Handle(GEOM_Object) anObject = GetObjectImpl(theObject);
if (anObject.IsNull())
return aGEOMObject._retn();
*/
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_IHealingOperations_i::RemoveIntWires (GEOM::GEOM_Object_ptr theObject,
- const GEOM::short_array& theWires)
+ const GEOM::short_array& theWires)
{
GEOM::GEOM_Object_var aGEOMObject;
// Set a not done flag
GetOperations()->SetNotDone();
- // Check parameters
- if ( CORBA::is_nil(theObject) ) // if theWires is empty - it's OK, it means that ALL wires should be removed
- return aGEOMObject._retn();
-
// Get the object itself
- Handle(GEOM_Object) anObject =
- GetOperations()->GetEngine()->GetObject(theObject->GetStudyID(), theObject->GetEntry());
+ Handle(GEOM_Object) anObject = GetObjectImpl(theObject);
if (anObject.IsNull())
return aGEOMObject._retn();
+ // if theWires is empty - it's OK, it means that ALL wires should be removed
+
// Perform
Handle(GEOM_Object) aNewObject =
GetOperations()->RemoveIntWires( anObject, Convert( theWires ) );
*/
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_IHealingOperations_i::FillHoles (GEOM::GEOM_Object_ptr theObject,
- const GEOM::short_array& theWires)
+ const GEOM::short_array& theWires)
{
GEOM::GEOM_Object_var aGEOMObject;
// Set a not done flag
GetOperations()->SetNotDone();
- // Check parameters
- if ( CORBA::is_nil(theObject) ) // if theWires is empty - it's OK, it means that ALL wires should be removed
- return aGEOMObject._retn();
-
// Get the object itself
- Handle(GEOM_Object) anObject =
- GetOperations()->GetEngine()->GetObject(theObject->GetStudyID(), theObject->GetEntry());
+ Handle(GEOM_Object) anObject = GetObjectImpl(theObject);
if (anObject.IsNull())
return aGEOMObject._retn();
+ // if theWires is empty - it's OK, it means that ALL wires should be removed
+
// Perform
Handle(GEOM_Object) aNewObject =
GetOperations()->FillHoles( anObject, Convert( theWires ) );
*/
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_IHealingOperations_i::Sew (GEOM::GEOM_Object_ptr theObject,
- CORBA::Double theTolerance)
+ CORBA::Double theTolerance)
{
GEOM::GEOM_Object_var aGEOMObject;
GetOperations()->SetNotDone();
// Check parameters
- if ( CORBA::is_nil(theObject) || theTolerance < 0 )
+ if (theTolerance < 0)
return aGEOMObject._retn();
// Get the object itself
- Handle(GEOM_Object) anObject =
- GetOperations()->GetEngine()->GetObject(theObject->GetStudyID(), theObject->GetEntry());
+ Handle(GEOM_Object) anObject = GetObjectImpl(theObject);
if (anObject.IsNull())
return aGEOMObject._retn();
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_IHealingOperations_i::DivideEdge (GEOM::GEOM_Object_ptr theObject,
CORBA::Short theIndex,
- CORBA::Double theValue,
- CORBA::Boolean isByParameter)
+ CORBA::Double theValue,
+ CORBA::Boolean isByParameter)
{
GEOM::GEOM_Object_var aGEOMObject;
GetOperations()->SetNotDone();
// Check parameters
- if ( CORBA::is_nil(theObject) || theValue < 0 || theValue > 1 )
+ if (theValue < 0 || theValue > 1)
return aGEOMObject._retn();
// Get the object itself
- Handle(GEOM_Object) anObject =
- GetOperations()->GetEngine()->GetObject(theObject->GetStudyID(), theObject->GetEntry());
+ Handle(GEOM_Object) anObject = GetObjectImpl(theObject);
if (anObject.IsNull())
return aGEOMObject._retn();
*/
//=============================================================================
CORBA::Boolean GEOM_IHealingOperations_i::GetFreeBoundary ( GEOM::GEOM_Object_ptr theObject,
- GEOM::ListOfGO_out theClosedWires,
- GEOM::ListOfGO_out theOpenWires )
+ GEOM::ListOfGO_out theClosedWires,
+ GEOM::ListOfGO_out theOpenWires )
{
theClosedWires = new GEOM::ListOfGO;
theOpenWires = new GEOM::ListOfGO;
// Set a not done flag
GetOperations()->SetNotDone();
- if ( CORBA::is_nil(theObject) )
- return false;
-
// Get the object itself
- Handle(GEOM_Object) anObject =
- GetOperations()->GetEngine()->GetObject(theObject->GetStudyID(), theObject->GetEntry());
+ Handle(GEOM_Object) anObject = GetObjectImpl(theObject);
if (anObject.IsNull())
return false;
bool res = GetOperations()->GetFreeBoundary( anObject, aClosed, anOpen );
if ( !GetOperations()->IsDone() || !res )
- return false;
+ return false;
int i, n = aClosed->Length();
theClosedWires->length( n );
aGEOMObject = GEOM::GEOM_Object::_duplicate(theObject);
// Get the object itself
- Handle(GEOM_Object) anObject =
- GetOperations()->GetEngine()->GetObject(theObject->GetStudyID(), theObject->GetEntry());
+ Handle(GEOM_Object) anObject = GetObjectImpl(theObject);
if (anObject.IsNull())
return aGEOMObject._retn();
// return aGEOMObject._retn();
//return GetObject(aNewObject);
- return aGEOMObject._retn();
+ return aGEOMObject._retn();
}
// Set a not done flag
GetOperations()->SetNotDone();
- // Check parameters
- if ( CORBA::is_nil(theObject) )
- return aGEOMObject._retn();
-
// Get the object itself
- Handle(GEOM_Object) anObject =
- GetOperations()->GetEngine()->GetObject(theObject->GetStudyID(), theObject->GetEntry());
+ Handle(GEOM_Object) anObject = GetObjectImpl(theObject);
if (anObject.IsNull())
return aGEOMObject._retn();
return GetObject(aNewObject);
}
-
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
+
#ifdef WNT
#pragma warning( disable:4786 )
#endif
*/
//=============================================================================
GEOM_IInsertOperations_i::GEOM_IInsertOperations_i (PortableServer::POA_ptr thePOA,
- GEOM::GEOM_Gen_ptr theEngine,
- ::GEOMImpl_IInsertOperations* theImpl)
+ GEOM::GEOM_Gen_ptr theEngine,
+ ::GEOMImpl_IInsertOperations* theImpl)
:GEOM_IOperations_i(thePOA, theEngine, theImpl)
{
MESSAGE("GEOM_IInsertOperations_i::GEOM_IInsertOperations_i");
//Set a not done flag
GetOperations()->SetNotDone();
- if (theOriginal == NULL) return aGEOMObject._retn();
-
//Get the reference shape
- Handle(GEOM_Object) anOriginal =
- GetOperations()->GetEngine()->GetObject(theOriginal->GetStudyID(),
- theOriginal->GetEntry());
-
+ Handle(GEOM_Object) anOriginal = GetObjectImpl(theOriginal);
if (anOriginal.IsNull()) return aGEOMObject._retn();
//Create the copy
//=============================================================================
void GEOM_IInsertOperations_i::Export
(GEOM::GEOM_Object_ptr theOriginal,
- const char* theFileName,
- const char* theFormatName)
+ const char* theFileName,
+ const char* theFormatName)
{
GEOM::GEOM_Object_var aGEOMObject = GEOM::GEOM_Object::_duplicate(theOriginal);
//Set a not done flag
GetOperations()->SetNotDone();
- if (theOriginal == NULL) return;
-
//Get the reference shape
- Handle(GEOM_Object) anOriginal =
- GetOperations()->GetEngine()->GetObject(theOriginal->GetStudyID(),
- theOriginal->GetEntry());
-
+ Handle(GEOM_Object) anOriginal = GetObjectImpl(theOriginal);
if (anOriginal.IsNull()) return;
//Export the shape to the file
GetOperations()->Export(anOriginal, aFileName, aFormatName);
free(aFileName);
free(aFormatName);
-
- return;
}
//=============================================================================
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_IInsertOperations_i::Import
(const char* theFileName,
- const char* theFormatName)
+ const char* theFormatName)
{
GEOM::GEOM_Object_var aGEOMObject;
// fill the local CORBA arrays with values from sequences
CORBA::Long i = 1;
for (; i <= formSize; i++) {
- aFormatsArray[i-1] = CORBA::string_dup(aFormats->Value(i).ToCString());
- aPatternsArray[i-1] = CORBA::string_dup(aPatterns->Value(i).ToCString());
+ aFormatsArray[i-1] = CORBA::string_dup(aFormats->Value(i).ToCString());
+ aPatternsArray[i-1] = CORBA::string_dup(aPatterns->Value(i).ToCString());
}
}
}
// fill the local CORBA arrays with values from sequences
CORBA::Long i = 1;
for (; i <= formSize; i++) {
- aFormatsArray[i-1] = CORBA::string_dup(aFormats->Value(i).ToCString());
- aPatternsArray[i-1] = CORBA::string_dup(aPatterns->Value(i).ToCString());
+ aFormatsArray[i-1] = CORBA::string_dup(aFormats->Value(i).ToCString());
+ aPatternsArray[i-1] = CORBA::string_dup(aPatterns->Value(i).ToCString());
}
}
}
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
+
#include <Standard_Stream.hxx>
#include "GEOM_ILocalOperations_i.hh"
*/
//=============================================================================
GEOM_ILocalOperations_i::GEOM_ILocalOperations_i (PortableServer::POA_ptr thePOA,
- GEOM::GEOM_Gen_ptr theEngine,
- ::GEOMImpl_ILocalOperations* theImpl)
+ GEOM::GEOM_Gen_ptr theEngine,
+ ::GEOMImpl_ILocalOperations* theImpl)
:GEOM_IOperations_i(thePOA, theEngine, theImpl)
{
MESSAGE("GEOM_ILocalOperations_i::GEOM_ILocalOperations_i");
{
GEOM::GEOM_Object_var aGEOMObject;
- if (theShape == NULL) return aGEOMObject._retn();
-
//Get the reference shape
- Handle(GEOM_Object) aShapeRef = GetOperations()->GetEngine()->GetObject
- (theShape->GetStudyID(), theShape->GetEntry());
-
+ Handle(GEOM_Object) aShapeRef = GetObjectImpl(theShape);
if (aShapeRef.IsNull()) return aGEOMObject._retn();
//Create the Fillet
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_ILocalOperations_i::MakeFilletEdges
(GEOM::GEOM_Object_ptr theShape, CORBA::Double theR,
- const GEOM::ListOfLong& theEdges)
+ const GEOM::ListOfLong& theEdges)
{
GEOM::GEOM_Object_var aGEOMObject;
- if (theShape == NULL) return aGEOMObject._retn();
-
//Get the reference shape
- Handle(GEOM_Object) aShapeRef = GetOperations()->GetEngine()->GetObject
- (theShape->GetStudyID(), theShape->GetEntry());
+ Handle(GEOM_Object) aShapeRef = GetObjectImpl(theShape);
if (aShapeRef.IsNull()) return aGEOMObject._retn();
//Get the reference edges
{
GEOM::GEOM_Object_var aGEOMObject;
- if (theShape == NULL) return aGEOMObject._retn();
-
//Get the reference shape
- Handle(GEOM_Object) aShapeRef = GetOperations()->GetEngine()->GetObject
- (theShape->GetStudyID(), theShape->GetEntry());
+ Handle(GEOM_Object) aShapeRef = GetObjectImpl(theShape);
if (aShapeRef.IsNull()) return aGEOMObject._retn();
//Get the reference edges
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_ILocalOperations_i::MakeFilletFaces
(GEOM::GEOM_Object_ptr theShape, CORBA::Double theR,
- const GEOM::ListOfLong& theFaces)
+ const GEOM::ListOfLong& theFaces)
{
GEOM::GEOM_Object_var aGEOMObject;
- if (theShape == NULL) return aGEOMObject._retn();
-
//Get the reference shape
- Handle(GEOM_Object) aShapeRef = GetOperations()->GetEngine()->GetObject
- (theShape->GetStudyID(), theShape->GetEntry());
+ Handle(GEOM_Object) aShapeRef = GetObjectImpl(theShape);
if (aShapeRef.IsNull()) return aGEOMObject._retn();
//Get the reference faces
{
GEOM::GEOM_Object_var aGEOMObject;
- if (theShape == NULL) return aGEOMObject._retn();
-
//Get the reference shape
- Handle(GEOM_Object) aShapeRef = GetOperations()->GetEngine()->GetObject
- (theShape->GetStudyID(), theShape->GetEntry());
+ Handle(GEOM_Object) aShapeRef = GetObjectImpl(theShape);
if (aShapeRef.IsNull()) return aGEOMObject._retn();
//Get the reference faces
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_ILocalOperations_i::MakeFillet2D
(GEOM::GEOM_Object_ptr theShape, CORBA::Double theR,
- const GEOM::ListOfLong& theVertexes)
+ const GEOM::ListOfLong& theVertexes)
{
GEOM::GEOM_Object_var aGEOMObject;
- if (theShape == NULL) return aGEOMObject._retn();
-
//Get the reference shape
- Handle(GEOM_Object) aShapeRef = GetOperations()->GetEngine()->GetObject
- (theShape->GetStudyID(), theShape->GetEntry());
+ Handle(GEOM_Object) aShapeRef = GetObjectImpl(theShape);
if (aShapeRef.IsNull()) return aGEOMObject._retn();
//Get the reference vertex
{
GEOM::GEOM_Object_var aGEOMObject;
- if (theShape == NULL) return aGEOMObject._retn();
-
//Get the reference shape
- Handle(GEOM_Object) aShapeRef = GetOperations()->GetEngine()->GetObject
- (theShape->GetStudyID(), theShape->GetEntry());
-
+ Handle(GEOM_Object) aShapeRef = GetObjectImpl(theShape);
if (aShapeRef.IsNull()) return aGEOMObject._retn();
//Create the Chamfer
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_ILocalOperations_i::MakeChamferEdge
(GEOM::GEOM_Object_ptr theShape,
- CORBA::Double theD1, CORBA::Double theD2,
- CORBA::Long theFace1, CORBA::Long theFace2)
+ CORBA::Double theD1, CORBA::Double theD2,
+ CORBA::Long theFace1, CORBA::Long theFace2)
{
GEOM::GEOM_Object_var aGEOMObject;
- if (theShape == NULL) return aGEOMObject._retn();
-
//Get the reference shape
- Handle(GEOM_Object) aShapeRef = GetOperations()->GetEngine()->GetObject
- (theShape->GetStudyID(), theShape->GetEntry());
+ Handle(GEOM_Object) aShapeRef = GetObjectImpl(theShape);
if (aShapeRef.IsNull()) return aGEOMObject._retn();
//Create the Chamfer
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_ILocalOperations_i::MakeChamferEdgeAD
(GEOM::GEOM_Object_ptr theShape,
- CORBA::Double theD, CORBA::Double theAngle,
- CORBA::Long theFace1, CORBA::Long theFace2)
+ CORBA::Double theD, CORBA::Double theAngle,
+ CORBA::Long theFace1, CORBA::Long theFace2)
{
GEOM::GEOM_Object_var aGEOMObject;
- if (theShape == NULL) return aGEOMObject._retn();
-
//Get the reference shape
- Handle(GEOM_Object) aShapeRef = GetOperations()->GetEngine()->GetObject
- (theShape->GetStudyID(), theShape->GetEntry());
+ Handle(GEOM_Object) aShapeRef = GetObjectImpl(theShape);
if (aShapeRef.IsNull()) return aGEOMObject._retn();
//Create the Chamfer
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_ILocalOperations_i::MakeChamferFaces
(GEOM::GEOM_Object_ptr theShape,
- CORBA::Double theD1, CORBA::Double theD2,
- const GEOM::ListOfLong& theFaces)
+ CORBA::Double theD1, CORBA::Double theD2,
+ const GEOM::ListOfLong& theFaces)
{
GEOM::GEOM_Object_var aGEOMObject;
- if (theShape == NULL) return aGEOMObject._retn();
-
//Get the reference shape
- Handle(GEOM_Object) aShapeRef = GetOperations()->GetEngine()->GetObject
- (theShape->GetStudyID(), theShape->GetEntry());
+ Handle(GEOM_Object) aShapeRef = GetObjectImpl(theShape);
if (aShapeRef.IsNull()) return aGEOMObject._retn();
//Get the reference faces
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_ILocalOperations_i::MakeChamferFacesAD
(GEOM::GEOM_Object_ptr theShape,
- CORBA::Double theD, CORBA::Double theAngle,
- const GEOM::ListOfLong& theFaces)
+ CORBA::Double theD, CORBA::Double theAngle,
+ const GEOM::ListOfLong& theFaces)
{
GEOM::GEOM_Object_var aGEOMObject;
- if (theShape == NULL) return aGEOMObject._retn();
-
//Get the reference shape
- Handle(GEOM_Object) aShapeRef = GetOperations()->GetEngine()->GetObject
- (theShape->GetStudyID(), theShape->GetEntry());
+ Handle(GEOM_Object) aShapeRef = GetObjectImpl(theShape);
if (aShapeRef.IsNull()) return aGEOMObject._retn();
//Get the reference faces
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_ILocalOperations_i::MakeChamferEdges
(GEOM::GEOM_Object_ptr theShape,
- CORBA::Double theD1, CORBA::Double theD2,
- const GEOM::ListOfLong& theEdges)
+ CORBA::Double theD1, CORBA::Double theD2,
+ const GEOM::ListOfLong& theEdges)
{
GEOM::GEOM_Object_var aGEOMObject;
- if (theShape == NULL) return aGEOMObject._retn();
-
//Get the reference shape
- Handle(GEOM_Object) aShapeRef = GetOperations()->GetEngine()->GetObject
- (theShape->GetStudyID(), theShape->GetEntry());
+ Handle(GEOM_Object) aShapeRef = GetObjectImpl(theShape);
if (aShapeRef.IsNull()) return aGEOMObject._retn();
//Get the reference edges
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_ILocalOperations_i::MakeChamferEdgesAD
(GEOM::GEOM_Object_ptr theShape,
- CORBA::Double theD, CORBA::Double theAngle,
- const GEOM::ListOfLong& theEdges)
+ CORBA::Double theD, CORBA::Double theAngle,
+ const GEOM::ListOfLong& theEdges)
{
GEOM::GEOM_Object_var aGEOMObject;
- if (theShape == NULL) return aGEOMObject._retn();
-
//Get the reference shape
- Handle(GEOM_Object) aShapeRef = GetOperations()->GetEngine()->GetObject
- (theShape->GetStudyID(), theShape->GetEntry());
+ Handle(GEOM_Object) aShapeRef = GetObjectImpl(theShape);
if (aShapeRef.IsNull()) return aGEOMObject._retn();
//Get the reference edges
*/
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_ILocalOperations_i::MakeArchimede (GEOM::GEOM_Object_ptr theShape,
- CORBA::Double theWeight,
- CORBA::Double theWaterDensity,
- CORBA::Double theMeshingDeflection)
+ CORBA::Double theWeight,
+ CORBA::Double theWaterDensity,
+ CORBA::Double theMeshingDeflection)
{
GEOM::GEOM_Object_var aGEOMObject;
- if (theShape == NULL) return aGEOMObject._retn();
-
//Get the reference shape
- Handle(GEOM_Object) aShapeRef = GetOperations()->GetEngine()->GetObject
- (theShape->GetStudyID(), theShape->GetEntry());
+ Handle(GEOM_Object) aShapeRef = GetObjectImpl(theShape);
if (aShapeRef.IsNull()) return aGEOMObject._retn();
//Create the Archimede
CORBA::Long GEOM_ILocalOperations_i::GetSubShapeIndex
(GEOM::GEOM_Object_ptr theShape, GEOM::GEOM_Object_ptr theSubShape)
{
- if (theShape == NULL || theSubShape == NULL) return -1;
-
//Get the reference shapes
- Handle(GEOM_Object) aShapeRef = GetOperations()->GetEngine()->GetObject
- (theShape->GetStudyID(), theShape->GetEntry());
- Handle(GEOM_Object) aSubShapeRef = GetOperations()->GetEngine()->GetObject
- (theSubShape->GetStudyID(), theSubShape->GetEntry());
+ Handle(GEOM_Object) aShapeRef = GetObjectImpl(theShape);
+ Handle(GEOM_Object) aSubShapeRef = GetObjectImpl(theSubShape);
if (aShapeRef.IsNull() || aSubShapeRef.IsNull()) return -1;
//Get the unique ID of <theSubShape> inside <theShape>
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
+
#include "GEOM_IOperations_i.hh"
#include "GEOM_Engine.hxx"
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_IOperations_i::GetObject(Handle(GEOM_Object) theObject)
{
- if(theObject.IsNull()) return NULL;
+ GEOM::GEOM_Object_var GO;
+ if (theObject.IsNull()) return GO._retn();
TCollection_AsciiString anEntry;
TDF_Tool::Entry(theObject->GetEntry(), anEntry);
- GEOM::GEOM_Object_var GO = _engine->GetObject(theObject->GetDocID(), anEntry.ToCString());
+ GO = _engine->GetObject(theObject->GetDocID(), anEntry.ToCString());
return GO._retn();
}
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
+
#include <Standard_Stream.hxx>
#include "GEOM_IShapesOperations_i.hh"
*/
//=============================================================================
GEOM_IShapesOperations_i::GEOM_IShapesOperations_i (PortableServer::POA_ptr thePOA,
- GEOM::GEOM_Gen_ptr theEngine,
- ::GEOMImpl_IShapesOperations* theImpl)
+ GEOM::GEOM_Gen_ptr theEngine,
+ ::GEOMImpl_IShapesOperations* theImpl)
:GEOM_IOperations_i(thePOA, theEngine, theImpl)
{
MESSAGE("GEOM_IShapesOperations_i::GEOM_IShapesOperations_i");
//Set a not done flag
GetOperations()->SetNotDone();
- if (thePnt1 == NULL || thePnt2 == NULL) return aGEOMObject._retn();
-
//Get the reference points
- Handle(GEOM_Object) aPnt1 = GetOperations()->GetEngine()->GetObject
- (thePnt1->GetStudyID(), thePnt1->GetEntry());
- Handle(GEOM_Object) aPnt2 = GetOperations()->GetEngine()->GetObject
- (thePnt2->GetStudyID(), thePnt2->GetEntry());
+ Handle(GEOM_Object) aPnt1 = GetObjectImpl(thePnt1);
+ Handle(GEOM_Object) aPnt2 = GetObjectImpl(thePnt2);
if (aPnt1.IsNull() || aPnt2.IsNull()) return aGEOMObject._retn();
//Get the shapes
aLen = theEdgesAndWires.length();
for (ind = 0; ind < aLen; ind++) {
- if (theEdgesAndWires[ind] == NULL) return aGEOMObject._retn();
- Handle(GEOM_Object) aSh = GetOperations()->GetEngine()->GetObject
- (theEdgesAndWires[ind]->GetStudyID(), theEdgesAndWires[ind]->GetEntry());
+ Handle(GEOM_Object) aSh = GetObjectImpl(theEdgesAndWires[ind]);
if (aSh.IsNull()) return aGEOMObject._retn();
aShapes.push_back(aSh);
}
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_IShapesOperations_i::MakeFace
(GEOM::GEOM_Object_ptr theWire,
- const CORBA::Boolean isPlanarWanted)
+ const CORBA::Boolean isPlanarWanted)
{
GEOM::GEOM_Object_var aGEOMObject;
//Set a not done flag
GetOperations()->SetNotDone();
- if (theWire == NULL) return aGEOMObject._retn();
-
//Get the reference wire
- Handle(GEOM_Object) aWire = GetOperations()->GetEngine()->GetObject
- (theWire->GetStudyID(), theWire->GetEntry());
-
+ Handle(GEOM_Object) aWire = GetObjectImpl(theWire);
if (aWire.IsNull()) return aGEOMObject._retn();
//Create the Face
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_IShapesOperations_i::MakeFaceWires
(const GEOM::ListOfGO& theWires,
- const CORBA::Boolean isPlanarWanted)
+ const CORBA::Boolean isPlanarWanted)
{
GEOM::GEOM_Object_var aGEOMObject;
//Get the shapes
aLen = theWires.length();
for (ind = 0; ind < aLen; ind++) {
- if (theWires[ind] == NULL) return aGEOMObject._retn();
- Handle(GEOM_Object) aSh = GetOperations()->GetEngine()->GetObject
- (theWires[ind]->GetStudyID(), theWires[ind]->GetEntry());
+ Handle(GEOM_Object) aSh = GetObjectImpl(theWires[ind]);
if (aSh.IsNull()) return aGEOMObject._retn();
aShapes.push_back(aSh);
}
//Get the shapes
aLen = theFacesAndShells.length();
for (ind = 0; ind < aLen; ind++) {
- if (theFacesAndShells[ind] == NULL) return aGEOMObject._retn();
- Handle(GEOM_Object) aSh = GetOperations()->GetEngine()->GetObject
- (theFacesAndShells[ind]->GetStudyID(), theFacesAndShells[ind]->GetEntry());
+ Handle(GEOM_Object) aSh = GetObjectImpl(theFacesAndShells[ind]);
if (aSh.IsNull()) return aGEOMObject._retn();
aShapes.push_back(aSh);
}
//Set a not done flag
GetOperations()->SetNotDone();
- if (theShell == NULL) return aGEOMObject._retn();
-
//Get the reference objects
- Handle(GEOM_Object) aShell = GetOperations()->GetEngine()->GetObject
- (theShell->GetStudyID(), theShell->GetEntry());
-
+ Handle(GEOM_Object) aShell = GetObjectImpl(theShell);
if (aShell.IsNull()) return aGEOMObject._retn();
//Create the Solid
//Get the shapes
aLen = theShells.length();
for (ind = 0; ind < aLen; ind++) {
- if (theShells[ind] == NULL) return aGEOMObject._retn();
- Handle(GEOM_Object) aSh = GetOperations()->GetEngine()->GetObject
- (theShells[ind]->GetStudyID(), theShells[ind]->GetEntry());
+ Handle(GEOM_Object) aSh = GetObjectImpl(theShells[ind]);
if (aSh.IsNull()) return aGEOMObject._retn();
aShapes.push_back(aSh);
}
//Get the shapes
aLen = theShapes.length();
for (ind = 0; ind < aLen; ind++) {
- if (theShapes[ind] == NULL) return aGEOMObject._retn();
- Handle(GEOM_Object) aSh = GetOperations()->GetEngine()->GetObject
- (theShapes[ind]->GetStudyID(), theShapes[ind]->GetEntry());
+ Handle(GEOM_Object) aSh = GetObjectImpl(theShapes[ind]);
if (aSh.IsNull()) return aGEOMObject._retn();
aShapes.push_back(aSh);
}
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_IShapesOperations_i::MakeGlueFaces
(GEOM::GEOM_Object_ptr theShape,
- CORBA::Double theTolerance,
- CORBA::Boolean doKeepNonSolids)
+ CORBA::Double theTolerance,
+ CORBA::Boolean doKeepNonSolids)
{
GEOM::GEOM_Object_var aGEOMObject;
//Set a not done flag
GetOperations()->SetNotDone();
- if (theShape == NULL) return aGEOMObject._retn();
-
//Get the reference objects
- Handle(GEOM_Object) aShape = GetOperations()->GetEngine()->GetObject
- (theShape->GetStudyID(), theShape->GetEntry());
-
+ Handle(GEOM_Object) aShape = GetObjectImpl(theShape);
if (aShape.IsNull()) return aGEOMObject._retn();
//Perform the gluing
//=============================================================================
GEOM::ListOfGO* GEOM_IShapesOperations_i::GetGlueFaces
(GEOM::GEOM_Object_ptr theShape,
- const CORBA::Double theTolerance)
+ const CORBA::Double theTolerance)
{
GEOM::ListOfGO_var aSeq = new GEOM::ListOfGO;
//Set a not done flag
GetOperations()->SetNotDone();
- if (theShape == NULL) return aSeq._retn();
-
//Get the reference objects
- Handle(GEOM_Object) aShape = GetOperations()->GetEngine()->GetObject
- (theShape->GetStudyID(), theShape->GetEntry());
+ Handle(GEOM_Object) aShape = GetObjectImpl(theShape);
if (aShape.IsNull()) return aSeq._retn();
Handle(TColStd_HSequenceOfTransient) aHSeq =
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_IShapesOperations_i::MakeGlueFacesByList
(GEOM::GEOM_Object_ptr theShape,
- CORBA::Double theTolerance,
- const GEOM::ListOfGO& theFaces,
- CORBA::Boolean doKeepNonSolids)
+ CORBA::Double theTolerance,
+ const GEOM::ListOfGO& theFaces,
+ CORBA::Boolean doKeepNonSolids)
{
GEOM::GEOM_Object_var aGEOMObject;
//Set a not done flag
GetOperations()->SetNotDone();
- if (theShape == NULL) return aGEOMObject._retn();
-
//Get the reference objects
- Handle(GEOM_Object) aShape = GetOperations()->GetEngine()->GetObject
- (theShape->GetStudyID(), theShape->GetEntry());
-
+ Handle(GEOM_Object) aShape = GetObjectImpl(theShape);
if (aShape.IsNull()) return aGEOMObject._retn();
int ind, aLen;
//Get the shapes
aLen = theFaces.length();
for (ind = 0; ind < aLen; ind++) {
- if (theFaces[ind] == NULL) return aGEOMObject._retn();
- Handle(GEOM_Object) aSh = GetOperations()->GetEngine()->GetObject
- (theFaces[ind]->GetStudyID(), theFaces[ind]->GetEntry());
+ Handle(GEOM_Object) aSh = GetObjectImpl(theFaces[ind]);
if (aSh.IsNull()) return aGEOMObject._retn();
aFaces.push_back(aSh);
}
*/
//=============================================================================
GEOM::ListOfGO* GEOM_IShapesOperations_i::MakeExplode (GEOM::GEOM_Object_ptr theShape,
- const CORBA::Long theShapeType,
- const CORBA::Boolean isSorted)
+ const CORBA::Long theShapeType,
+ const CORBA::Boolean isSorted)
{
GEOM::ListOfGO_var aSeq = new GEOM::ListOfGO;
- if (theShape == NULL) return aSeq._retn();
- Handle(GEOM_Object) aShape = GetOperations()->GetEngine()->GetObject
- (theShape->GetStudyID(), theShape->GetEntry());
+ Handle(GEOM_Object) aShape = GetObjectImpl(theShape);
+ if (aShape.IsNull()) return aSeq._retn();
Handle(TColStd_HSequenceOfTransient) aHSeq =
GetOperations()->MakeExplode(aShape, theShapeType, isSorted);
*/
//=============================================================================
GEOM::ListOfLong* GEOM_IShapesOperations_i::SubShapeAllIDs (GEOM::GEOM_Object_ptr theShape,
- const CORBA::Long theShapeType,
- const CORBA::Boolean isSorted)
+ const CORBA::Long theShapeType,
+ const CORBA::Boolean isSorted)
{
GEOM::ListOfLong_var aSeq = new GEOM::ListOfLong;
- if (theShape == NULL) return aSeq._retn();
- Handle(GEOM_Object) aShape = GetOperations()->GetEngine()->GetObject
- (theShape->GetStudyID(), theShape->GetEntry());
+ Handle(GEOM_Object) aShape = GetObjectImpl(theShape);
+ if (aShape.IsNull()) return aSeq._retn();
Handle(TColStd_HSequenceOfInteger) aHSeq =
GetOperations()->SubShapeAllIDs(aShape, theShapeType, isSorted);
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_IShapesOperations_i::GetSubShape
(GEOM::GEOM_Object_ptr theMainShape,
- const CORBA::Long theID)
+ const CORBA::Long theID)
{
GEOM::GEOM_Object_var aGEOMObject;
//Set a not done flag
GetOperations()->SetNotDone();
- if (theMainShape == NULL) return aGEOMObject._retn();
-
//Get the reference objects
- Handle(GEOM_Object) aShape = GetOperations()->GetEngine()->GetObject
- (theMainShape->GetStudyID(), theMainShape->GetEntry());
-
+ Handle(GEOM_Object) aShape = GetObjectImpl(theMainShape);
if (aShape.IsNull()) return aGEOMObject._retn();
Handle(GEOM_Object) anObject = GetOperations()->GetSubShape(aShape, theID);
CORBA::Long GEOM_IShapesOperations_i::GetSubShapeIndex
(GEOM::GEOM_Object_ptr theMainShape, GEOM::GEOM_Object_ptr theSubShape)
{
- if (theMainShape == NULL || theSubShape == NULL) return -1;
-
//Get the reference shapes
- Handle(GEOM_Object) aMainShapeRef = GetOperations()->GetEngine()->GetObject
- (theMainShape->GetStudyID(), theMainShape->GetEntry());
- Handle(GEOM_Object) aSubShapeRef = GetOperations()->GetEngine()->GetObject
- (theSubShape->GetStudyID(), theSubShape->GetEntry());
+ Handle(GEOM_Object) aMainShapeRef = GetObjectImpl(theMainShape);
+ Handle(GEOM_Object) aSubShapeRef = GetObjectImpl(theSubShape);
+
if (aMainShapeRef.IsNull() || aSubShapeRef.IsNull()) return -1;
//Get the unique ID of <theSubShape> inside <theMainShape>
CORBA::Long GEOM_IShapesOperations_i::GetTopologyIndex
(GEOM::GEOM_Object_ptr theMainShape, GEOM::GEOM_Object_ptr theSubShape)
{
- if (theMainShape == NULL || theSubShape == NULL) return -1;
-
//Get the reference shapes
- Handle(GEOM_Object) aMainShapeRef = GetOperations()->GetEngine()->GetObject
- (theMainShape->GetStudyID(), theMainShape->GetEntry());
- Handle(GEOM_Object) aSubShapeRef = GetOperations()->GetEngine()->GetObject
- (theSubShape->GetStudyID(), theSubShape->GetEntry());
+ Handle(GEOM_Object) aMainShapeRef = GetObjectImpl(theMainShape);
+ Handle(GEOM_Object) aSubShapeRef = GetObjectImpl(theSubShape);
+
if (aMainShapeRef.IsNull() || aSubShapeRef.IsNull()) return -1;
//Get an ID of <theSubShape>, unique among all sub-shapes of <theMainShape> of the same type
//=============================================================================
char* GEOM_IShapesOperations_i::GetShapeTypeString (GEOM::GEOM_Object_ptr theShape)
{
- if (theShape == NULL) return NULL;
-
//Get the reference shape
- Handle(GEOM_Object) aShape = GetOperations()->GetEngine()->GetObject
- (theShape->GetStudyID(), theShape->GetEntry());
-
+ Handle(GEOM_Object) aShape = GetObjectImpl(theShape);
if (aShape.IsNull()) return NULL;
// Get shape parameters
//=============================================================================
CORBA::Long GEOM_IShapesOperations_i::NumberOfFaces (GEOM::GEOM_Object_ptr theShape)
{
- if (theShape == NULL) return -1;
-
- Handle(GEOM_Object) aShape = GetOperations()->GetEngine()->GetObject
- (theShape->GetStudyID(), theShape->GetEntry());
+ Handle(GEOM_Object) aShape = GetObjectImpl(theShape);
+ if (aShape.IsNull()) return -1;
CORBA::Long aNb = GetOperations()->NumberOfFaces(aShape);
if (!GetOperations()->IsDone()) return -1;
//=============================================================================
CORBA::Long GEOM_IShapesOperations_i::NumberOfEdges (GEOM::GEOM_Object_ptr theShape)
{
- if (theShape == NULL) return -1;
-
- Handle(GEOM_Object) aShape = GetOperations()->GetEngine()->GetObject
- (theShape->GetStudyID(), theShape->GetEntry());
+ Handle(GEOM_Object) aShape = GetObjectImpl(theShape);
+ if (aShape.IsNull()) return -1;
CORBA::Long aNb = GetOperations()->NumberOfEdges(aShape);
if (!GetOperations()->IsDone()) return -1;
//Set a not done flag
GetOperations()->SetNotDone();
- if (theShape == NULL) return aGEOMObject._retn();
-
//Get the reference objects
- Handle(GEOM_Object) aShape = GetOperations()->GetEngine()->GetObject
- (theShape->GetStudyID(), theShape->GetEntry());
-
+ Handle(GEOM_Object) aShape = GetObjectImpl(theShape);
if (aShape.IsNull()) return aGEOMObject._retn();
//Create the Solid
GetOperations()->SetNotDone();
GEOM::ListOfLong_var aSeq = new GEOM::ListOfLong;
- if (theShape == NULL) return aSeq._retn();
- Handle(GEOM_Object) aShape = GetOperations()->GetEngine()->GetObject
- (theShape->GetStudyID(), theShape->GetEntry());
+ Handle(GEOM_Object) aShape = GetObjectImpl(theShape);
+ if (aShape.IsNull()) return aSeq._retn();
Handle(TColStd_HSequenceOfInteger) aHSeq =
GetOperations()->GetFreeFacesIDs(aShape);
//=============================================================================
GEOM::ListOfGO* GEOM_IShapesOperations_i::GetSharedShapes
(GEOM::GEOM_Object_ptr theShape1,
- GEOM::GEOM_Object_ptr theShape2,
- const CORBA::Long theShapeType)
+ GEOM::GEOM_Object_ptr theShape2,
+ const CORBA::Long theShapeType)
{
//Set a not done flag
GetOperations()->SetNotDone();
GEOM::ListOfGO_var aSeq = new GEOM::ListOfGO;
- if (theShape1 == NULL ||
- theShape2 == NULL) return aSeq._retn();
- Handle(GEOM_Object) aShape1 = GetOperations()->GetEngine()->GetObject
- (theShape1->GetStudyID(), theShape1->GetEntry());
- Handle(GEOM_Object) aShape2 = GetOperations()->GetEngine()->GetObject
- (theShape2->GetStudyID(), theShape2->GetEntry());
+ Handle(GEOM_Object) aShape1 = GetObjectImpl(theShape1);
+ Handle(GEOM_Object) aShape2 = GetObjectImpl(theShape2);
- if (aShape1.IsNull() ||
- aShape2.IsNull()) return aSeq._retn();
+ if (aShape1.IsNull() || aShape2.IsNull()) return aSeq._retn();
Handle(TColStd_HSequenceOfTransient) aHSeq =
GetOperations()->GetSharedShapes(aShape1, aShape2, theShapeType);
//=============================================================================
GEOM::ListOfGO* GEOM_IShapesOperations_i::GetShapesOnPlane
(GEOM::GEOM_Object_ptr theShape,
- const CORBA::Long theShapeType,
- GEOM::GEOM_Object_ptr theAx1,
- const GEOM::shape_state theState)
+ const CORBA::Long theShapeType,
+ GEOM::GEOM_Object_ptr theAx1,
+ const GEOM::shape_state theState)
{
GEOM::ListOfGO_var aSeq = new GEOM::ListOfGO;
//Set a not done flag
GetOperations()->SetNotDone();
- if (theShape == NULL || theAx1 == NULL) return aSeq._retn();
-
//Get the reference objects
- Handle(GEOM_Object) aShape = GetOperations()->GetEngine()->GetObject
- (theShape->GetStudyID(), theShape->GetEntry());
- Handle(GEOM_Object) anAx1 = GetOperations()->GetEngine()->GetObject
- (theAx1->GetStudyID(), theAx1->GetEntry());
+ Handle(GEOM_Object) aShape = GetObjectImpl(theShape);
+ Handle(GEOM_Object) anAx1 = GetObjectImpl(theAx1);
if (aShape.IsNull() || anAx1.IsNull()) return aSeq._retn();
//=============================================================================
GEOM::ListOfGO* GEOM_IShapesOperations_i::GetShapesOnPlaneWithLocation
(GEOM::GEOM_Object_ptr theShape,
- const CORBA::Long theShapeType,
- GEOM::GEOM_Object_ptr theAx1,
- GEOM::GEOM_Object_ptr thePnt,
- const GEOM::shape_state theState)
+ const CORBA::Long theShapeType,
+ GEOM::GEOM_Object_ptr theAx1,
+ GEOM::GEOM_Object_ptr thePnt,
+ const GEOM::shape_state theState)
{
GEOM::ListOfGO_var aSeq = new GEOM::ListOfGO;
//Set a not done flag
GetOperations()->SetNotDone();
- if (theShape == NULL || theAx1 == NULL || thePnt == NULL) return aSeq._retn();
-
//Get the reference objects
- Handle(GEOM_Object) aShape = GetOperations()->GetEngine()->GetObject
- (theShape->GetStudyID(), theShape->GetEntry());
- Handle(GEOM_Object) anAx1 = GetOperations()->GetEngine()->GetObject
- (theAx1->GetStudyID(), theAx1->GetEntry());
- Handle(GEOM_Object) anPnt = GetOperations()->GetEngine()->GetObject
- (thePnt->GetStudyID(), thePnt->GetEntry());
+ Handle(GEOM_Object) aShape = GetObjectImpl(theShape);
+ Handle(GEOM_Object) anAx1 = GetObjectImpl(theAx1);
+ Handle(GEOM_Object) anPnt = GetObjectImpl(thePnt);
if (aShape.IsNull() || anAx1.IsNull() || anPnt.IsNull()) return aSeq._retn();
//=============================================================================
GEOM::ListOfGO* GEOM_IShapesOperations_i::GetShapesOnCylinder
(GEOM::GEOM_Object_ptr theShape,
- const CORBA::Long theShapeType,
- GEOM::GEOM_Object_ptr theAxis,
- const CORBA::Double theRadius,
- const GEOM::shape_state theState)
+ const CORBA::Long theShapeType,
+ GEOM::GEOM_Object_ptr theAxis,
+ const CORBA::Double theRadius,
+ const GEOM::shape_state theState)
{
GEOM::ListOfGO_var aSeq = new GEOM::ListOfGO;
//Set a not done flag
GetOperations()->SetNotDone();
- if (theShape == NULL || theAxis == NULL) return aSeq._retn();
-
//Get the reference objects
- Handle(GEOM_Object) aShape = GetOperations()->GetEngine()->GetObject
- (theShape->GetStudyID(), theShape->GetEntry());
- Handle(GEOM_Object) anAxis = GetOperations()->GetEngine()->GetObject
- (theAxis->GetStudyID(), theAxis->GetEntry());
+ Handle(GEOM_Object) aShape = GetObjectImpl(theShape);
+ Handle(GEOM_Object) anAxis = GetObjectImpl(theAxis);
if (aShape.IsNull() || anAxis.IsNull()) return aSeq._retn();
//=============================================================================
GEOM::ListOfGO* GEOM_IShapesOperations_i::GetShapesOnSphere
(GEOM::GEOM_Object_ptr theShape,
- const CORBA::Long theShapeType,
- GEOM::GEOM_Object_ptr theCenter,
- const CORBA::Double theRadius,
- const GEOM::shape_state theState)
+ const CORBA::Long theShapeType,
+ GEOM::GEOM_Object_ptr theCenter,
+ const CORBA::Double theRadius,
+ const GEOM::shape_state theState)
{
GEOM::ListOfGO_var aSeq = new GEOM::ListOfGO;
//Set a not done flag
GetOperations()->SetNotDone();
- if (theShape == NULL || theCenter == NULL) return aSeq._retn();
-
//Get the reference objects
- Handle(GEOM_Object) aShape = GetOperations()->GetEngine()->GetObject
- (theShape->GetStudyID(), theShape->GetEntry());
- Handle(GEOM_Object) aCenter = GetOperations()->GetEngine()->GetObject
- (theCenter->GetStudyID(), theCenter->GetEntry());
+ Handle(GEOM_Object) aShape = GetObjectImpl(theShape);
+ Handle(GEOM_Object) aCenter = GetObjectImpl(theCenter);
if (aShape.IsNull() || aCenter.IsNull()) return aSeq._retn();
//Set a not done flag
GetOperations()->SetNotDone();
- if (theShape == NULL ||
- theTopLeftPoint == NULL ||
- theTopRigthPoint == NULL ||
- theBottomLeftPoint == NULL ||
- theBottomRigthPoint == NULL )
- return aSeq._retn();
-
//Get the reference objects
- Handle(GEOM_Object) aShape = GetOperations()->GetEngine()->GetObject
- (theShape->GetStudyID(), theShape->GetEntry());
- Handle(GEOM_Object) aTopLeftPoint = GetOperations()->GetEngine()->GetObject
- (theShape->GetStudyID(), theTopLeftPoint->GetEntry());
- Handle(GEOM_Object) aTopRigthPoint = GetOperations()->GetEngine()->GetObject
- (theShape->GetStudyID(), theTopRigthPoint->GetEntry());
- Handle(GEOM_Object) aBottomLeftPoint = GetOperations()->GetEngine()->GetObject
- (theShape->GetStudyID(), theBottomLeftPoint->GetEntry());
- Handle(GEOM_Object) aBottomRigthPoint = GetOperations()->GetEngine()->GetObject
- (theShape->GetStudyID(), theBottomRigthPoint->GetEntry());
+ Handle(GEOM_Object) aShape = GetObjectImpl(theShape);
+ Handle(GEOM_Object) aTopLeftPoint = GetObjectImpl(theTopLeftPoint);
+ Handle(GEOM_Object) aTopRigthPoint = GetObjectImpl(theTopRigthPoint);
+ Handle(GEOM_Object) aBottomLeftPoint = GetObjectImpl(theBottomLeftPoint);
+ Handle(GEOM_Object) aBottomRigthPoint = GetObjectImpl(theBottomRigthPoint);
if (aShape.IsNull() ||
aTopLeftPoint.IsNull() ||
aTopRigthPoint.IsNull() ||
aBottomLeftPoint.IsNull() ||
- aBottomRigthPoint.IsNull() )
+ aBottomRigthPoint.IsNull())
return aSeq._retn();
//Get Shapes On Quadrangle
//=============================================================================
GEOM::ListOfLong* GEOM_IShapesOperations_i::GetShapesOnPlaneIDs
(GEOM::GEOM_Object_ptr theShape,
- const CORBA::Long theShapeType,
- GEOM::GEOM_Object_ptr theAx1,
- const GEOM::shape_state theState)
+ const CORBA::Long theShapeType,
+ GEOM::GEOM_Object_ptr theAx1,
+ const GEOM::shape_state theState)
{
GEOM::ListOfLong_var aSeq = new GEOM::ListOfLong;
//Set a not done flag
GetOperations()->SetNotDone();
- if (theShape == NULL || theAx1 == NULL) return aSeq._retn();
-
//Get the reference objects
- Handle(GEOM_Object) aShape = GetOperations()->GetEngine()->GetObject
- (theShape->GetStudyID(), theShape->GetEntry());
- Handle(GEOM_Object) anAx1 = GetOperations()->GetEngine()->GetObject
- (theAx1->GetStudyID(), theAx1->GetEntry());
+ Handle(GEOM_Object) aShape = GetObjectImpl(theShape);
+ Handle(GEOM_Object) anAx1 = GetObjectImpl(theAx1);
if (aShape.IsNull() || anAx1.IsNull()) return aSeq._retn();
//=============================================================================
GEOM::ListOfLong* GEOM_IShapesOperations_i::GetShapesOnPlaneWithLocationIDs
(GEOM::GEOM_Object_ptr theShape,
- const CORBA::Long theShapeType,
- GEOM::GEOM_Object_ptr theAx1,
- GEOM::GEOM_Object_ptr thePnt,
- const GEOM::shape_state theState)
+ const CORBA::Long theShapeType,
+ GEOM::GEOM_Object_ptr theAx1,
+ GEOM::GEOM_Object_ptr thePnt,
+ const GEOM::shape_state theState)
{
GEOM::ListOfLong_var aSeq = new GEOM::ListOfLong;
//Set a not done flag
GetOperations()->SetNotDone();
- if (theShape == NULL || theAx1 == NULL || thePnt == NULL) return aSeq._retn();
-
//Get the reference objects
- Handle(GEOM_Object) aShape = GetOperations()->GetEngine()->GetObject
- (theShape->GetStudyID(), theShape->GetEntry());
- Handle(GEOM_Object) anAx1 = GetOperations()->GetEngine()->GetObject
- (theAx1->GetStudyID(), theAx1->GetEntry());
- Handle(GEOM_Object) anPnt = GetOperations()->GetEngine()->GetObject
- (thePnt->GetStudyID(), thePnt->GetEntry());
+ Handle(GEOM_Object) aShape = GetObjectImpl(theShape);
+ Handle(GEOM_Object) anAx1 = GetObjectImpl(theAx1);
+ Handle(GEOM_Object) anPnt = GetObjectImpl(thePnt);
if (aShape.IsNull() || anAx1.IsNull() || anPnt.IsNull()) return aSeq._retn();
//Get Shapes On Plane
Handle(TColStd_HSequenceOfInteger) aHSeq =
- GetOperations()->GetShapesOnPlaneWithLocationIDs(aShape, theShapeType, anAx1, anPnt, ShapeState(theState));
+ GetOperations()->GetShapesOnPlaneWithLocationIDs(aShape, theShapeType,
+ anAx1, anPnt, ShapeState(theState));
if (!GetOperations()->IsDone() || aHSeq.IsNull())
return aSeq._retn();
//=============================================================================
GEOM::ListOfLong* GEOM_IShapesOperations_i::GetShapesOnCylinderIDs
(GEOM::GEOM_Object_ptr theShape,
- const CORBA::Long theShapeType,
- GEOM::GEOM_Object_ptr theAxis,
- const CORBA::Double theRadius,
- const GEOM::shape_state theState)
+ const CORBA::Long theShapeType,
+ GEOM::GEOM_Object_ptr theAxis,
+ const CORBA::Double theRadius,
+ const GEOM::shape_state theState)
{
GEOM::ListOfLong_var aSeq = new GEOM::ListOfLong;
//Set a not done flag
GetOperations()->SetNotDone();
- if (theShape == NULL || theAxis == NULL) return aSeq._retn();
-
//Get the reference objects
- Handle(GEOM_Object) aShape = GetOperations()->GetEngine()->GetObject
- (theShape->GetStudyID(), theShape->GetEntry());
- Handle(GEOM_Object) anAxis = GetOperations()->GetEngine()->GetObject
- (theAxis->GetStudyID(), theAxis->GetEntry());
+ Handle(GEOM_Object) aShape = GetObjectImpl(theShape);
+ Handle(GEOM_Object) anAxis = GetObjectImpl(theAxis);
if (aShape.IsNull() || anAxis.IsNull()) return aSeq._retn();
//=============================================================================
GEOM::ListOfLong* GEOM_IShapesOperations_i::GetShapesOnSphereIDs
(GEOM::GEOM_Object_ptr theShape,
- const CORBA::Long theShapeType,
- GEOM::GEOM_Object_ptr theCenter,
- const CORBA::Double theRadius,
- const GEOM::shape_state theState)
+ const CORBA::Long theShapeType,
+ GEOM::GEOM_Object_ptr theCenter,
+ const CORBA::Double theRadius,
+ const GEOM::shape_state theState)
{
GEOM::ListOfLong_var aSeq = new GEOM::ListOfLong;
//Set a not done flag
GetOperations()->SetNotDone();
- if (theShape == NULL || theCenter == NULL) return aSeq._retn();
-
//Get the reference objects
- Handle(GEOM_Object) aShape = GetOperations()->GetEngine()->GetObject
- (theShape->GetStudyID(), theShape->GetEntry());
- Handle(GEOM_Object) aCenter = GetOperations()->GetEngine()->GetObject
- (theCenter->GetStudyID(), theCenter->GetEntry());
+ Handle(GEOM_Object) aShape = GetObjectImpl(theShape);
+ Handle(GEOM_Object) aCenter = GetObjectImpl(theCenter);
if (aShape.IsNull() || aCenter.IsNull()) return aSeq._retn();
//Set a not done flag
GetOperations()->SetNotDone();
- if (theShape == NULL ||
- theTopLeftPoint == NULL ||
- theTopRigthPoint == NULL ||
- theBottomLeftPoint == NULL ||
- theBottomRigthPoint == NULL )
- return aSeq._retn();
-
//Get the reference objects
- Handle(GEOM_Object) aShape = GetOperations()->GetEngine()->GetObject
- (theShape->GetStudyID(), theShape->GetEntry());
- Handle(GEOM_Object) aTopLeftPoint = GetOperations()->GetEngine()->GetObject
- (theShape->GetStudyID(), theTopLeftPoint->GetEntry());
- Handle(GEOM_Object) aTopRigthPoint = GetOperations()->GetEngine()->GetObject
- (theShape->GetStudyID(), theTopRigthPoint->GetEntry());
- Handle(GEOM_Object) aBottomLeftPoint = GetOperations()->GetEngine()->GetObject
- (theShape->GetStudyID(), theBottomLeftPoint->GetEntry());
- Handle(GEOM_Object) aBottomRigthPoint = GetOperations()->GetEngine()->GetObject
- (theShape->GetStudyID(), theBottomRigthPoint->GetEntry());
+ Handle(GEOM_Object) aShape = GetObjectImpl(theShape);
+ Handle(GEOM_Object) aTopLeftPoint = GetObjectImpl(theTopLeftPoint);
+ Handle(GEOM_Object) aTopRigthPoint = GetObjectImpl(theTopRigthPoint);
+ Handle(GEOM_Object) aBottomLeftPoint = GetObjectImpl(theBottomLeftPoint);
+ Handle(GEOM_Object) aBottomRigthPoint = GetObjectImpl(theBottomRigthPoint);
if (aShape.IsNull() ||
aTopLeftPoint.IsNull() ||
//Set a not done flag
GetOperations()->SetNotDone();
- if ( theShape == NULL || theBox == NULL )
- return aSeq._retn();
-
//Get the reference objects
- Handle(GEOM_Object) aShape = GetOperations()->GetEngine()->GetObject
- (theShape->GetStudyID(), theShape->GetEntry());
- Handle(GEOM_Object) aBox = GetOperations()->GetEngine()->GetObject
- (theShape->GetStudyID(), theBox->GetEntry());
+ Handle(GEOM_Object) aShape = GetObjectImpl(theShape);
+ Handle(GEOM_Object) aBox = GetObjectImpl(theBox);
if (aShape.IsNull() || aBox.IsNull() )
return aSeq._retn();
//=============================================================================
GEOM::ListOfLong* GEOM_IShapesOperations_i::GetShapesOnBoxIDs
(GEOM::GEOM_Object_ptr theBox,
- GEOM::GEOM_Object_ptr theShape,
+ GEOM::GEOM_Object_ptr theShape,
CORBA::Long theShapeType,
GEOM::shape_state theState)
{
//Set a not done flag
GetOperations()->SetNotDone();
- if ( theShape == NULL || theBox == NULL )
- return aSeq._retn();
-
//Get the reference objects
- Handle(GEOM_Object) aShape = GetOperations()->GetEngine()->GetObject
- (theShape->GetStudyID(), theShape->GetEntry());
- Handle(GEOM_Object) aBox = GetOperations()->GetEngine()->GetObject
- (theShape->GetStudyID(), theBox->GetEntry());
+ Handle(GEOM_Object) aShape = GetObjectImpl(theShape);
+ Handle(GEOM_Object) aBox = GetObjectImpl(theBox);
if (aShape.IsNull() || aBox.IsNull() )
return aSeq._retn();
//=============================================================================
GEOM::ListOfGO* GEOM_IShapesOperations_i::GetShapesOnShape
(GEOM::GEOM_Object_ptr theCheckShape,
- GEOM::GEOM_Object_ptr theShape,
- CORBA::Short theShapeType,
- GEOM::shape_state theState)
+ GEOM::GEOM_Object_ptr theShape,
+ CORBA::Short theShapeType,
+ GEOM::shape_state theState)
{
GEOM::ListOfGO_var aSeq = new GEOM::ListOfGO;
//Set a not done flag
GetOperations()->SetNotDone();
- if ( theShape == NULL || theCheckShape == NULL )
- return aSeq._retn();
-
//Get the reference objects
- Handle(GEOM_Object) aShape = GetOperations()->GetEngine()->GetObject
- (theShape->GetStudyID(), theShape->GetEntry());
- Handle(GEOM_Object) aCheckShape = GetOperations()->GetEngine()->GetObject
- (theShape->GetStudyID(), theCheckShape->GetEntry());
+ Handle(GEOM_Object) aShape = GetObjectImpl(theShape);
+ Handle(GEOM_Object) aCheckShape = GetObjectImpl(theCheckShape);
if (aShape.IsNull() || aCheckShape.IsNull() )
return aSeq._retn();
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_IShapesOperations_i::GetShapesOnShapeAsCompound
(GEOM::GEOM_Object_ptr theCheckShape,
- GEOM::GEOM_Object_ptr theShape,
- CORBA::Short theShapeType,
- GEOM::shape_state theState)
+ GEOM::GEOM_Object_ptr theShape,
+ CORBA::Short theShapeType,
+ GEOM::shape_state theState)
{
GEOM::GEOM_Object_var aGEOMObject;
//Set a not done flag
GetOperations()->SetNotDone();
- if ( theShape == NULL || theCheckShape == NULL )
- return aGEOMObject._retn();
-
//Get the reference objects
- Handle(GEOM_Object) aShape = GetOperations()->GetEngine()->GetObject
- (theShape->GetStudyID(), theShape->GetEntry());
- Handle(GEOM_Object) aCheckShape = GetOperations()->GetEngine()->GetObject
- (theShape->GetStudyID(), theCheckShape->GetEntry());
+ Handle(GEOM_Object) aShape = GetObjectImpl(theShape);
+ Handle(GEOM_Object) aCheckShape = GetObjectImpl(theCheckShape);
if (aShape.IsNull() || aCheckShape.IsNull() )
return aGEOMObject._retn();
//=============================================================================
GEOM::ListOfLong* GEOM_IShapesOperations_i::GetShapesOnShapeIDs
(GEOM::GEOM_Object_ptr theCheckShape,
- GEOM::GEOM_Object_ptr theShape,
- CORBA::Short theShapeType,
- GEOM::shape_state theState)
+ GEOM::GEOM_Object_ptr theShape,
+ CORBA::Short theShapeType,
+ GEOM::shape_state theState)
{
GEOM::ListOfLong_var aSeq = new GEOM::ListOfLong;
//Set a not done flag
GetOperations()->SetNotDone();
- if ( theShape == NULL || theCheckShape == NULL )
- return aSeq._retn();
-
//Get the reference objects
- Handle(GEOM_Object) aShape = GetOperations()->GetEngine()->GetObject
- (theShape->GetStudyID(), theShape->GetEntry());
- Handle(GEOM_Object) aCheckShape = GetOperations()->GetEngine()->GetObject
- (theShape->GetStudyID(), theCheckShape->GetEntry());
+ Handle(GEOM_Object) aShape = GetObjectImpl(theShape);
+ Handle(GEOM_Object) aCheckShape = GetObjectImpl(theCheckShape);
if (aShape.IsNull() || aCheckShape.IsNull() )
return aSeq._retn();
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_IShapesOperations_i::GetInPlace
(GEOM::GEOM_Object_ptr theShapeWhere,
- GEOM::GEOM_Object_ptr theShapeWhat)
+ GEOM::GEOM_Object_ptr theShapeWhat)
{
GEOM::GEOM_Object_var aGEOMObject;
//Set a not done flag
GetOperations()->SetNotDone();
- if (theShapeWhere == NULL ||
- theShapeWhat == NULL) return aGEOMObject._retn();
-
//Get the reference objects
- Handle(GEOM_Object) aShapeWhere = GetOperations()->GetEngine()->GetObject
- (theShapeWhere->GetStudyID(), theShapeWhere->GetEntry());
- Handle(GEOM_Object) aShapeWhat = GetOperations()->GetEngine()->GetObject
- (theShapeWhat->GetStudyID(), theShapeWhat->GetEntry());
+ Handle(GEOM_Object) aShapeWhere = GetObjectImpl(theShapeWhere);
+ Handle(GEOM_Object) aShapeWhat = GetObjectImpl(theShapeWhat);
if (aShapeWhere.IsNull() ||
aShapeWhat.IsNull()) return aGEOMObject._retn();
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_IShapesOperations_i::GetInPlaceByHistory
(GEOM::GEOM_Object_ptr theShapeWhere,
- GEOM::GEOM_Object_ptr theShapeWhat)
+ GEOM::GEOM_Object_ptr theShapeWhat)
{
GEOM::GEOM_Object_var aGEOMObject;
//Set a not done flag
GetOperations()->SetNotDone();
- if (theShapeWhere == NULL ||
- theShapeWhat == NULL) return aGEOMObject._retn();
-
//Get the reference objects
- Handle(GEOM_Object) aShapeWhere = GetOperations()->GetEngine()->GetObject
- (theShapeWhere->GetStudyID(), theShapeWhere->GetEntry());
- Handle(GEOM_Object) aShapeWhat = GetOperations()->GetEngine()->GetObject
- (theShapeWhat->GetStudyID(), theShapeWhat->GetEntry());
+ Handle(GEOM_Object) aShapeWhere = GetObjectImpl(theShapeWhere);
+ Handle(GEOM_Object) aShapeWhat = GetObjectImpl(theShapeWhat);
if (aShapeWhere.IsNull() ||
aShapeWhat.IsNull()) return aGEOMObject._retn();
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_IShapesOperations_i::GetSame
(GEOM::GEOM_Object_ptr theShapeWhere,
- GEOM::GEOM_Object_ptr theShapeWhat)
+ GEOM::GEOM_Object_ptr theShapeWhat)
{
GEOM::GEOM_Object_var aGEOMObject;
//Set a not done flag
GetOperations()->SetNotDone();
- if (theShapeWhere == NULL ||
- theShapeWhat == NULL) return aGEOMObject._retn();
-
//Get the reference objects
- Handle(GEOM_Object) aShapeWhere = GetOperations()->GetEngine()->GetObject
- (theShapeWhere->GetStudyID(), theShapeWhere->GetEntry());
- Handle(GEOM_Object) aShapeWhat = GetOperations()->GetEngine()->GetObject
- (theShapeWhat->GetStudyID(), theShapeWhat->GetEntry());
+ Handle(GEOM_Object) aShapeWhere = GetObjectImpl(theShapeWhere);
+ Handle(GEOM_Object) aShapeWhat = GetObjectImpl(theShapeWhat);
if (aShapeWhere.IsNull() ||
aShapeWhat.IsNull()) return aGEOMObject._retn();
return GetObject(anObject);
}
-
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
+
#include <Standard_Stream.hxx>
#include "GEOM_ITransformOperations_i.hh"
//=============================================================================
GEOM_ITransformOperations_i::GEOM_ITransformOperations_i (PortableServer::POA_ptr thePOA,
- GEOM::GEOM_Gen_ptr theEngine,
- ::GEOMImpl_ITransformOperations* theImpl)
+ GEOM::GEOM_Gen_ptr theEngine,
+ ::GEOMImpl_ITransformOperations* theImpl)
:GEOM_IOperations_i(thePOA, theEngine, theImpl)
{
MESSAGE("GEOM_ITransformOperations_i::GEOM_ITransformOperations_i");
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::TranslateTwoPoints
(GEOM::GEOM_Object_ptr theObject,
- GEOM::GEOM_Object_ptr thePoint1,
- GEOM::GEOM_Object_ptr thePoint2)
+ GEOM::GEOM_Object_ptr thePoint1,
+ GEOM::GEOM_Object_ptr thePoint2)
{
//Set a not done flag
GetOperations()->SetNotDone();
GEOM::GEOM_Object_var aGEOMObject;
- if (thePoint1 == NULL || thePoint2 == NULL || theObject == NULL) return aGEOMObject._retn();
+ if (CORBA::is_nil(theObject)) return aGEOMObject._retn();
//check if the object is a subshape
- if(!theObject->IsMainShape()) {
+ if (!theObject->IsMainShape()) {
GetOperations()->SetErrorCode(SUBSHAPE_ERROR);
return aGEOMObject._retn();
}
aGEOMObject = GEOM::GEOM_Object::_duplicate(theObject);
//Get the object itself
- CORBA::String_var anEntry = theObject->GetEntry();
- Handle(GEOM_Object) anObject =
- GetOperations()->GetEngine()->GetObject(theObject->GetStudyID(), anEntry);
+ Handle(GEOM_Object) anObject = GetObjectImpl(theObject);
if (anObject.IsNull()) return aGEOMObject._retn();
//Get the first point of translation
- CORBA::String_var aP1Entry = thePoint1->GetEntry();
- Handle(GEOM_Object) aPoint1 =
- GetOperations()->GetEngine()->GetObject(thePoint1->GetStudyID(), aP1Entry);
+ Handle(GEOM_Object) aPoint1 = GetObjectImpl(thePoint1);
if (aPoint1.IsNull()) return aGEOMObject._retn();
//Get the second point of translation
- CORBA::String_var aP2Entry = thePoint2->GetEntry();
- Handle(GEOM_Object) aPoint2 =
- GetOperations()->GetEngine()->GetObject(thePoint2->GetStudyID(), aP2Entry);
+ Handle(GEOM_Object) aPoint2 = GetObjectImpl(thePoint2);
if (aPoint2.IsNull()) return aGEOMObject._retn();
//Perform the translation
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::TranslateTwoPointsCopy
(GEOM::GEOM_Object_ptr theObject,
- GEOM::GEOM_Object_ptr thePoint1,
- GEOM::GEOM_Object_ptr thePoint2)
+ GEOM::GEOM_Object_ptr thePoint1,
+ GEOM::GEOM_Object_ptr thePoint2)
{
GEOM::GEOM_Object_var aGEOMObject;
//Set a not done flag
GetOperations()->SetNotDone();
- if (thePoint1 == NULL || thePoint2 == NULL || theObject == NULL) return aGEOMObject._retn();
-
//Get the object itself
- CORBA::String_var anEntry = theObject->GetEntry();
- Handle(GEOM_Object) aBasicObject =
- GetOperations()->GetEngine()->GetObject(theObject->GetStudyID(), anEntry);
+ Handle(GEOM_Object) aBasicObject = GetObjectImpl(theObject);
if (aBasicObject.IsNull()) return aGEOMObject._retn();
//Get the first point of translation
- CORBA::String_var aP1Entry = thePoint1->GetEntry();
- Handle(GEOM_Object) aPoint1 =
- GetOperations()->GetEngine()->GetObject(thePoint1->GetStudyID(), aP1Entry);
+ Handle(GEOM_Object) aPoint1 = GetObjectImpl(thePoint1);
if (aPoint1.IsNull()) return aGEOMObject._retn();
//Get the second point of translation
- CORBA::String_var aP2Entry = thePoint2->GetEntry();
- Handle(GEOM_Object) aPoint2 =
- GetOperations()->GetEngine()->GetObject(thePoint2->GetStudyID(), aP2Entry);
+ Handle(GEOM_Object) aPoint2 = GetObjectImpl(thePoint2);
if (aPoint2.IsNull()) return aGEOMObject._retn();
//Create the translated shape
*/
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::TranslateDXDYDZ
- (GEOM::GEOM_Object_ptr theObject,
- CORBA::Double theDX, CORBA::Double theDY, CORBA::Double theDZ)
+ (GEOM::GEOM_Object_ptr theObject,
+ CORBA::Double theDX, CORBA::Double theDY, CORBA::Double theDZ)
{
//Set a not done flag
GetOperations()->SetNotDone();
- GEOM::GEOM_Object_var aGEOMObject ;
+ GEOM::GEOM_Object_var aGEOMObject;
- if (theObject == NULL) return aGEOMObject._retn();
+ if (CORBA::is_nil(theObject)) return aGEOMObject._retn();
//check if the object is a subshape
- if(!theObject->IsMainShape()) {
+ if (!theObject->IsMainShape()) {
GetOperations()->SetErrorCode(SUBSHAPE_ERROR);
return aGEOMObject._retn();
}
aGEOMObject = GEOM::GEOM_Object::_duplicate(theObject);
//Get the object itself
- CORBA::String_var anEntry = theObject->GetEntry();
- Handle(GEOM_Object) anObject =
- GetOperations()->GetEngine()->GetObject(theObject->GetStudyID(), anEntry);
+ Handle(GEOM_Object) anObject = GetObjectImpl(theObject);
if (anObject.IsNull()) return aGEOMObject._retn();
//Perform the translation
return aGEOMObject._retn();
}
-
//=============================================================================
/*!
* TranslateDXDYDZCopy
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::TranslateDXDYDZCopy
(GEOM::GEOM_Object_ptr theObject,
- CORBA::Double theDX, CORBA::Double theDY, CORBA::Double theDZ)
+ CORBA::Double theDX, CORBA::Double theDY, CORBA::Double theDZ)
{
GEOM::GEOM_Object_var aGEOMObject;
//Set a not done flag
GetOperations()->SetNotDone();
- if (theObject == NULL) return aGEOMObject._retn();
-
//Get the object itself
- CORBA::String_var anEntry = theObject->GetEntry();
- Handle(GEOM_Object) aBasicObject =
- GetOperations()->GetEngine()->GetObject(theObject->GetStudyID(), anEntry);
+ Handle(GEOM_Object) aBasicObject = GetObjectImpl(theObject);
if (aBasicObject.IsNull()) return aGEOMObject._retn();
//Create the translated shape
return GetObject(anObject);
}
-
//=============================================================================
/*!
* TranslateVector
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::TranslateVector
(GEOM::GEOM_Object_ptr theObject,
- GEOM::GEOM_Object_ptr theVector)
+ GEOM::GEOM_Object_ptr theVector)
{
//Set a not done flag
GetOperations()->SetNotDone();
GEOM::GEOM_Object_var aGEOMObject;
- if (theObject == NULL || theVector == NULL) return aGEOMObject._retn();
+ if (CORBA::is_nil(theObject)) return aGEOMObject._retn();
//check if the object is a subshape
- if(!theObject->IsMainShape()) {
+ if (!theObject->IsMainShape()) {
GetOperations()->SetErrorCode(SUBSHAPE_ERROR);
return aGEOMObject._retn();
}
aGEOMObject = GEOM::GEOM_Object::_duplicate(theObject);
//Get the object itself
- CORBA::String_var anEntry = theObject->GetEntry();
- Handle(GEOM_Object) anObject =
- GetOperations()->GetEngine()->GetObject(theObject->GetStudyID(), anEntry);
+ Handle(GEOM_Object) anObject = GetObjectImpl(theObject);
if (anObject.IsNull()) return aGEOMObject._retn();
//Get the vector of translation
- CORBA::String_var aVEntry = theVector->GetEntry();
- Handle(GEOM_Object) aVector =
- GetOperations()->GetEngine()->GetObject(theVector->GetStudyID(), aVEntry);
+ Handle(GEOM_Object) aVector = GetObjectImpl(theVector);
if (aVector.IsNull()) return aGEOMObject._retn();
//Perform the translation
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::TranslateVectorCopy
(GEOM::GEOM_Object_ptr theObject,
- GEOM::GEOM_Object_ptr theVector)
+ GEOM::GEOM_Object_ptr theVector)
{
GEOM::GEOM_Object_var aGEOMObject;
//Set a not done flag
GetOperations()->SetNotDone();
- if (theObject == NULL || theVector == NULL) return aGEOMObject._retn();
-
//Get the object itself
- CORBA::String_var anEntry = theObject->GetEntry();
- Handle(GEOM_Object) aBasicObject =
- GetOperations()->GetEngine()->GetObject(theObject->GetStudyID(), anEntry);
+ Handle(GEOM_Object) aBasicObject = GetObjectImpl(theObject);
if (aBasicObject.IsNull()) return aGEOMObject._retn();
//Get the vector of translation
- CORBA::String_var aVEntry = theVector->GetEntry();
- Handle(GEOM_Object) aVector =
- GetOperations()->GetEngine()->GetObject(theVector->GetStudyID(), aVEntry);
+ Handle(GEOM_Object) aVector = GetObjectImpl(theVector);
if (aVector.IsNull()) return aGEOMObject._retn();
//Perform the translation
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::TranslateVectorDistance
(GEOM::GEOM_Object_ptr theObject,
- GEOM::GEOM_Object_ptr theVector,
- CORBA::Double theDistance,
- CORBA::Boolean theCopy)
+ GEOM::GEOM_Object_ptr theVector,
+ CORBA::Double theDistance,
+ CORBA::Boolean theCopy)
{
GEOM::GEOM_Object_var aGEOMObject;
GetOperations()->SetNotDone(); //Set a not done flag
- if (theObject == NULL || theVector == NULL) return aGEOMObject._retn();
+ if (CORBA::is_nil(theObject)) return aGEOMObject._retn();
//check if the object is a subshape
if (!theCopy && !theObject->IsMainShape()) {
aGEOMObject = GEOM::GEOM_Object::_duplicate(theObject);
//Get the object itself
- CORBA::String_var anEntry = theObject->GetEntry();
- Handle(GEOM_Object) aBasicObject =
- GetOperations()->GetEngine()->GetObject(theObject->GetStudyID(), anEntry);
+ Handle(GEOM_Object) aBasicObject = GetObjectImpl(theObject);
if (aBasicObject.IsNull()) return aGEOMObject._retn();
//Get the vector of translation
- CORBA::String_var aVecEntry = theVector->GetEntry();
- Handle(GEOM_Object) aVector =
- GetOperations()->GetEngine()->GetObject(theVector->GetStudyID(), aVecEntry);
+ Handle(GEOM_Object) aVector = GetObjectImpl(theVector);
if (aVector.IsNull()) return aGEOMObject._retn();
//Perform the translation
*/
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::Rotate (GEOM::GEOM_Object_ptr theObject,
- GEOM::GEOM_Object_ptr theAxis,
- CORBA::Double theAngle)
+ GEOM::GEOM_Object_ptr theAxis,
+ CORBA::Double theAngle)
{
//Set a not done flag
GetOperations()->SetNotDone();
GEOM::GEOM_Object_var aGEOMObject;
- if (theObject == NULL || theAxis == NULL) return aGEOMObject._retn();
+ if (CORBA::is_nil(theObject)) return aGEOMObject._retn();
//check if the object is a subshape
- if(!theObject->IsMainShape()) {
+ if (!theObject->IsMainShape()) {
GetOperations()->SetErrorCode(SUBSHAPE_ERROR);
return aGEOMObject._retn();
}
aGEOMObject = GEOM::GEOM_Object::_duplicate(theObject);
//Get the object itself
- CORBA::String_var anEntry = theObject->GetEntry();
- Handle(GEOM_Object) anObject =
- GetOperations()->GetEngine()->GetObject(theObject->GetStudyID(), anEntry);
+ Handle(GEOM_Object) anObject = GetObjectImpl(theObject);
if (anObject.IsNull()) return aGEOMObject._retn();
//Get the axis of revolution
- CORBA::String_var anAEntry = theAxis->GetEntry();
- Handle(GEOM_Object) anAxis =
- GetOperations()->GetEngine()->GetObject(theAxis->GetStudyID(), anAEntry);
+ Handle(GEOM_Object) anAxis = GetObjectImpl(theAxis);
if (anAxis.IsNull()) return aGEOMObject._retn();
//Perform the rotation
*/
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::RotateCopy (GEOM::GEOM_Object_ptr theObject,
- GEOM::GEOM_Object_ptr theAxis,
- CORBA::Double theAngle)
+ GEOM::GEOM_Object_ptr theAxis,
+ CORBA::Double theAngle)
{
GEOM::GEOM_Object_var aGEOMObject;
//Set a not done flag
GetOperations()->SetNotDone();
- if (theObject == NULL || theAxis == NULL) return aGEOMObject._retn();
-
//Get the object itself
- CORBA::String_var anEntry = theObject->GetEntry();
- Handle(GEOM_Object) aBasicObject =
- GetOperations()->GetEngine()->GetObject(theObject->GetStudyID(), anEntry);
+ Handle(GEOM_Object) aBasicObject = GetObjectImpl(theObject);
if (aBasicObject.IsNull()) return aGEOMObject._retn();
//Get the axis of rotation
- CORBA::String_var anAEntry = theAxis->GetEntry();
- Handle(GEOM_Object) anAxis =
- GetOperations()->GetEngine()->GetObject(theAxis->GetStudyID(), anAEntry);
+ Handle(GEOM_Object) anAxis = GetObjectImpl(theAxis);
if (anAxis.IsNull()) return aGEOMObject._retn();
//Perform the rotation
return GetObject(anObject);
}
-
//=============================================================================
/*!
* MirrorPlane
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::MirrorPlane
(GEOM::GEOM_Object_ptr theObject,
- GEOM::GEOM_Object_ptr thePlane)
+ GEOM::GEOM_Object_ptr thePlane)
{
GEOM::GEOM_Object_var aGEOMObject = GEOM::GEOM_Object::_duplicate(theObject);
//Set a not done flag
GetOperations()->SetNotDone();
- if (theObject == NULL || thePlane == NULL) return aGEOMObject._retn();
+ if (CORBA::is_nil(theObject)) return aGEOMObject._retn();
//check if the object is a subshape
if (!theObject->IsMainShape()) {
}
//Get the object itself
- CORBA::String_var anEntry = theObject->GetEntry();
- Handle(GEOM_Object) anObject =
- GetOperations()->GetEngine()->GetObject(theObject->GetStudyID(), anEntry);
+ Handle(GEOM_Object) anObject = GetObjectImpl(theObject);
if (anObject.IsNull()) return aGEOMObject._retn();
//Get the plane
- CORBA::String_var aPlnEntry = thePlane->GetEntry();
- Handle(GEOM_Object) aPlane =
- GetOperations()->GetEngine()->GetObject(thePlane->GetStudyID(), aPlnEntry);
+ Handle(GEOM_Object) aPlane = GetObjectImpl(thePlane);
if (aPlane.IsNull()) return aGEOMObject._retn();
//Perform the mirror
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::MirrorPlaneCopy
(GEOM::GEOM_Object_ptr theObject,
- GEOM::GEOM_Object_ptr thePlane)
+ GEOM::GEOM_Object_ptr thePlane)
{
GEOM::GEOM_Object_var aGEOMObject;
//Set a not done flag
GetOperations()->SetNotDone();
- if (theObject == NULL || thePlane == NULL) return aGEOMObject._retn();
-
//Get the object itself
- CORBA::String_var anEntry = theObject->GetEntry();
- Handle(GEOM_Object) aBasicObject =
- GetOperations()->GetEngine()->GetObject(theObject->GetStudyID(), anEntry);
+ Handle(GEOM_Object) aBasicObject = GetObjectImpl(theObject);
if (aBasicObject.IsNull()) return aGEOMObject._retn();
//Get the vector of translation
- CORBA::String_var aPlnEntry = thePlane->GetEntry();
- Handle(GEOM_Object) aPlane =
- GetOperations()->GetEngine()->GetObject(thePlane->GetStudyID(), aPlnEntry);
+ Handle(GEOM_Object) aPlane = GetObjectImpl(thePlane);
if (aPlane.IsNull()) return aGEOMObject._retn();
//Perform the mirror
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::MirrorAxis
(GEOM::GEOM_Object_ptr theObject,
- GEOM::GEOM_Object_ptr theAxis)
+ GEOM::GEOM_Object_ptr theAxis)
{
GEOM::GEOM_Object_var aGEOMObject = GEOM::GEOM_Object::_duplicate(theObject);
//Set a not done flag
GetOperations()->SetNotDone();
- if (theObject == NULL || theAxis == NULL) return aGEOMObject._retn();
+ if (CORBA::is_nil(theObject)) return aGEOMObject._retn();
//check if the object is a subshape
- if(!theObject->IsMainShape()) {
+ if (!theObject->IsMainShape()) {
GetOperations()->SetErrorCode(SUBSHAPE_ERROR);
return aGEOMObject._retn();
}
//Get the object itself
- CORBA::String_var anEntry = theObject->GetEntry();
- Handle(GEOM_Object) anObject =
- GetOperations()->GetEngine()->GetObject(theObject->GetStudyID(), anEntry);
+ Handle(GEOM_Object) anObject = GetObjectImpl(theObject);
if (anObject.IsNull()) return aGEOMObject._retn();
//Get the axis
- CORBA::String_var anAEntry = theAxis->GetEntry();
- Handle(GEOM_Object) aAxis =
- GetOperations()->GetEngine()->GetObject(theAxis->GetStudyID(), anAEntry);
+ Handle(GEOM_Object) aAxis = GetObjectImpl(theAxis);
if (aAxis.IsNull()) return aGEOMObject._retn();
//Perform the mirror
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::MirrorAxisCopy
(GEOM::GEOM_Object_ptr theObject,
- GEOM::GEOM_Object_ptr theAxis)
+ GEOM::GEOM_Object_ptr theAxis)
{
GEOM::GEOM_Object_var aGEOMObject;
//Set a not done flag
GetOperations()->SetNotDone();
- if (theObject == NULL || theAxis == NULL) return aGEOMObject._retn();
-
//Get the object itself
- CORBA::String_var anEntry = theObject->GetEntry();
- Handle(GEOM_Object) aBasicObject =
- GetOperations()->GetEngine()->GetObject(theObject->GetStudyID(), anEntry);
+ Handle(GEOM_Object) aBasicObject = GetObjectImpl(theObject);
if (aBasicObject.IsNull()) return aGEOMObject._retn();
//Get the vector of translation
- CORBA::String_var anAEntry = theAxis->GetEntry();
- Handle(GEOM_Object) aAxis =
- GetOperations()->GetEngine()->GetObject(theAxis->GetStudyID(), anAEntry);
+ Handle(GEOM_Object) aAxis = GetObjectImpl(theAxis);
if (aAxis.IsNull()) return aGEOMObject._retn();
//Perform the mirror
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::MirrorPoint
(GEOM::GEOM_Object_ptr theObject,
- GEOM::GEOM_Object_ptr thePoint)
+ GEOM::GEOM_Object_ptr thePoint)
{
GEOM::GEOM_Object_var aGEOMObject = GEOM::GEOM_Object::_duplicate(theObject);
//Set a not done flag
GetOperations()->SetNotDone();
- if (theObject == NULL || thePoint == NULL) return aGEOMObject._retn();
+ if (CORBA::is_nil(theObject)) return aGEOMObject._retn();
//check if the object is a subshape
if (!theObject->IsMainShape()) {
}
//Get the object itself
- CORBA::String_var anEntry = theObject->GetEntry();
- Handle(GEOM_Object) anObject =
- GetOperations()->GetEngine()->GetObject(theObject->GetStudyID(), anEntry);
+ Handle(GEOM_Object) anObject = GetObjectImpl(theObject);
if (anObject.IsNull()) return aGEOMObject._retn();
//Get the point
- CORBA::String_var aPntEntry = thePoint->GetEntry();
- Handle(GEOM_Object) aPoint =
- GetOperations()->GetEngine()->GetObject(thePoint->GetStudyID(), aPntEntry);
+ Handle(GEOM_Object) aPoint = GetObjectImpl(thePoint);
if (aPoint.IsNull()) return aGEOMObject._retn();
//Perform the mirror
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::MirrorPointCopy
(GEOM::GEOM_Object_ptr theObject,
- GEOM::GEOM_Object_ptr thePoint)
+ GEOM::GEOM_Object_ptr thePoint)
{
GEOM::GEOM_Object_var aGEOMObject;
//Set a not done flag
GetOperations()->SetNotDone();
- if (theObject == NULL || thePoint == NULL) return aGEOMObject._retn();
-
//Get the object itself
- CORBA::String_var anEntry = theObject->GetEntry();
- Handle(GEOM_Object) aBasicObject =
- GetOperations()->GetEngine()->GetObject(theObject->GetStudyID(), anEntry);
+ Handle(GEOM_Object) aBasicObject = GetObjectImpl(theObject);
if (aBasicObject.IsNull()) return aGEOMObject._retn();
//Get the vector of translation
- CORBA::String_var aPntEntry = thePoint->GetEntry();
- Handle(GEOM_Object) aPoint =
- GetOperations()->GetEngine()->GetObject(thePoint->GetStudyID(), aPntEntry);
+ Handle(GEOM_Object) aPoint = GetObjectImpl(thePoint);
if (aPoint.IsNull()) return aGEOMObject._retn();
//Perform the mirror
return GetObject(anObject);
}
-
//=============================================================================
/*!
* OffsetShape
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::OffsetShape
(GEOM::GEOM_Object_ptr theObject,
- CORBA::Double theOffset)
+ CORBA::Double theOffset)
{
GEOM::GEOM_Object_var aGEOMObject = GEOM::GEOM_Object::_duplicate(theObject);
//Set a not done flag
GetOperations()->SetNotDone();
- if (theObject == NULL) return aGEOMObject._retn();
+ if (CORBA::is_nil(theObject)) return aGEOMObject._retn();
//check if the object is a subshape
if (!theObject->IsMainShape()) {
}
//Get the basic object
- CORBA::String_var anEntry = theObject->GetEntry();
- Handle(GEOM_Object) aBasicObject =
- GetOperations()->GetEngine()->GetObject(theObject->GetStudyID(), anEntry);
+ Handle(GEOM_Object) aBasicObject = GetObjectImpl(theObject);
if (aBasicObject.IsNull()) return aGEOMObject._retn();
//Create the offset shape
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::OffsetShapeCopy
(GEOM::GEOM_Object_ptr theObject,
- CORBA::Double theOffset)
+ CORBA::Double theOffset)
{
GEOM::GEOM_Object_var aGEOMObject;
//Set a not done flag
GetOperations()->SetNotDone();
- if (theObject == NULL) return aGEOMObject._retn();
-
//Get the basic object
- CORBA::String_var anEntry = theObject->GetEntry();
- Handle(GEOM_Object) aBasicObject =
- GetOperations()->GetEngine()->GetObject(theObject->GetStudyID(), anEntry);
+ Handle(GEOM_Object) aBasicObject = GetObjectImpl(theObject);
if (aBasicObject.IsNull()) return aGEOMObject._retn();
//Create the offset shape
return GetObject(anObject);
}
-
//=============================================================================
/*!
* ScaleShape
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::ScaleShape
(GEOM::GEOM_Object_ptr theObject,
- GEOM::GEOM_Object_ptr thePoint,
- CORBA::Double theFactor)
+ GEOM::GEOM_Object_ptr thePoint,
+ CORBA::Double theFactor)
{
GEOM::GEOM_Object_var aGEOMObject = GEOM::GEOM_Object::_duplicate(theObject);
}
//Get the object itself
- CORBA::String_var anEntry = theObject->GetEntry();
- Handle(GEOM_Object) anObject =
- GetOperations()->GetEngine()->GetObject(theObject->GetStudyID(), anEntry);
+ Handle(GEOM_Object) anObject = GetObjectImpl(theObject);
if (anObject.IsNull()) return aGEOMObject._retn();
//Get the point
Handle(GEOM_Object) aPoint;
if (!thePoint->_is_nil()) {
- CORBA::String_var aPntEntry = thePoint->GetEntry();
- aPoint = GetOperations()->GetEngine()->GetObject(thePoint->GetStudyID(), aPntEntry);
+ aPoint = GetObjectImpl(thePoint);
if (aPoint.IsNull()) return aGEOMObject._retn();
}
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::ScaleShapeCopy
(GEOM::GEOM_Object_ptr theObject,
- GEOM::GEOM_Object_ptr thePoint,
- CORBA::Double theFactor)
+ GEOM::GEOM_Object_ptr thePoint,
+ CORBA::Double theFactor)
{
GEOM::GEOM_Object_var aGEOMObject;
//Set a not done flag
GetOperations()->SetNotDone();
- if (theObject->_is_nil()) return aGEOMObject._retn();
-
//Get the basic object
- CORBA::String_var anEntry = theObject->GetEntry();
- Handle(GEOM_Object) aBasicObject =
- GetOperations()->GetEngine()->GetObject(theObject->GetStudyID(), anEntry);
+ Handle(GEOM_Object) aBasicObject = GetObjectImpl(theObject);
if (aBasicObject.IsNull()) return aGEOMObject._retn();
//Get the point
Handle(GEOM_Object) aPoint;
if (!thePoint->_is_nil()) {
- CORBA::String_var aPntEntry = thePoint->GetEntry();
- aPoint = GetOperations()->GetEngine()->GetObject(thePoint->GetStudyID(), aPntEntry);
+ aPoint = GetObjectImpl(thePoint);
if (aPoint.IsNull()) return aGEOMObject._retn();
}
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::ScaleShapeAlongAxes
(GEOM::GEOM_Object_ptr theObject,
- GEOM::GEOM_Object_ptr thePoint,
- CORBA::Double theFactorX,
- CORBA::Double theFactorY,
- CORBA::Double theFactorZ)
+ GEOM::GEOM_Object_ptr thePoint,
+ CORBA::Double theFactorX,
+ CORBA::Double theFactorY,
+ CORBA::Double theFactorZ)
{
GEOM::GEOM_Object_var aGEOMObject = GEOM::GEOM_Object::_duplicate(theObject);
}
//Get the object itself
- CORBA::String_var anEntry = theObject->GetEntry();
- Handle(GEOM_Object) anObject =
- GetOperations()->GetEngine()->GetObject(theObject->GetStudyID(), anEntry);
+ Handle(GEOM_Object) anObject = GetObjectImpl(theObject);
if (anObject.IsNull()) return aGEOMObject._retn();
//Get the point
Handle(GEOM_Object) aPoint;
if (!thePoint->_is_nil()) {
- CORBA::String_var aPntEntry = thePoint->GetEntry();
- aPoint = GetOperations()->GetEngine()->GetObject(thePoint->GetStudyID(), aPntEntry);
+ aPoint = GetObjectImpl(thePoint);
if (aPoint.IsNull()) return aGEOMObject._retn();
}
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::ScaleShapeAlongAxesCopy
(GEOM::GEOM_Object_ptr theObject,
- GEOM::GEOM_Object_ptr thePoint,
- CORBA::Double theFactorX,
- CORBA::Double theFactorY,
- CORBA::Double theFactorZ)
+ GEOM::GEOM_Object_ptr thePoint,
+ CORBA::Double theFactorX,
+ CORBA::Double theFactorY,
+ CORBA::Double theFactorZ)
{
GEOM::GEOM_Object_var aGEOMObject;
//Set a not done flag
GetOperations()->SetNotDone();
- if (theObject->_is_nil()) return aGEOMObject._retn();
-
//Get the basic object
- CORBA::String_var anEntry = theObject->GetEntry();
- Handle(GEOM_Object) aBasicObject =
- GetOperations()->GetEngine()->GetObject(theObject->GetStudyID(), anEntry);
+ Handle(GEOM_Object) aBasicObject = GetObjectImpl(theObject);
if (aBasicObject.IsNull()) return aGEOMObject._retn();
//Get the point
Handle(GEOM_Object) aPoint;
if (!thePoint->_is_nil()) {
- CORBA::String_var aPntEntry = thePoint->GetEntry();
- aPoint = GetOperations()->GetEngine()->GetObject(thePoint->GetStudyID(), aPntEntry);
+ aPoint = GetObjectImpl(thePoint);
if (aPoint.IsNull()) return aGEOMObject._retn();
}
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::PositionShape
(GEOM::GEOM_Object_ptr theObject,
- GEOM::GEOM_Object_ptr theStartLCS,
- GEOM::GEOM_Object_ptr theEndLCS)
+ GEOM::GEOM_Object_ptr theStartLCS,
+ GEOM::GEOM_Object_ptr theEndLCS)
{
GEOM::GEOM_Object_var aGEOMObject = GEOM::GEOM_Object::_duplicate(theObject);
//Set a not done flag
GetOperations()->SetNotDone();
- if (theObject == NULL || theEndLCS == NULL)
+ if (CORBA::is_nil(theObject) || CORBA::is_nil(theEndLCS))
return aGEOMObject._retn();
//check if the object is a subshape
}
//Get the basic object
- CORBA::String_var anEntry = theObject->GetEntry();
- Handle(GEOM_Object) anObject =
- GetOperations()->GetEngine()->GetObject(theObject->GetStudyID(), anEntry);
+ Handle(GEOM_Object) anObject = GetObjectImpl(theObject);
if (anObject.IsNull()) return aGEOMObject._retn();
//Get the Start LCS (may be NULL for positioning from global LCS)
- Handle(GEOM_Object) aStartLCS = NULL;
- if (theStartLCS != NULL && !CORBA::is_nil(theStartLCS)) {
- CORBA::String_var aStartLCSEntry = theStartLCS->GetEntry();
- aStartLCS = GetOperations()->GetEngine()->GetObject(theStartLCS->GetStudyID(), aStartLCSEntry);
+ Handle(GEOM_Object) aStartLCS;
+ if (!CORBA::is_nil(theStartLCS)) {
+ aStartLCS = GetObjectImpl(theStartLCS);
if (aStartLCS.IsNull()) return aGEOMObject._retn();
}
//Get the End LCS
- CORBA::String_var anEndLCSEntry = theEndLCS->GetEntry();
- Handle(GEOM_Object) aEndLCS =
- GetOperations()->GetEngine()->GetObject(theEndLCS->GetStudyID(), anEndLCSEntry);
+ Handle(GEOM_Object) aEndLCS = GetObjectImpl(theEndLCS);
if (aEndLCS.IsNull()) return aGEOMObject._retn();
//Perform the Position
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::PositionShapeCopy
(GEOM::GEOM_Object_ptr theObject,
- GEOM::GEOM_Object_ptr theStartLCS,
- GEOM::GEOM_Object_ptr theEndLCS)
+ GEOM::GEOM_Object_ptr theStartLCS,
+ GEOM::GEOM_Object_ptr theEndLCS)
{
GEOM::GEOM_Object_var aGEOMObject;
//Set a not done flag
GetOperations()->SetNotDone();
- if (theObject == NULL || theEndLCS == NULL)
- return aGEOMObject._retn();
-
//Get the basic object
- CORBA::String_var anEntry = theObject->GetEntry();
- Handle(GEOM_Object) aBasicObject =
- GetOperations()->GetEngine()->GetObject(theObject->GetStudyID(), anEntry);
+ Handle(GEOM_Object) aBasicObject = GetObjectImpl(theObject);
if (aBasicObject.IsNull()) return aGEOMObject._retn();
//Get the Start LCS (may be NULL for positioning from global LCS)
- Handle(GEOM_Object) aStartLCS = NULL;
- if (theStartLCS != NULL && !CORBA::is_nil(theStartLCS)) {
- CORBA::String_var aStartLCSEntry = theStartLCS->GetEntry();
- aStartLCS = GetOperations()->GetEngine()->GetObject(theStartLCS->GetStudyID(), aStartLCSEntry);
+ Handle(GEOM_Object) aStartLCS;
+ if (!CORBA::is_nil(theStartLCS)) {
+ aStartLCS = GetObjectImpl(theStartLCS);
if (aStartLCS.IsNull()) return aGEOMObject._retn();
}
//Get the End LCS
- CORBA::String_var anEndLCSEntry = theEndLCS->GetEntry();
- Handle(GEOM_Object) aEndLCS =
- GetOperations()->GetEngine()->GetObject(theEndLCS->GetStudyID(), anEndLCSEntry);
+ Handle(GEOM_Object) aEndLCS = GetObjectImpl(theEndLCS);
if (aEndLCS.IsNull()) return aGEOMObject._retn();
//Perform the position
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::PositionAlongPath
(GEOM::GEOM_Object_ptr theObject,
- GEOM::GEOM_Object_ptr thePath,
- CORBA::Double theDistance,
- CORBA::Boolean theCopy,
- CORBA::Boolean theReverse)
+ GEOM::GEOM_Object_ptr thePath,
+ CORBA::Double theDistance,
+ CORBA::Boolean theCopy,
+ CORBA::Boolean theReverse)
{
GEOM::GEOM_Object_var aGEOMObject;
//Set a not done flag
GetOperations()->SetNotDone();
- if (theObject == NULL || thePath == NULL)
- return aGEOMObject._retn();
-
//Get the basic object
- CORBA::String_var anEntry = theObject->GetEntry();
- Handle(GEOM_Object) aBasicObject =
- GetOperations()->GetEngine()->GetObject(theObject->GetStudyID(), anEntry);
+ Handle(GEOM_Object) aBasicObject = GetObjectImpl(theObject);
if (aBasicObject.IsNull()) return aGEOMObject._retn();
//Get the path object
- CORBA::String_var aPathEntry = thePath->GetEntry();
- Handle(GEOM_Object) aPathObject =
- GetOperations()->GetEngine()->GetObject(theObject->GetStudyID(), aPathEntry);
+ Handle(GEOM_Object) aPathObject = GetObjectImpl(thePath);
if (aPathObject.IsNull()) return aGEOMObject._retn();
//Perform the position
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::MultiTranslate1D
(GEOM::GEOM_Object_ptr theObject,
- GEOM::GEOM_Object_ptr theVector,
- CORBA::Double theStep, CORBA::Long theNbTimes)
+ GEOM::GEOM_Object_ptr theVector,
+ CORBA::Double theStep, CORBA::Long theNbTimes)
{
//Set a not done flag
GetOperations()->SetNotDone();
GEOM::GEOM_Object_var aGEOMObject;
- if (theObject == NULL || theVector == NULL) return aGEOMObject._retn();
-
//Get the object itself
- CORBA::String_var anEntry = theObject->GetEntry();
- Handle(GEOM_Object) aBasicObject =
- GetOperations()->GetEngine()->GetObject(theObject->GetStudyID(), anEntry);
+ Handle(GEOM_Object) aBasicObject = GetObjectImpl(theObject);
if (aBasicObject.IsNull()) return aGEOMObject._retn();
//Get the vector of translation
- CORBA::String_var aVecEntry = theVector->GetEntry();
- Handle(GEOM_Object) aVector =
- GetOperations()->GetEngine()->GetObject(theVector->GetStudyID(), aVecEntry);
+ Handle(GEOM_Object) aVector = GetObjectImpl(theVector);
if (aVector.IsNull()) return aGEOMObject._retn();
//Perform the translation
*/
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::MultiTranslate2D (GEOM::GEOM_Object_ptr theObject,
- GEOM::GEOM_Object_ptr theVector1,
- CORBA::Double theStep1,
- CORBA::Long theNbTimes1,
- GEOM::GEOM_Object_ptr theVector2,
- CORBA::Double theStep2,
- CORBA::Long theNbTimes2)
+ GEOM::GEOM_Object_ptr theVector1,
+ CORBA::Double theStep1,
+ CORBA::Long theNbTimes1,
+ GEOM::GEOM_Object_ptr theVector2,
+ CORBA::Double theStep2,
+ CORBA::Long theNbTimes2)
{
//Set a not done flag
GetOperations()->SetNotDone();
GEOM::GEOM_Object_var aGEOMObject;
- if (theObject == NULL || theVector1 == NULL || theVector2 == NULL) return aGEOMObject._retn();
-
//Get the object itself
- CORBA::String_var anEntry = theObject->GetEntry();
- Handle(GEOM_Object) aBasicObject =
- GetOperations()->GetEngine()->GetObject(theObject->GetStudyID(), anEntry);
+ Handle(GEOM_Object) aBasicObject = GetObjectImpl(theObject);
if (aBasicObject.IsNull()) return aGEOMObject._retn();
//Get the vector1 of translation
- CORBA::String_var aVec1Entry = theVector1->GetEntry();
- Handle(GEOM_Object) aVector1 =
- GetOperations()->GetEngine()->GetObject(theVector1->GetStudyID(), aVec1Entry);
+ Handle(GEOM_Object) aVector1 = GetObjectImpl(theVector1);
if (aVector1.IsNull()) return aGEOMObject._retn();
//Get the vector2 of translation
- CORBA::String_var aVec2Entry = theVector2->GetEntry();
- Handle(GEOM_Object) aVector2 =
- GetOperations()->GetEngine()->GetObject(theVector2->GetStudyID(), aVec2Entry);
+ Handle(GEOM_Object) aVector2 = GetObjectImpl(theVector2);
if (aVector2.IsNull()) return aGEOMObject._retn();
//Perform the translation
*/
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::MultiRotate1D (GEOM::GEOM_Object_ptr theObject,
- GEOM::GEOM_Object_ptr theVector,
- CORBA::Long theNbTimes)
+ GEOM::GEOM_Object_ptr theVector,
+ CORBA::Long theNbTimes)
{
//Set a not done flag
GetOperations()->SetNotDone();
GEOM::GEOM_Object_var aGEOMObject;
- if (theObject == NULL || theVector == NULL) return aGEOMObject._retn();
-
//Get the object itself
- CORBA::String_var anEntry = theObject->GetEntry();
- Handle(GEOM_Object) aBasicObject =
- GetOperations()->GetEngine()->GetObject(theObject->GetStudyID(), anEntry);
+ Handle(GEOM_Object) aBasicObject = GetObjectImpl(theObject);
if (aBasicObject.IsNull()) return aGEOMObject._retn();
//Get the a directon of rotation
- CORBA::String_var aVecEntry = theVector->GetEntry();
- Handle(GEOM_Object) aVector =
- GetOperations()->GetEngine()->GetObject(theVector->GetStudyID(), aVecEntry);
+ Handle(GEOM_Object) aVector = GetObjectImpl(theVector);
if (aVector.IsNull()) return aGEOMObject._retn();
//Perform the rotation
*/
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::MultiRotate2D (GEOM::GEOM_Object_ptr theObject,
- GEOM::GEOM_Object_ptr theVector,
- CORBA::Double theAngle,
- CORBA::Long theNbTimes1,
- CORBA::Double theStep,
- CORBA::Long theNbTimes2)
+ GEOM::GEOM_Object_ptr theVector,
+ CORBA::Double theAngle,
+ CORBA::Long theNbTimes1,
+ CORBA::Double theStep,
+ CORBA::Long theNbTimes2)
{
//Set a not done flag
GetOperations()->SetNotDone();
GEOM::GEOM_Object_var aGEOMObject;
- if (theObject == NULL || theVector == NULL) return aGEOMObject._retn();
-
//Get the object itself
- CORBA::String_var anEntry = theObject->GetEntry();
- Handle(GEOM_Object) aBasicObject =
- GetOperations()->GetEngine()->GetObject(theObject->GetStudyID(), anEntry);
+ Handle(GEOM_Object) aBasicObject = GetObjectImpl(theObject);
if (aBasicObject.IsNull()) return aGEOMObject._retn();
//Get the a directon of rotation
- CORBA::String_var aVecEntry = theVector->GetEntry();
- Handle(GEOM_Object) aVector =
- GetOperations()->GetEngine()->GetObject(theVector->GetStudyID(), aVecEntry);
+ Handle(GEOM_Object) aVector = GetObjectImpl(theVector);
if (aVector.IsNull()) return aGEOMObject._retn();
//Perform the rotation
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::RotateThreePoints
(GEOM::GEOM_Object_ptr theObject,
- GEOM::GEOM_Object_ptr theCentPoint,
- GEOM::GEOM_Object_ptr thePoint1,
- GEOM::GEOM_Object_ptr thePoint2)
+ GEOM::GEOM_Object_ptr theCentPoint,
+ GEOM::GEOM_Object_ptr thePoint1,
+ GEOM::GEOM_Object_ptr thePoint2)
{
//Set a not done flag
GetOperations()->SetNotDone();
GEOM::GEOM_Object_var aGEOMObject;
- if (theCentPoint == NULL || thePoint1 == NULL || thePoint2 == NULL || theObject == NULL)
+ if (CORBA::is_nil(theObject))
return aGEOMObject._retn();
//check if the object is a subshape
aGEOMObject = GEOM::GEOM_Object::_duplicate(theObject);
//Get the object itself
- CORBA::String_var anEntry = theObject->GetEntry();
- Handle(GEOM_Object) anObject =
- GetOperations()->GetEngine()->GetObject(theObject->GetStudyID(), anEntry);
+ Handle(GEOM_Object) anObject = GetObjectImpl(theObject);
if (anObject.IsNull()) return aGEOMObject._retn();
//Get the central point of rotation
- CORBA::String_var aCPEntry = theCentPoint->GetEntry();
- Handle(GEOM_Object) aCentPoint =
- GetOperations()->GetEngine()->GetObject(theCentPoint->GetStudyID(), aCPEntry);
+ Handle(GEOM_Object) aCentPoint = GetObjectImpl(theCentPoint);
if (aCentPoint.IsNull()) return aGEOMObject._retn();
//Get the first point
- CORBA::String_var aP1Entry = thePoint1->GetEntry();
- Handle(GEOM_Object) aPoint1 =
- GetOperations()->GetEngine()->GetObject(thePoint1->GetStudyID(), aP1Entry);
+ Handle(GEOM_Object) aPoint1 = GetObjectImpl(thePoint1);
if (aPoint1.IsNull()) return aGEOMObject._retn();
//Get the second point
- CORBA::String_var aP2Entry = thePoint2->GetEntry();
- Handle(GEOM_Object) aPoint2 =
- GetOperations()->GetEngine()->GetObject(thePoint2->GetStudyID(), aP2Entry);
+ Handle(GEOM_Object) aPoint2 = GetObjectImpl(thePoint2);
if (aPoint2.IsNull()) return aGEOMObject._retn();
//Perform the translation
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::RotateThreePointsCopy
(GEOM::GEOM_Object_ptr theObject,
- GEOM::GEOM_Object_ptr theCentPoint,
- GEOM::GEOM_Object_ptr thePoint1,
- GEOM::GEOM_Object_ptr thePoint2)
+ GEOM::GEOM_Object_ptr theCentPoint,
+ GEOM::GEOM_Object_ptr thePoint1,
+ GEOM::GEOM_Object_ptr thePoint2)
{
GEOM::GEOM_Object_var aGEOMObject;
//Set a not done flag
GetOperations()->SetNotDone();
- if (theCentPoint == NULL || thePoint1 == NULL || thePoint2 == NULL || theObject == NULL)
- return aGEOMObject._retn();
-
//Get the object itself
- CORBA::String_var anEntry = theObject->GetEntry();
- Handle(GEOM_Object) aBasicObject =
- GetOperations()->GetEngine()->GetObject(theObject->GetStudyID(), anEntry);
+ Handle(GEOM_Object) aBasicObject = GetObjectImpl(theObject);
if (aBasicObject.IsNull()) return aGEOMObject._retn();
//Get the central point of rotation
- CORBA::String_var aCPEntry = theCentPoint->GetEntry();
- Handle(GEOM_Object) aCentPoint =
- GetOperations()->GetEngine()->GetObject(theCentPoint->GetStudyID(), aCPEntry);
+ Handle(GEOM_Object) aCentPoint = GetObjectImpl(theCentPoint);
if (aCentPoint.IsNull()) return aGEOMObject._retn();
//Get the first point
- CORBA::String_var aP1Entry = thePoint1->GetEntry();
- Handle(GEOM_Object) aPoint1 =
- GetOperations()->GetEngine()->GetObject(thePoint1->GetStudyID(), aP1Entry);
+ Handle(GEOM_Object) aPoint1 = GetObjectImpl(thePoint1);
if (aPoint1.IsNull()) return aGEOMObject._retn();
//Get the second point
- CORBA::String_var aP2Entry = thePoint2->GetEntry();
- Handle(GEOM_Object) aPoint2 =
- GetOperations()->GetEngine()->GetObject(thePoint2->GetStudyID(), aP2Entry);
+ Handle(GEOM_Object) aPoint2 = GetObjectImpl(thePoint2);
if (aPoint2.IsNull()) return aGEOMObject._retn();
//Perform the rotation
GetOperations()->SetNotDone();
GEOM::GEOM_Object_var aGEOMObject;
- if (theObject == NULL) return aGEOMObject._retn();
-
- //check if the object is a subshape
- //if (!theObject->IsMainShape()) {
- // GetOperations()->SetErrorCode(SUBSHAPE_ERROR);
- // return aGEOMObject._retn();
- //}
+ if (CORBA::is_nil(theObject)) return aGEOMObject._retn();
aGEOMObject = GEOM::GEOM_Object::_duplicate(theObject);
//Get the object itself
- CORBA::String_var anEntry = theObject->GetEntry();
- Handle(GEOM_Object) anObject =
- GetOperations()->GetEngine()->GetObject(theObject->GetStudyID(), anEntry);
+ Handle(GEOM_Object) anObject = GetObjectImpl(theObject);
if (anObject.IsNull()) return aGEOMObject._retn();
//Perform the recomputation
