-// Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE
//
-// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// Lesser General Public License for more details.
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+// 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();