-// Copyright (C) 2005 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// Copyright (C) 2007-2022 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
-//
+//
// 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
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// 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
+// 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/
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
#include "GEOM_Superv_i.hh"
#include "SALOME_LifeCycleCORBA.hxx"
+#include "Utils_CorbaException.hxx"
+#include "SALOME_Fake_NamingService.hxx"
+#include "SALOME_Container_i.hxx"
#include CORBA_SERVER_HEADER(SALOME_Session)
#include "SALOMEDSClient_ClientFactory.hxx"
#define isNewStudy(a,b) (a > 0 && a != b)
-using namespace std;
//=============================================================================
// constructor:
//=============================================================================
GEOM_Superv_i::GEOM_Superv_i(CORBA::ORB_ptr orb,
- PortableServer::POA_ptr poa,
- PortableServer::ObjectId * contId,
- const char *instanceName,
- const char *interfaceName) :
- Engines_Component_i(orb, poa, contId, instanceName, interfaceName)
+ PortableServer::POA_ptr poa,
+ PortableServer::ObjectId * contId,
+ const char *instanceName,
+ const char *interfaceName, bool withRegistry,
+ SALOME_NamingService_Abstract *my_name_service):name_service(my_name_service),Engines_Component_i(orb, poa, contId, instanceName, interfaceName, false, withRegistry)
{
MESSAGE("GEOM_Superv_i::GEOM_Superv_i");
_thisObj = this ;
_id = _poa->activate_object(_thisObj);
- name_service = new SALOME_NamingService(_orb);
//get RootPOA (the default)
//myPOA = PortableServer::RefCountServantBase::_default_POA();
CORBA::Object_var anObj = _orb->resolve_initial_references("RootPOA");
setGeomEngine();
- myStudyID = -1;
- myLastStudyID = -1;
-
myBasicOp = GEOM::GEOM_IBasicOperations::_nil();
my3DPrimOp = GEOM::GEOM_I3DPrimOperations::_nil();
myBoolOp = GEOM::GEOM_IBooleanOperations::_nil();
GEOM_Superv_i::~GEOM_Superv_i()
{
MESSAGE("GEOM_Superv_i::~GEOM_Superv_i");
+ if (!CORBA::is_nil(myBasicOp))
+ myBasicOp->UnRegister();
+ if (!CORBA::is_nil(myBoolOp))
+ myBoolOp->UnRegister();
+ if (!CORBA::is_nil(my3DPrimOp))
+ my3DPrimOp->UnRegister();
delete name_service;
}
//============================================================================
-// function : register()
+// function : register()
// purpose : register 'name' in 'name_service'
//============================================================================
void GEOM_Superv_i::register_name(char * name)
{
- GEOM::GEOM_Superv_ptr g = GEOM::GEOM_Superv::_narrow(POA_GEOM::GEOM_Superv::_this());
- name_service->Register(g, strdup(name));
+ GEOM::GEOM_Superv_var g = _this();
+ name_service->Register(g, name);
}
//=============================================================================
//=============================================================================
void GEOM_Superv_i::setGeomEngine()
{
+ if ( !CORBA::is_nil(myGeomEngine) )
+ return;
+
// get GEOM_Gen engine
+ Engines::Container_var cont=GetContainerRef();
+ CORBA::String_var container_name=cont->name();
+ std::string shortName=container_name.in();
+ shortName=shortName.substr(12); // substract "/Containers/"
SALOME_LifeCycleCORBA* lcc = new SALOME_LifeCycleCORBA( name_service );
- Engines::Component_var comp = lcc->FindOrLoad_Component( "FactoryServer", "GEOM" );
+ Engines::EngineComponent_var comp = lcc->FindOrLoad_Component( shortName.c_str(), "GEOM" );
+ delete lcc;
myGeomEngine = GEOM::GEOM_Gen::_narrow(comp);
}
-//=============================================================================
-// SetStudyID:
-//=============================================================================
-void GEOM_Superv_i::SetStudyID( CORBA::Long theId )
-{
- // mkr : PAL10770 -->
- myLastStudyID = myStudyID;
-
- CORBA::Object_ptr anObject = name_service->Resolve("/Kernel/Session");
- if ( !CORBA::is_nil(anObject) ) {
- SALOME::Session_var aSession = SALOME::Session::_narrow(anObject);
- if ( !CORBA::is_nil(aSession) ) {
- int aStudyID = aSession->GetActiveStudyId();
- if ( theId != aStudyID && aStudyID > 0) { // mkr : IPAL12128
- MESSAGE("Warning : given study ID theId="<<theId<<" is wrong and will be replaced by the value "<<aStudyID);
- myStudyID = aStudyID;
- }
- else
- myStudyID = theId; // mkr : IPAL12128
- }
- }
-
- if ( isNewStudy(myLastStudyID,myStudyID) ) {
- if (CORBA::is_nil(myGeomEngine)) setGeomEngine();
- string anEngine = _orb->object_to_string( myGeomEngine );
-
- CORBA::Object_var anObj = name_service->Resolve("/myStudyManager");
- if ( !CORBA::is_nil(anObj) ) {
- SALOMEDS::StudyManager_var aStudyManager = SALOMEDS::StudyManager::_narrow(anObj);
- if ( !CORBA::is_nil(aStudyManager) ) {
- _PTR(Study) aDSStudy = ClientFactory::Study(aStudyManager->GetStudyByID(myStudyID));
- if ( aDSStudy ) {
- _PTR(SComponent) aSCO = aDSStudy->FindComponent(myGeomEngine->ComponentDataType());
- if ( aSCO ) {
- _PTR(StudyBuilder) aBuilder = aDSStudy->NewBuilder();
- if ( aBuilder ) aBuilder->LoadWith( aSCO, anEngine );
- }
- }
- }
- }
- }
- // mkr : PAL10770 <--
-}
-
//=============================================================================
// CreateListOfGO:
//=============================================================================
//=============================================================================
// AddItemToListOfGO:
//=============================================================================
-void GEOM_Superv_i::AddItemToListOfGO(GEOM::GEOM_List_ptr& theList,
- GEOM::GEOM_Object_ptr theObject)
+void GEOM_Superv_i::AddItemToListOfGO(GEOM::GEOM_List_ptr& theList,
+ GEOM::GEOM_Object_ptr theObject)
{
MESSAGE("GEOM_Superv_i::AddItemToListOfGO(...)");
- if (GEOM_List_i<GEOM::ListOfGO>* aList =
+ GEOM::GEOM_Object_var anObj = GEOM::GEOM_Object::_duplicate(theObject);
+ if (GEOM_List_i<GEOM::ListOfGO>* aList =
dynamic_cast<GEOM_List_i<GEOM::ListOfGO>*>(GetServant(theList, myPOA).in())) {
- aList->AddObject(theObject);
+ aList->AddObject(anObj);
MESSAGE(" NewLength = "<<aList->GetList().length());
}
}
//=============================================================================
// AddItemToListOfLong:
//=============================================================================
-void GEOM_Superv_i::AddItemToListOfLong(GEOM::GEOM_List_ptr& theList,
- CORBA::Long theObject)
+void GEOM_Superv_i::AddItemToListOfLong(GEOM::GEOM_List_ptr& theList,
+ CORBA::Long theObject)
{
MESSAGE("GEOM_Superv_i::AddItemToListOfLong(...)");
- if (GEOM_List_i<GEOM::ListOfLong>* aList =
+ if (GEOM_List_i<GEOM::ListOfLong>* aList =
dynamic_cast<GEOM_List_i<GEOM::ListOfLong>*>(GetServant(theList, myPOA).in())) {
aList->AddObject(theObject);
MESSAGE(" NewLength = "<<aList->GetList().length());
//=============================================================================
// AddItemToListOfDouble:
//=============================================================================
-void GEOM_Superv_i::AddItemToListOfDouble(GEOM::GEOM_List_ptr& theList,
- CORBA::Double theObject)
+void GEOM_Superv_i::AddItemToListOfDouble(GEOM::GEOM_List_ptr& theList,
+ CORBA::Double theObject)
{
MESSAGE("GEOM_Superv_i::AddItemToListOfDouble(...)");
- if (GEOM_List_i<GEOM::ListOfDouble>* aList =
+ if (GEOM_List_i<GEOM::ListOfDouble>* aList =
dynamic_cast<GEOM_List_i<GEOM::ListOfDouble>*>(GetServant(theList, myPOA).in())) {
aList->AddObject(theObject);
MESSAGE(" NewLength = "<<aList->GetList().length());
if (CORBA::is_nil(myGeomEngine))
setGeomEngine();
// get GEOM_IBasicOperations interface
- if (CORBA::is_nil(myBasicOp) || isNewStudy(myLastStudyID,myStudyID))
- myBasicOp = myGeomEngine->GetIBasicOperations(myStudyID);
+ if (CORBA::is_nil(myBasicOp)) {
+ myBasicOp = myGeomEngine->GetIBasicOperations();
+ }
}
//=============================================================================
if (CORBA::is_nil(myGeomEngine))
setGeomEngine();
// get GEOM_I3DPrimOperations interface
- if (CORBA::is_nil(my3DPrimOp) || isNewStudy(myLastStudyID,myStudyID))
- my3DPrimOp = myGeomEngine->GetI3DPrimOperations(myStudyID);
+ if (CORBA::is_nil(my3DPrimOp)) {
+ my3DPrimOp = myGeomEngine->GetI3DPrimOperations();
+ }
}
//=============================================================================
if (CORBA::is_nil(myGeomEngine))
setGeomEngine();
// get GEOM_IBooleanOperations interface
- if (CORBA::is_nil(myBoolOp) || isNewStudy(myLastStudyID,myStudyID))
- myBoolOp = myGeomEngine->GetIBooleanOperations(myStudyID);
+ if (CORBA::is_nil(myBoolOp)) {
+ myBoolOp = myGeomEngine->GetIBooleanOperations();
+ }
}
//=============================================================================
if (CORBA::is_nil(myGeomEngine))
setGeomEngine();
// get GEOM_IInsertOperations interface
- if (CORBA::is_nil(myInsOp) || isNewStudy(myLastStudyID,myStudyID))
- myInsOp = myGeomEngine->GetIInsertOperations(myStudyID);
+ if (CORBA::is_nil(myInsOp)) {
+ myInsOp = myGeomEngine->GetIInsertOperations();
+ }
}
//=============================================================================
if (CORBA::is_nil(myGeomEngine))
setGeomEngine();
// get GEOM_ITransformOperations interface
- if (CORBA::is_nil(myTransfOp) || isNewStudy(myLastStudyID,myStudyID))
- myTransfOp = myGeomEngine->GetITransformOperations(myStudyID);
+ if (CORBA::is_nil(myTransfOp)) {
+ myTransfOp = myGeomEngine->GetITransformOperations();
+ }
}
//=============================================================================
if (CORBA::is_nil(myGeomEngine))
setGeomEngine();
// get GEOM_IShapesOperations interface
- if (CORBA::is_nil(myShapesOp) || isNewStudy(myLastStudyID,myStudyID))
- myShapesOp = myGeomEngine->GetIShapesOperations(myStudyID);
+ if (CORBA::is_nil(myShapesOp)) {
+ myShapesOp = myGeomEngine->GetIShapesOperations();
+ }
}
//=============================================================================
if (CORBA::is_nil(myGeomEngine))
setGeomEngine();
// get GEOM_IBlocksOperations interface
- if (CORBA::is_nil(myBlocksOp) || isNewStudy(myLastStudyID,myStudyID))
- myBlocksOp = myGeomEngine->GetIBlocksOperations(myStudyID);
+ if (CORBA::is_nil(myBlocksOp)) {
+ myBlocksOp = myGeomEngine->GetIBlocksOperations();
+ }
}
//=============================================================================
if (CORBA::is_nil(myGeomEngine))
setGeomEngine();
// get GEOM_ICurvesOperations interface
- if (CORBA::is_nil(myCurvesOp) || isNewStudy(myLastStudyID,myStudyID))
- myCurvesOp = myGeomEngine->GetICurvesOperations(myStudyID);
+ if (CORBA::is_nil(myCurvesOp)) {
+ myCurvesOp = myGeomEngine->GetICurvesOperations();
+ }
}
//=============================================================================
if (CORBA::is_nil(myGeomEngine))
setGeomEngine();
// get GEOM_ILocalOperations interface
- if (CORBA::is_nil(myLocalOp) || isNewStudy(myLastStudyID,myStudyID))
- myLocalOp = myGeomEngine->GetILocalOperations(myStudyID);
+ if (CORBA::is_nil(myLocalOp)) {
+ myLocalOp = myGeomEngine->GetILocalOperations();
+ }
}
//=============================================================================
if (CORBA::is_nil(myGeomEngine))
setGeomEngine();
// get GEOM_IGroupOperations interface
- if (CORBA::is_nil(myGroupOp) || isNewStudy(myLastStudyID,myStudyID))
- myGroupOp = myGeomEngine->GetIGroupOperations(myStudyID);
+ if (CORBA::is_nil(myGroupOp)) {
+ myGroupOp = myGeomEngine->GetIGroupOperations();
+ }
+}
+
+//=============================================================================
+// getAdvancedOp:
+//=============================================================================
+void GEOM_Superv_i::getAdvancedOp()
+{
+ if (CORBA::is_nil(myGeomEngine))
+ setGeomEngine();
+ // get GEOM::IAdvancedOperations interface
+ if (CORBA::is_nil(myAdvancedOp)) {
+ myAdvancedOp = GEOM::IAdvancedOperations::_narrow(myGeomEngine->GetPluginOperations("AdvancedEngine"));
+ }
+}
+
+//=============================================================================
+// getSTLPluginOp:
+//=============================================================================
+void GEOM_Superv_i::getSTLPluginOp()
+{
+ if (CORBA::is_nil(myGeomEngine))
+ setGeomEngine();
+ // get GEOM::ISTLOperations interface
+ if (CORBA::is_nil(mySTLOp)) {
+ mySTLOp = GEOM::ISTLOperations::_narrow(myGeomEngine->GetPluginOperations("STLPluginEngine"));
+ }
+}
+
+//=============================================================================
+// getBREPPluginOp:
+//=============================================================================
+void GEOM_Superv_i::getBREPPluginOp()
+{
+ if (CORBA::is_nil(myGeomEngine))
+ setGeomEngine();
+ // get GEOM:IBREPOperations interface
+ if (CORBA::is_nil(myBREPOp)) {
+ myBREPOp = GEOM::IBREPOperations::_narrow(myGeomEngine->GetPluginOperations("BREPPluginEngine"));
+ }
+}
+
+//=============================================================================
+// getSTEPPluginOp:
+//=============================================================================
+void GEOM_Superv_i::getSTEPPluginOp()
+{
+ if (CORBA::is_nil(myGeomEngine))
+ setGeomEngine();
+ // get GEOM::ISTEPOperations interface
+ if (CORBA::is_nil(mySTEPOp)) {
+ mySTEPOp = GEOM::ISTEPOperations::_narrow(myGeomEngine->GetPluginOperations("STEPPluginEngine"));
+ }
+}
+
+//=============================================================================
+// getIGESPluginOp:
+//=============================================================================
+void GEOM_Superv_i::getIGESPluginOp()
+{
+ if (CORBA::is_nil(myGeomEngine))
+ setGeomEngine();
+ // get GEOM::IIGESOperations interface
+ if (CORBA::is_nil(myIGESOp)) {
+ myIGESOp = GEOM::IIGESOperations::_narrow(myGeomEngine->GetPluginOperations("IGESPluginEngine"));
+ }
+}
+
+//=============================================================================
+// getXAOPluginOp:
+//=============================================================================
+void GEOM_Superv_i::getXAOPluginOp()
+{
+ if (CORBA::is_nil(myGeomEngine))
+ setGeomEngine();
+ // get GEOM::IXAOOperations interface
+ if (CORBA::is_nil(myXAOOp)) {
+ myXAOOp = GEOM::IXAOOperations::_narrow(myGeomEngine->GetPluginOperations("XAOPluginEngine"));
+ }
+}
+
+#ifdef WITH_VTK
+//=============================================================================
+// getVTKPluginOp:
+//=============================================================================
+void GEOM_Superv_i::getVTKPluginOp()
+{
+ if (CORBA::is_nil(myGeomEngine))
+ setGeomEngine();
+ // get GEOM::IVTKOperations interface
+ if (CORBA::is_nil(myVTKOp)) {
+ myVTKOp = GEOM::IVTKOperations::_narrow(myGeomEngine->GetPluginOperations("VTKPluginEngine"));
+ }
}
+#endif
//=============================================================================
// GetServant:
//=============================================================================
PortableServer::ServantBase_var GEOM_Superv_i::GetServant(CORBA::Object_ptr theObject,
- PortableServer::POA_ptr thePOA)
+ PortableServer::POA_ptr thePOA)
{
if(CORBA::is_nil(theObject)) return NULL;
PortableServer::Servant aServant = thePOA->reference_to_servant(theObject);
// function : Save()
// purpose : save OCAF/Geom document
//============================================================================
-SALOMEDS::TMPFile* GEOM_Superv_i::Save(SALOMEDS::SComponent_ptr theComponent,
- const char* theURL,
- CORBA::Boolean isMultiFile)
+SALOMEDS::TMPFile* GEOM_Superv_i::Save(SALOMEDS::SComponent_ptr /*theComponent*/,
+ const char* /*theURL*/,
+ CORBA::Boolean /*isMultiFile*/)
{
SALOMEDS::TMPFile_var aStreamFile;
return aStreamFile._retn();
//============================================================================
// function : SaveASCII()
// purpose :
-//============================================================================
-SALOMEDS::TMPFile* GEOM_Superv_i::SaveASCII(SALOMEDS::SComponent_ptr theComponent,
- const char* theURL,
- CORBA::Boolean isMultiFile)
+//============================================================================
+SALOMEDS::TMPFile* GEOM_Superv_i::SaveASCII(SALOMEDS::SComponent_ptr /*theComponent*/,
+ const char* /*theURL*/,
+ CORBA::Boolean /*isMultiFile*/)
{
SALOMEDS::TMPFile_var aStreamFile;
return aStreamFile._retn();
//============================================================================
// function : Load()
// purpose :
-//============================================================================
-CORBA::Boolean GEOM_Superv_i::Load(SALOMEDS::SComponent_ptr theComponent,
- const SALOMEDS::TMPFile& theStream,
- const char* theURL,
- CORBA::Boolean isMultiFile)
+//============================================================================
+CORBA::Boolean GEOM_Superv_i::Load(SALOMEDS::SComponent_ptr /*theComponent*/,
+ const SALOMEDS::TMPFile& /*theStream*/,
+ const char* /*theURL*/,
+ CORBA::Boolean /*isMultiFile*/)
{
return false;
}
//============================================================================
// function : LoadASCII()
// purpose :
-//============================================================================
-CORBA::Boolean GEOM_Superv_i::LoadASCII(SALOMEDS::SComponent_ptr theComponent,
- const SALOMEDS::TMPFile& theStream,
- const char* theURL,
- CORBA::Boolean isMultiFile)
+//============================================================================
+CORBA::Boolean GEOM_Superv_i::LoadASCII(SALOMEDS::SComponent_ptr /*theComponent*/,
+ const SALOMEDS::TMPFile& /*theStream*/,
+ const char* /*theURL*/,
+ CORBA::Boolean /*isMultiFile*/)
{
return false;
}
// function : Close()
// purpose :
//============================================================================
-void GEOM_Superv_i::Close(SALOMEDS::SComponent_ptr theComponent)
+void GEOM_Superv_i::Close(SALOMEDS::SComponent_ptr /*theComponent*/)
{
}
// function : IORToLocalPersistentID()
// purpose :
//============================================================================
-char* GEOM_Superv_i::IORToLocalPersistentID(SALOMEDS::SObject_ptr theSObject,
- const char* IORString,
- CORBA::Boolean isMultiFile,
- CORBA::Boolean isASCII)
+char* GEOM_Superv_i::IORToLocalPersistentID(SALOMEDS::SObject_ptr /*theSObject*/,
+ const char* /*IORString*/,
+ CORBA::Boolean /*isMultiFile*/,
+ CORBA::Boolean /*isASCII*/)
{
return 0;
}
// : Used when a study is loaded
// : The IOR (IORName) of object created is returned
//============================================================================
-char* GEOM_Superv_i::LocalPersistentIDToIOR(SALOMEDS::SObject_ptr theSObject,
- const char* aLocalPersistentID,
- CORBA::Boolean isMultiFile,
- CORBA::Boolean isASCII)
+char* GEOM_Superv_i::LocalPersistentIDToIOR(SALOMEDS::SObject_ptr /*theSObject*/,
+ const char* /*aLocalPersistentID*/,
+ CORBA::Boolean /*isMultiFile*/,
+ CORBA::Boolean /*isASCII*/)
{
return 0;
}
//============================================================================
// function : CanPublishInStudy
-// purpose :
+// purpose :
//============================================================================
CORBA::Boolean GEOM_Superv_i::CanPublishInStudy(CORBA::Object_ptr theIOR)
{
//============================================================================
// function : PublishInStudy
-// purpose :
+// purpose :
+//============================================================================
+SALOMEDS::SObject_ptr GEOM_Superv_i::PublishInStudy(SALOMEDS::SObject_ptr theSObject,
+ CORBA::Object_ptr theObject,
+ const char* theName)
+{
+ if (CORBA::is_nil(myGeomEngine))
+ setGeomEngine();
+ return myGeomEngine->PublishInStudy(theSObject, theObject, theName);
+}
+
+//============================================================================
+// function : PublishNamedShapesInStudy
+// purpose :
//============================================================================
-SALOMEDS::SObject_ptr GEOM_Superv_i::PublishInStudy(SALOMEDS::Study_ptr theStudy,
- SALOMEDS::SObject_ptr theSObject,
- CORBA::Object_ptr theObject,
- const char* theName) throw (SALOME::SALOME_Exception)
+GEOM::ListOfGO*
+GEOM_Superv_i::PublishNamedShapesInStudy(//SALOMEDS::SObject_ptr theSObject,
+ CORBA::Object_ptr theObject)
{
if (CORBA::is_nil(myGeomEngine))
setGeomEngine();
- return myGeomEngine->PublishInStudy(theStudy, theSObject, theObject, theName);
+ return myGeomEngine->PublishNamedShapesInStudy(theObject);
}
//============================================================================
// function : CanCopy()
// purpose :
//============================================================================
-CORBA::Boolean GEOM_Superv_i::CanCopy(SALOMEDS::SObject_ptr theObject)
+CORBA::Boolean GEOM_Superv_i::CanCopy(SALOMEDS::SObject_ptr /*theObject*/)
{
return false;
}
// function : CopyFrom()
// purpose :
//============================================================================
-SALOMEDS::TMPFile* GEOM_Superv_i::CopyFrom(SALOMEDS::SObject_ptr theObject, CORBA::Long& theObjectID)
+SALOMEDS::TMPFile* GEOM_Superv_i::CopyFrom(SALOMEDS::SObject_ptr /*theObject*/, CORBA::Long& /*theObjectID*/)
{
SALOMEDS::TMPFile_var aStreamFile;
return aStreamFile._retn();
// function : CanPaste()
// purpose :
//============================================================================
-CORBA::Boolean GEOM_Superv_i::CanPaste(const char* theComponentName, CORBA::Long theObjectID)
+CORBA::Boolean GEOM_Superv_i::CanPaste(const char* /*theComponentName*/, CORBA::Long /*theObjectID*/)
{
return false;
}
// function : PasteInto()
// purpose :
//============================================================================
-SALOMEDS::SObject_ptr GEOM_Superv_i::PasteInto(const SALOMEDS::TMPFile& theStream,
- CORBA::Long theObjectID,
- SALOMEDS::SObject_ptr theObject)
+SALOMEDS::SObject_ptr GEOM_Superv_i::PasteInto(const SALOMEDS::TMPFile& /*theStream*/,
+ CORBA::Long /*theObjectID*/,
+ SALOMEDS::SObject_ptr /*theObject*/)
{
SALOMEDS::SObject_var aNewSO;
return aNewSO._retn();
// MakePointXYZ:
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_Superv_i::MakePointXYZ(CORBA::Double theX,
- CORBA::Double theY,
- CORBA::Double theZ)
+ CORBA::Double theY,
+ CORBA::Double theZ)
{
+ beginService( " GEOM_Superv_i::MakePointXYZ" );
MESSAGE("GEOM_Superv_i::MakePointXYZ");
getBasicOp();
// make vertex and return
- return myBasicOp->MakePointXYZ(theX, theY, theZ);
+ GEOM::GEOM_Object_ptr anObj = myBasicOp->MakePointXYZ(theX, theY, theZ);
+ endService( " GEOM_Superv_i::MakePointXYZ" );
+ return anObj;
}
//=============================================================================
// MakePointWithReference:
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_Superv_i::MakePointWithReference (GEOM::GEOM_Object_ptr theReference,
- CORBA::Double theX,
- CORBA::Double theY,
- CORBA::Double theZ)
+ CORBA::Double theX,
+ CORBA::Double theY,
+ CORBA::Double theZ)
{
+ beginService( " GEOM_Superv_i::MakePointWithReference" );
MESSAGE("GEOM_Superv_i::MakePointWithReference");
getBasicOp();
- return myBasicOp->MakePointWithReference(theReference, theX, theY, theZ);
+ GEOM::GEOM_Object_ptr anObj = myBasicOp->MakePointWithReference(theReference, theX, theY, theZ);
+ endService( " GEOM_Superv_i::MakePointWithReference" );
+ return anObj;
}
//=============================================================================
// MakePointOnCurve:
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_Superv_i::MakePointOnCurve (GEOM::GEOM_Object_ptr theRefCurve,
- CORBA::Double theParameter)
+ CORBA::Double theParameter)
{
+ beginService( " GEOM_Superv_i::MakePointOnCurve" );
MESSAGE("GEOM_Superv_i::MakePointOnCurve");
getBasicOp();
- return myBasicOp->MakePointOnCurve(theRefCurve, theParameter);
+ GEOM::GEOM_Object_ptr anObj = myBasicOp->MakePointOnCurve(theRefCurve, theParameter, false);
+ endService( " GEOM_Superv_i::MakePointOnCurve" );
+ return anObj;
+}
+
+//=============================================================================
+// MakePointOnCurveByLength:
+//=============================================================================
+GEOM::GEOM_Object_ptr GEOM_Superv_i::MakePointOnCurveByLength (GEOM::GEOM_Object_ptr theRefCurve,
+ CORBA::Double theLength,
+ GEOM::GEOM_Object_ptr theStartPoint)
+{
+ beginService( " GEOM_Superv_i::MakePointOnCurveByLength" );
+ MESSAGE("GEOM_Superv_i::MakePointOnCurveByLength");
+ getBasicOp();
+ GEOM::GEOM_Object_ptr anObj = myBasicOp->MakePointOnCurveByLength(theRefCurve, theLength, theStartPoint);
+ endService( " GEOM_Superv_i::MakePointOnCurveByLength" );
+ return anObj;
+}
+
+//=============================================================================
+// MakePointOnCurveByCoord
+//=============================================================================
+GEOM::GEOM_Object_ptr GEOM_Superv_i::MakePointOnCurveByCoord (GEOM::GEOM_Object_ptr theRefCurve,
+ CORBA::Double theXParameter,
+ CORBA::Double theYParameter,
+ CORBA::Double theZParameter)
+{
+ beginService( " GEOM_Superv_i::MakePointOnCurveByCoord" );
+ MESSAGE("GEOM_Superv_i::MakePointOnCurveByCoord");
+ getBasicOp();
+ GEOM::GEOM_Object_ptr anObj =
+ myBasicOp->MakePointOnCurveByCoord(theRefCurve, theXParameter,
+ theYParameter, theZParameter);
+ endService( " GEOM_Superv_i::MakePointOnCurveByCoord" );
+ return anObj;
+}
+
+//=============================================================================
+// MakePointOnSurface:
+//=============================================================================
+GEOM::GEOM_Object_ptr GEOM_Superv_i::MakePointOnSurface (GEOM::GEOM_Object_ptr theRefSurface,
+ CORBA::Double theUParameter,
+ CORBA::Double theVParameter)
+{
+ beginService( " GEOM_Superv_i::MakePointOnSurface" );
+ MESSAGE("GEOM_Superv_i::MakePointOnSurface");
+ getBasicOp();
+ GEOM::GEOM_Object_ptr anObj =
+ myBasicOp->MakePointOnSurface(theRefSurface, theUParameter, theVParameter);
+ endService( " GEOM_Superv_i::MakePointOnSurface" );
+ return anObj;
+}
+
+//=============================================================================
+// MakePointOnSurfaceByCoord
+//=============================================================================
+GEOM::GEOM_Object_ptr GEOM_Superv_i::MakePointOnSurfaceByCoord (GEOM::GEOM_Object_ptr theRefSurface,
+ CORBA::Double theXParameter,
+ CORBA::Double theYParameter,
+ CORBA::Double theZParameter)
+{
+ beginService( " GEOM_Superv_i::MakePointOnSurfaceByCoord" );
+ MESSAGE("GEOM_Superv_i::MakePointOnSurfaceByCoord");
+ getBasicOp();
+ GEOM::GEOM_Object_ptr anObj =
+ myBasicOp->MakePointOnSurfaceByCoord(theRefSurface, theXParameter,
+ theYParameter, theZParameter);
+ endService( " GEOM_Superv_i::MakePointOnSurfaceByCoord" );
+ return anObj;
+}
+
+//=============================================================================
+// MakePointOnLinesIntersection:
+//=============================================================================
+GEOM::GEOM_Object_ptr GEOM_Superv_i::MakePointOnLinesIntersection (GEOM::GEOM_Object_ptr theRefLine1,
+ GEOM::GEOM_Object_ptr theRefLine2)
+{
+ beginService( " GEOM_Superv_i::MakePointOnLinesIntersection" );
+ MESSAGE("GEOM_Superv_i::MakePointOnLinesIntersection");
+ getBasicOp();
+ GEOM::GEOM_Object_ptr anObj = myBasicOp->MakePointOnLinesIntersection(theRefLine1, theRefLine2);
+ endService( " GEOM_Superv_i::MakePointOnLinesIntersection" );
+ return anObj;
+}
+
+//=============================================================================
+// MakeTangentOnCurve:
+//=============================================================================
+GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeTangentOnCurve (GEOM::GEOM_Object_ptr theRefCurve,
+ CORBA::Double theParameter)
+{
+ beginService( " GEOM_Superv_i::MakeTangentOnCurve" );
+ MESSAGE("GEOM_Superv_i::MakeTangentOnCurve");
+ getBasicOp();
+ GEOM::GEOM_Object_ptr anObj = myBasicOp->MakeTangentOnCurve(theRefCurve, theParameter);
+ endService( " GEOM_Superv_i::MakeTangentOnCurve" );
+ return anObj;
}
//=============================================================================
// MakeVectorDXDYDZ:
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeVectorDXDYDZ (CORBA::Double theDX,
- CORBA::Double theDY,
- CORBA::Double theDZ)
+ CORBA::Double theDY,
+ CORBA::Double theDZ)
{
+ beginService( " GEOM_Superv_i::MakeVectorDXDYDZ" );
MESSAGE("GEOM_Superv_i::MakeVectorDXDYDZ");
getBasicOp();
- return myBasicOp->MakeVectorDXDYDZ(theDX, theDY, theDZ);
+ GEOM::GEOM_Object_ptr anObj = myBasicOp->MakeVectorDXDYDZ(theDX, theDY, theDZ);
+ endService( " GEOM_Superv_i::MakeVectorDXDYDZ" );
+ return anObj;
}
//=============================================================================
// MakeVectorTwoPnt:
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeVectorTwoPnt (GEOM::GEOM_Object_ptr thePnt1,
- GEOM::GEOM_Object_ptr thePnt2)
+ GEOM::GEOM_Object_ptr thePnt2)
{
+ beginService( " GEOM_Superv_i::MakeVectorTwoPnt" );
MESSAGE("GEOM_Superv_i::MakeVector");
getBasicOp();
- return myBasicOp->MakeVectorTwoPnt(thePnt1, thePnt2);
+ GEOM::GEOM_Object_ptr anObj = myBasicOp->MakeVectorTwoPnt(thePnt1, thePnt2);
+ endService( " GEOM_Superv_i::MakeVectorTwoPnt" );
+ return anObj;
}
//=============================================================================
// MakeLineTwoPnt:
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeLineTwoPnt (GEOM::GEOM_Object_ptr thePnt1,
- GEOM::GEOM_Object_ptr thePnt2)
+ GEOM::GEOM_Object_ptr thePnt2)
{
+ beginService( " GEOM_Superv_i::MakeLineTwoPnt");
MESSAGE("GEOM_Superv_i::MakeLineTwoPnt");
getBasicOp();
- return myBasicOp->MakeLineTwoPnt(thePnt1, thePnt2);
+ GEOM::GEOM_Object_ptr anObj = myBasicOp->MakeLineTwoPnt(thePnt1, thePnt2);
+ endService( " GEOM_Superv_i::MakeLineTwoPnt");
+ return anObj;
+}
+
+//=============================================================================
+// MakeLineTwoFaces:
+//=============================================================================
+GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeLineTwoFaces (GEOM::GEOM_Object_ptr theFace1,
+ GEOM::GEOM_Object_ptr theFace2)
+{
+ beginService( " GEOM_Superv_i::MakeLineTwoFaces");
+ MESSAGE("GEOM_Superv_i::MakeLineTwoFaces");
+ getBasicOp();
+ GEOM::GEOM_Object_ptr anObj = myBasicOp->MakeLineTwoFaces(theFace1, theFace2);
+ endService( " GEOM_Superv_i::MakeLineTwoFaces");
+ return anObj;
}
//=============================================================================
// MakePlaneThreePnt:
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_Superv_i::MakePlaneThreePnt (GEOM::GEOM_Object_ptr thePnt1,
- GEOM::GEOM_Object_ptr thePnt2,
- GEOM::GEOM_Object_ptr thePnt3,
- CORBA::Double theTrimSize)
+ GEOM::GEOM_Object_ptr thePnt2,
+ GEOM::GEOM_Object_ptr thePnt3,
+ CORBA::Double theTrimSize)
{
+ beginService( " GEOM_Superv_i::MakePlaneThreePnt");
MESSAGE("GEOM_Superv_i::MakePlaneThreePnt");
getBasicOp();
- return myBasicOp->MakePlaneThreePnt(thePnt1, thePnt2, thePnt3, theTrimSize);
+ GEOM::GEOM_Object_ptr anObj = myBasicOp->MakePlaneThreePnt(thePnt1, thePnt2, thePnt3, theTrimSize);
+ endService( " GEOM_Superv_i::MakePlaneThreePnt");
+ return anObj;
}
//=============================================================================
// MakePlanePntVec:
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_Superv_i::MakePlanePntVec (GEOM::GEOM_Object_ptr thePnt,
- GEOM::GEOM_Object_ptr theVec,
- CORBA::Double theTrimSize)
+ GEOM::GEOM_Object_ptr theVec,
+ CORBA::Double theTrimSize)
{
+ beginService( " GEOM_Superv_i::MakePlanePntVec" );
MESSAGE("GEOM_Superv_i::MakePlanePntVec");
getBasicOp();
- return myBasicOp->MakePlanePntVec(thePnt, theVec, theTrimSize);
+ GEOM::GEOM_Object_ptr anObj = myBasicOp->MakePlanePntVec(thePnt, theVec, theTrimSize);
+ endService( " GEOM_Superv_i::MakePlanePntVec" );
+ return anObj;
}
//=============================================================================
// MakePlaneFace:
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_Superv_i::MakePlaneFace (GEOM::GEOM_Object_ptr theFace,
- CORBA::Double theTrimSize)
+ CORBA::Double theTrimSize)
{
+ beginService( " GEOM_Superv_i::MakePlaneFace" );
MESSAGE("GEOM_Superv_i::MakePlaneFace");
getBasicOp();
- return myBasicOp->MakePlaneFace(theFace, theTrimSize);
+ GEOM::GEOM_Object_ptr anObj = myBasicOp->MakePlaneFace(theFace, theTrimSize);
+ endService( " GEOM_Superv_i::MakePlaneFace" );
+ return anObj;
+}
+
+//=============================================================================
+// MakePlane2Vec:
+//=============================================================================
+GEOM::GEOM_Object_ptr GEOM_Superv_i::MakePlane2Vec (GEOM::GEOM_Object_ptr theVec1,
+ GEOM::GEOM_Object_ptr theVec2,
+ CORBA::Double theTrimSize)
+{
+ beginService( " GEOM_Superv_i::MakePlane2Vec" );
+ MESSAGE("GEOM_Superv_i::MakePlane2Vec");
+ getBasicOp();
+ GEOM::GEOM_Object_ptr anObj = myBasicOp->MakePlane2Vec(theVec1, theVec2, theTrimSize);
+ endService( " GEOM_Superv_i::MakePlane2Vec" );
+ return anObj;
+}
+
+//=============================================================================
+// MakePlaneLCS:
+//=============================================================================
+GEOM::GEOM_Object_ptr GEOM_Superv_i::MakePlaneLCS (GEOM::GEOM_Object_ptr theLCS,
+ CORBA::Double theTrimSize,
+ CORBA::Double theOrientation)
+{
+ beginService( " GEOM_Superv_i::MakePlaneLCS" );
+ MESSAGE("GEOM_Superv_i::MakePlaneLCS");
+ getBasicOp();
+ GEOM::GEOM_Object_ptr anObj = myBasicOp->MakePlaneLCS(theLCS, theTrimSize, theOrientation);
+ endService( " GEOM_Superv_i::MakePlaneLCS" );
+ return anObj;
}
//=============================================================================
// MakeMarker:
//=============================================================================
-GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeMarker
+GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeMarker
(CORBA::Double theOX , CORBA::Double theOY , CORBA::Double theOZ,
CORBA::Double theXDX, CORBA::Double theXDY, CORBA::Double theXDZ,
CORBA::Double theYDX, CORBA::Double theYDY, CORBA::Double theYDZ)
{
+ beginService( " GEOM_Superv_i::MakeMarker" );
MESSAGE("GEOM_Superv_i::MakeMarker");
getBasicOp();
- return myBasicOp->MakeMarker(theOX, theOY, theOZ, theXDX, theXDY, theXDZ, theYDX, theYDY, theYDZ);
+ GEOM::GEOM_Object_ptr anObj = myBasicOp->MakeMarker(theOX, theOY, theOZ, theXDX, theXDY, theXDZ, theYDX, theYDY, theYDZ);
+ endService( " GEOM_Superv_i::MakeMarker" );
+ return anObj;
+}
+
+//=============================================================================
+// MakeMarkerFromShape:
+//=============================================================================
+GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeMarkerFromShape (GEOM::GEOM_Object_ptr theShape)
+{
+ beginService( " GEOM_Superv_i::MakeMarkerFromShape" );
+ MESSAGE("GEOM_Superv_i::MakeMarkerFromShape");
+ getBasicOp();
+ GEOM::GEOM_Object_ptr anObj = myBasicOp->MakeMarkerFromShape(theShape);
+ endService( " GEOM_Superv_i::MakeMarkerFromShape" );
+ return anObj;
+}
+
+//=============================================================================
+// MakeMarkerPntTwoVec:
+//=============================================================================
+GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeMarkerPntTwoVec (GEOM::GEOM_Object_ptr theOrigin,
+ GEOM::GEOM_Object_ptr theXVec,
+ GEOM::GEOM_Object_ptr theYVec)
+{
+ beginService( " GEOM_Superv_i::MakeMarkerPntTwoVec" );
+ MESSAGE("GEOM_Superv_i::MakeMarkerPntTwoVec");
+ getBasicOp();
+ GEOM::GEOM_Object_ptr anObj = myBasicOp->MakeMarkerPntTwoVec(theOrigin, theXVec, theYVec);
+ endService( " GEOM_Superv_i::MakeMarkerPntTwoVec" );
+ return anObj;
+}
+
+//=============================================================================
+// MakeTangentPlaneOnFace:
+//=============================================================================
+GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeTangentPlaneOnFace (GEOM::GEOM_Object_ptr theFace,
+ CORBA::Double theParameterU,
+ CORBA::Double theParameterV,
+ CORBA::Double theTrimSize)
+{
+ beginService( " GEOM_Superv_i::MakeTangentPlaneOnFace" );
+ MESSAGE("GEOM_Superv_i::MakeTangentPlaneOnFace");
+ getBasicOp();
+ GEOM::GEOM_Object_ptr anObj = myBasicOp->MakeTangentPlaneOnFace(theFace, theParameterU,theParameterV,theTrimSize);
+ endService( " GEOM_Superv_i::MakeTangentPlaneOnFace" );
+ return anObj;
}
//================= Primitives Construction : 3DPrimOperations ================
// MakeBox:
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeBox (CORBA::Double theX1,
- CORBA::Double theY1,
- CORBA::Double theZ1,
- CORBA::Double theX2,
- CORBA::Double theY2,
- CORBA::Double theZ2)
+ CORBA::Double theY1,
+ CORBA::Double theZ1,
+ CORBA::Double theX2,
+ CORBA::Double theY2,
+ CORBA::Double theZ2)
{
+ beginService( " GEOM_Superv_i::MakeBox" );
MESSAGE("GEOM_Superv_i::MakeBox");
getBasicOp();
get3DPrimOp();
- return my3DPrimOp->MakeBoxTwoPnt(myBasicOp->MakePointXYZ(theX1, theY1, theZ1),
- myBasicOp->MakePointXYZ(theX2, theY2, theZ2));
+ GEOM::GEOM_Object_ptr anObj = my3DPrimOp->MakeBoxTwoPnt(myBasicOp->MakePointXYZ(theX1, theY1, theZ1),
+ myBasicOp->MakePointXYZ(theX2, theY2, theZ2));
+ endService( " GEOM_Superv_i::MakeBox" );
+ return anObj;
}
//=============================================================================
// MakeBoxDXDYDZ:
//=============================================================================
-GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeBoxDXDYDZ (CORBA::Double theDX,
- CORBA::Double theDY,
- CORBA::Double theDZ)
+GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeBoxDXDYDZ (CORBA::Double theDX,
+ CORBA::Double theDY,
+ CORBA::Double theDZ)
{
+ beginService( " GEOM_Superv_i::MakeBoxDXDYDZ" );
MESSAGE("GEOM_Superv_i::MakeBoxDXDYDZ");
get3DPrimOp();
- return my3DPrimOp->MakeBoxDXDYDZ(theDX, theDY, theDZ);
+ GEOM::GEOM_Object_ptr anObj = my3DPrimOp->MakeBoxDXDYDZ(theDX, theDY, theDZ);
+ endService( " GEOM_Superv_i::MakeBoxDXDYDZ" );
+ return anObj;
}
//=============================================================================
// MakeBoxTwoPnt:
//=============================================================================
-GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeBoxTwoPnt (GEOM::GEOM_Object_ptr thePnt1,
- GEOM::GEOM_Object_ptr thePnt2)
+GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeBoxTwoPnt (GEOM::GEOM_Object_ptr thePnt1,
+ GEOM::GEOM_Object_ptr thePnt2)
{
+ beginService( " GEOM_Superv_i::MakeBoxTwoPnt" );
MESSAGE("GEOM_Superv_i::MakeBoxTwoPnt");
get3DPrimOp();
- return my3DPrimOp->MakeBoxTwoPnt(thePnt1, thePnt2);
+ GEOM::GEOM_Object_ptr anObj = my3DPrimOp->MakeBoxTwoPnt(thePnt1, thePnt2);
+ endService( " GEOM_Superv_i::MakeBoxTwoPnt" );
+ return anObj;
+}
+
+//=============================================================================
+// MakeFaceHW:
+//=============================================================================
+GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeFaceHW (CORBA::Double theH,
+ CORBA::Double theW,
+ CORBA::Short theOrientation)
+{
+ beginService( " GEOM_Superv_i::MakeFaceHW" );
+ MESSAGE("GEOM_Superv_i::MakeFaceHW");
+ get3DPrimOp();
+ GEOM::GEOM_Object_ptr anObj = my3DPrimOp->MakeFaceHW(theH, theW, theOrientation);
+ endService( " GEOM_Superv_i::MakeFaceHW" );
+ return anObj;
+}
+
+//=============================================================================
+// MakeFaceObjHW:
+//=============================================================================
+GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeFaceObjHW (GEOM::GEOM_Object_ptr theObj,
+ CORBA::Double theH,
+ CORBA::Double theW)
+{
+ beginService( " GEOM_Superv_i::MakeFaceObjHW" );
+ MESSAGE("GEOM_Superv_i::MakeFaceObjHW");
+ get3DPrimOp();
+ GEOM::GEOM_Object_ptr anObj = my3DPrimOp->MakeFaceObjHW(theObj, theH, theW);
+ endService( " GEOM_Superv_i::MakeFaceObjHW" );
+ return anObj;
+}
+
+//=============================================================================
+// MakeDiskPntVecR:
+//=============================================================================
+GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeDiskPntVecR (GEOM::GEOM_Object_ptr theCenter,
+ GEOM::GEOM_Object_ptr theVector,
+ CORBA::Double theR)
+{
+ beginService( " GEOM_Superv_i::MakeDiskPntVecR" );
+ MESSAGE("GEOM_Superv_i::MakeDiskPntVecR");
+ get3DPrimOp();
+ GEOM::GEOM_Object_ptr anObj = my3DPrimOp->MakeDiskPntVecR(theCenter, theVector, theR);
+ endService( " GEOM_Superv_i::MakeDiskPntVecR" );
+ return anObj;
+}
+
+//=============================================================================
+// MakeDiskThreePnt:
+//=============================================================================
+GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeDiskThreePnt (GEOM::GEOM_Object_ptr thePnt1,
+ GEOM::GEOM_Object_ptr thePnt2,
+ GEOM::GEOM_Object_ptr thePnt3)
+{
+ beginService( " GEOM_Superv_i::MakeDiskThreePnt" );
+ MESSAGE("GEOM_Superv_i::MakeDiskThreePnt");
+ get3DPrimOp();
+ GEOM::GEOM_Object_ptr anObj = my3DPrimOp->MakeDiskThreePnt(thePnt1, thePnt2, thePnt3);
+ endService( " GEOM_Superv_i::MakeDiskThreePnt" );
+ return anObj;
+}
+
+//=============================================================================
+// MakeDiskR:
+//=============================================================================
+GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeDiskR (CORBA::Double theR,
+ CORBA::Short theOrientation)
+{
+ beginService( " GEOM_Superv_i::MakeDiskR" );
+ MESSAGE("GEOM_Superv_i::MakeDiskR");
+ get3DPrimOp();
+ GEOM::GEOM_Object_ptr anObj = my3DPrimOp->MakeDiskR(theR, theOrientation);
+ endService( " GEOM_Superv_i::MakeDiskR" );
+ return anObj;
}
//=============================================================================
// MakeCylinderPntVecRH:
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeCylinderPntVecRH (GEOM::GEOM_Object_ptr thePnt,
- GEOM::GEOM_Object_ptr theAxis,
- CORBA::Double theRadius,
- CORBA::Double theHeight)
+ GEOM::GEOM_Object_ptr theAxis,
+ CORBA::Double theRadius,
+ CORBA::Double theHeight)
{
+ beginService( " GEOM_Superv_i::MakeCylinderPntVecRH" );
MESSAGE("GEOM_Superv_i::MakeCylinderPntVecRH");
get3DPrimOp();
- return my3DPrimOp->MakeCylinderPntVecRH(thePnt, theAxis, theRadius, theHeight);
+ GEOM::GEOM_Object_ptr anObj = my3DPrimOp->MakeCylinderPntVecRH(thePnt, theAxis, theRadius, theHeight);
+ endService( " GEOM_Superv_i::MakeCylinderPntVecRH" );
+ return anObj;
}
//=============================================================================
// MakeCylinderRH:
//=============================================================================
-GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeCylinderRH (CORBA::Double theR,
- CORBA::Double theH)
+GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeCylinderRH (CORBA::Double theR,
+ CORBA::Double theH)
{
+ beginService( " GEOM_Superv_i::MakeCylinderRH" );
MESSAGE("GEOM_Superv_i::MakeCylinderRH");
get3DPrimOp();
- return my3DPrimOp->MakeCylinderRH(theR, theH);
+ GEOM::GEOM_Object_ptr anObj = my3DPrimOp->MakeCylinderRH(theR, theH);
+ endService( " GEOM_Superv_i::MakeCylinderRH" );
+ return anObj;
+}
+
+//=============================================================================
+// MakeCylinderPntVecRHA:
+//=============================================================================
+GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeCylinderPntVecRHA (GEOM::GEOM_Object_ptr thePnt,
+ GEOM::GEOM_Object_ptr theAxis,
+ CORBA::Double theRadius,
+ CORBA::Double theHeight,
+ CORBA::Double theAngle)
+{
+ beginService( " GEOM_Superv_i::MakeCylinderPntVecRHA" );
+ MESSAGE("GEOM_Superv_i::MakeCylinderPntVecRHA");
+ get3DPrimOp();
+ GEOM::GEOM_Object_ptr anObj = my3DPrimOp->MakeCylinderPntVecRHA(thePnt, theAxis, theRadius, theHeight, theAngle);
+ endService( " GEOM_Superv_i::MakeCylinderPntVecRHA" );
+ return anObj;
+}
+
+//=============================================================================
+// MakeCylinderRHA:
+//=============================================================================
+GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeCylinderRHA (CORBA::Double theR,
+ CORBA::Double theH,
+ CORBA::Double theA)
+{
+ beginService( " GEOM_Superv_i::MakeCylinderRHA" );
+ MESSAGE("GEOM_Superv_i::MakeCylinderRHA");
+ get3DPrimOp();
+ GEOM::GEOM_Object_ptr anObj = my3DPrimOp->MakeCylinderRHA(theR, theH, theA);
+ endService( " GEOM_Superv_i::MakeCylinderRHA" );
+ return anObj;
}
//=============================================================================
// MakeSphere:
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeSphere (CORBA::Double theX,
- CORBA::Double theY,
- CORBA::Double theZ,
- CORBA::Double theRadius)
+ CORBA::Double theY,
+ CORBA::Double theZ,
+ CORBA::Double theRadius)
{
+ beginService( " GEOM_Superv_i::MakeSphepe" );
MESSAGE("GEOM_Superv_i::MakeSphepe");
getBasicOp();
get3DPrimOp();
- return my3DPrimOp->MakeSpherePntR(myBasicOp->MakePointXYZ(theX, theY, theZ), theRadius);
+ GEOM::GEOM_Object_ptr anObj = my3DPrimOp->MakeSpherePntR(myBasicOp->MakePointXYZ(theX, theY, theZ), theRadius);
+ endService( " GEOM_Superv_i::MakeSphepe" );
+ return anObj;
}
//=============================================================================
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeSphereR (CORBA::Double theR)
{
+ beginService( " GEOM_Superv_i::MakeSphereR" );
MESSAGE("GEOM_Superv_i::MakeSphereR");
get3DPrimOp();
- return my3DPrimOp->MakeSphereR(theR);
+ GEOM::GEOM_Object_ptr anObj = my3DPrimOp->MakeSphereR(theR);
+ endService( " GEOM_Superv_i::MakeSphereR" );
+ return anObj;
}
//=============================================================================
// MakeSpherePntR:
//=============================================================================
-GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeSpherePntR (GEOM::GEOM_Object_ptr thePnt,
- CORBA::Double theR)
+GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeSpherePntR (GEOM::GEOM_Object_ptr thePnt,
+ CORBA::Double theR)
{
+ beginService( " GEOM_Superv_i::MakeSpherePntR" );
MESSAGE("GEOM_Superv_i::MakeSpherePntR");
get3DPrimOp();
- return my3DPrimOp->MakeSpherePntR(thePnt, theR);
+ GEOM::GEOM_Object_ptr anObj = my3DPrimOp->MakeSpherePntR(thePnt, theR);
+ endService( " GEOM_Superv_i::MakeSpherePntR" );
+ return anObj;
}
//=============================================================================
// MakeTorusPntVecRR:
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeTorusPntVecRR (GEOM::GEOM_Object_ptr thePnt,
- GEOM::GEOM_Object_ptr theVec,
- CORBA::Double theRMajor,
- CORBA::Double theRMinor)
+ GEOM::GEOM_Object_ptr theVec,
+ CORBA::Double theRMajor,
+ CORBA::Double theRMinor)
{
+ beginService( " GEOM_Superv_i::MakeTorusPntVecRR" );
MESSAGE("GEOM_Superv_i::MakeTorusPntVecRR");
get3DPrimOp();
- return my3DPrimOp->MakeTorusPntVecRR(thePnt, theVec, theRMajor, theRMinor);
+ GEOM::GEOM_Object_ptr anObj = my3DPrimOp->MakeTorusPntVecRR(thePnt, theVec, theRMajor, theRMinor);
+ endService( " GEOM_Superv_i::MakeTorusPntVecRR" );
+ return anObj;
}
//=============================================================================
// MakeTorusRR:
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeTorusRR (CORBA::Double theRMajor,
- CORBA::Double theRMinor)
+ CORBA::Double theRMinor)
{
+ beginService( " GEOM_Superv_i::MakeTorusRR" );
MESSAGE("GEOM_Superv_i::MakeTorusRR");
get3DPrimOp();
- return my3DPrimOp->MakeTorusRR(theRMajor, theRMinor);
+ GEOM::GEOM_Object_ptr anObj = my3DPrimOp->MakeTorusRR(theRMajor, theRMinor);
+ endService( " GEOM_Superv_i::MakeTorusRR" );
+ return anObj;
}
//=============================================================================
// MakeConePntVecR1R2H:
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeConePntVecR1R2H (GEOM::GEOM_Object_ptr thePnt,
- GEOM::GEOM_Object_ptr theAxis,
- CORBA::Double theR1,
- CORBA::Double theR2,
- CORBA::Double theHeight)
+ GEOM::GEOM_Object_ptr theAxis,
+ CORBA::Double theR1,
+ CORBA::Double theR2,
+ CORBA::Double theHeight)
{
+ beginService( " GEOM_Superv_i::MakeConePntVecR1R2H" );
MESSAGE("GEOM_Superv_i::MakeConePntVecR1R2H");
get3DPrimOp();
- return my3DPrimOp->MakeConePntVecR1R2H(thePnt, theAxis, theR1, theR2, theHeight);
+ GEOM::GEOM_Object_ptr anObj = my3DPrimOp->MakeConePntVecR1R2H(thePnt, theAxis, theR1, theR2, theHeight);
+ endService( " GEOM_Superv_i::MakeConePntVecR1R2H" );
+ return anObj;
}
//=============================================================================
// MakeConeR1R2H:
//=============================================================================
-GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeConeR1R2H (CORBA::Double theR1,
- CORBA::Double theR2,
- CORBA::Double theHeight)
+GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeConeR1R2H (CORBA::Double theR1,
+ CORBA::Double theR2,
+ CORBA::Double theHeight)
{
+ beginService( " GEOM_Superv_i::MakeConeR1R2H" );
MESSAGE("GEOM_Superv_i::MakeConeR1R2H");
get3DPrimOp();
- return my3DPrimOp->MakeConeR1R2H(theR1, theR2, theHeight);
+ GEOM::GEOM_Object_ptr anObj = my3DPrimOp->MakeConeR1R2H(theR1, theR2, theHeight);
+ endService( " GEOM_Superv_i::MakeConeR1R2H" );
+ return anObj;
}
//=============================================================================
// MakePrismVecH:
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_Superv_i::MakePrismVecH (GEOM::GEOM_Object_ptr theBase,
- GEOM::GEOM_Object_ptr theVec,
- CORBA::Double theH)
+ GEOM::GEOM_Object_ptr theVec,
+ CORBA::Double theH)
{
+ beginService( " GEOM_Superv_i::MakePrismVecH" );
MESSAGE("GEOM_Superv_i::MakePrismVecH");
get3DPrimOp();
- return my3DPrimOp->MakePrismVecH(theBase, theVec, theH);
+ GEOM::GEOM_Object_ptr anObj = my3DPrimOp->MakePrismVecH(theBase, theVec, theH);
+ endService( " GEOM_Superv_i::MakePrismVecH" );
+ return anObj;
}
+//=============================================================================
+// MakePrismVecH2Ways:
+//=============================================================================
+GEOM::GEOM_Object_ptr GEOM_Superv_i::MakePrismVecH2Ways (GEOM::GEOM_Object_ptr theBase,
+ GEOM::GEOM_Object_ptr theVec,
+ CORBA::Double theH)
+{
+ beginService( " GEOM_Superv_i::MakePrismVecH2Ways" );
+ MESSAGE("GEOM_Superv_i::MakePrismVecH2Ways");
+ get3DPrimOp();
+ GEOM::GEOM_Object_ptr anObj = my3DPrimOp->MakePrismVecH2Ways(theBase, theVec, theH);
+ endService( " GEOM_Superv_i::MakePrismVecH2Ways" );
+ return anObj;
+}
//=============================================================================
// MakePrismTwoPnt:
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_Superv_i::MakePrismTwoPnt (GEOM::GEOM_Object_ptr theBase,
- GEOM::GEOM_Object_ptr thePoint1,
- GEOM::GEOM_Object_ptr thePoint2)
+ GEOM::GEOM_Object_ptr thePoint1,
+ GEOM::GEOM_Object_ptr thePoint2)
{
+ beginService( " GEOM_Superv_i::MakePrismTwoPnt" );
MESSAGE("GEOM_Superv_i::MakePrismTwoPnt");
get3DPrimOp();
- return my3DPrimOp->MakePrismTwoPnt(theBase, thePoint1, thePoint2);
+ GEOM::GEOM_Object_ptr anObj = my3DPrimOp->MakePrismTwoPnt(theBase, thePoint1, thePoint2);
+ endService( " GEOM_Superv_i::MakePrismTwoPnt" );
+ return anObj;
+}
+
+//=============================================================================
+// MakePrismTwoPnt2Ways:
+//=============================================================================
+GEOM::GEOM_Object_ptr GEOM_Superv_i::MakePrismTwoPnt2Ways (GEOM::GEOM_Object_ptr theBase,
+ GEOM::GEOM_Object_ptr thePoint1,
+ GEOM::GEOM_Object_ptr thePoint2)
+{
+ beginService( " GEOM_Superv_i::MakePrismTwoPnt2Ways" );
+ MESSAGE("GEOM_Superv_i::MakePrismTwoPnt2Ways");
+ get3DPrimOp();
+ GEOM::GEOM_Object_ptr anObj = my3DPrimOp->MakePrismTwoPnt2Ways(theBase, thePoint1, thePoint2);
+ endService( " GEOM_Superv_i::MakePrismTwoPnt2Ways" );
+ return anObj;
+}
+
+//=============================================================================
+// MakePrismDXDYDZ:
+//=============================================================================
+GEOM::GEOM_Object_ptr GEOM_Superv_i::MakePrismDXDYDZ (GEOM::GEOM_Object_ptr theBase,
+ CORBA::Double theDX, CORBA::Double theDY, CORBA::Double theDZ)
+{
+ beginService( " GEOM_Superv_i::MakePrismDXDYDZ" );
+ MESSAGE("GEOM_Superv_i::MakePrismDXDYDZ");
+ get3DPrimOp();
+ GEOM::GEOM_Object_ptr anObj = my3DPrimOp->MakePrismDXDYDZ(theBase, theDX, theDY, theDZ);
+ endService( " GEOM_Superv_i::MakePrismDXDYDZ" );
+ return anObj;
+}
+
+//=============================================================================
+// MakePrismDXDYDZ:
+//=============================================================================
+GEOM::GEOM_Object_ptr GEOM_Superv_i::MakePrismDXDYDZ2Ways (GEOM::GEOM_Object_ptr theBase,
+ CORBA::Double theDX, CORBA::Double theDY, CORBA::Double theDZ)
+{
+ beginService( " GEOM_Superv_i::MakePrismDXDYDZ2Ways" );
+ MESSAGE("GEOM_Superv_i::MakePrismDXDYDZ2Ways");
+ get3DPrimOp();
+ GEOM::GEOM_Object_ptr anObj = my3DPrimOp->MakePrismDXDYDZ2Ways(theBase, theDX, theDY, theDZ);
+ endService( " GEOM_Superv_i::MakePrismDXDYDZ2Ways" );
+ return anObj;
}
//=============================================================================
// MakePipe:
//=============================================================================
-GEOM::GEOM_Object_ptr GEOM_Superv_i::MakePipe (GEOM::GEOM_Object_ptr theBase,
- GEOM::GEOM_Object_ptr thePath)
+GEOM::GEOM_Object_ptr GEOM_Superv_i::MakePipe (GEOM::GEOM_Object_ptr theBase,
+ GEOM::GEOM_Object_ptr thePath)
{
+ beginService( " GEOM_Superv_i::MakePipe" );
MESSAGE("GEOM_Superv_i::MakePipe");
get3DPrimOp();
- return my3DPrimOp->MakePipe(theBase, thePath);
+ GEOM::ListOfGO_var aList = my3DPrimOp->MakePipe(theBase, thePath, false);
+ endService( " GEOM_Superv_i::MakePipe" );
+ return aList[0];
}
//=============================================================================
// MakeRevolutionAxisAngle:
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeRevolutionAxisAngle (GEOM::GEOM_Object_ptr theBase,
- GEOM::GEOM_Object_ptr theAxis,
- CORBA::Double theAngle)
+ GEOM::GEOM_Object_ptr theAxis,
+ CORBA::Double theAngle)
{
+ beginService( " GEOM_Superv_i::MakeRevolutionAxisAngle" );
MESSAGE("GEOM_Superv_i::MakeRevolutionAxisAngle");
get3DPrimOp();
- return my3DPrimOp->MakeRevolutionAxisAngle(theBase, theAxis, theAngle);
+ GEOM::GEOM_Object_ptr anObj = my3DPrimOp->MakeRevolutionAxisAngle(theBase, theAxis, theAngle);
+ endService( " GEOM_Superv_i::MakeRevolutionAxisAngle" );
+ return anObj;
+}
+
+//=============================================================================
+// MakeRevolutionAxisAngle:
+//=============================================================================
+GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeRevolutionAxisAngle2Ways (GEOM::GEOM_Object_ptr theBase,
+ GEOM::GEOM_Object_ptr theAxis,
+ CORBA::Double theAngle)
+{
+ beginService( " GEOM_Superv_i::MakeRevolutionAxisAngle2Ways" );
+ MESSAGE("GEOM_Superv_i::MakeRevolutionAxisAngle2Ways");
+ get3DPrimOp();
+ GEOM::GEOM_Object_ptr anObj = my3DPrimOp->MakeRevolutionAxisAngle2Ways(theBase, theAxis, theAngle);
+ endService( " GEOM_Superv_i::MakeRevolutionAxisAngle2Ways" );
+ return anObj;
}
//=============================================================================
// MakeFilling:
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeFilling (GEOM::GEOM_Object_ptr theShape,
- CORBA::Long theMinDeg, CORBA::Long theMaxDeg,
- CORBA::Double theTol2D, CORBA::Double theTol3D,
- CORBA::Long theNbIter)
-{
+ CORBA::Long theMinDeg,
+ CORBA::Long theMaxDeg,
+ CORBA::Double theTol2D,
+ CORBA::Double theTol3D,
+ CORBA::Long theNbIter,
+ GEOM::filling_oper_method theMethod,
+ CORBA::Boolean theApprox)
+{
+ beginService( " GEOM_Superv_i::MakeFilling" );
MESSAGE("GEOM_Superv_i::MakeFilling");
get3DPrimOp();
- return my3DPrimOp->MakeFilling(theShape, theMinDeg, theMaxDeg, theTol2D, theTol3D, theNbIter);
+ GEOM::ListOfGO_var objList = new GEOM::ListOfGO;
+ objList->length( 1 );
+ objList[0] = theShape;
+ GEOM::GEOM_Object_ptr anObj =
+ my3DPrimOp->MakeFilling(objList, theMinDeg, theMaxDeg, theTol2D, theTol3D,
+ theNbIter, theMethod, theApprox);
+ endService( " GEOM_Superv_i::MakeFilling" );
+ return anObj;
}
//============================= BooleanOperations =============================
//=============================================================================
// MakeBoolean:
//=============================================================================
-GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeBoolean (GEOM::GEOM_Object_ptr theShape1,
- GEOM::GEOM_Object_ptr theShape2,
- CORBA::Long theOperation)
+GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeBoolean
+ (GEOM::GEOM_Object_ptr theShape1,
+ GEOM::GEOM_Object_ptr theShape2,
+ CORBA::Long theOperation)
{
+ beginService( " GEOM_Superv_i::MakeBoolean" );
// theOperation indicates the operation to be done:
// 1 - Common, 2 - Cut, 3 - Fuse, 4 - Section
MESSAGE("GEOM_Superv_i::MakeBoolean");
getBoolOp();
- return myBoolOp->MakeBoolean(theShape1, theShape2, theOperation);
+ GEOM::GEOM_Object_ptr anObj =
+ myBoolOp->MakeBoolean(theShape1, theShape2, theOperation, false);
+ endService( " GEOM_Superv_i::MakeBoolean" );
+ return anObj;
}
//=============================================================================
-// MakeFuse:
+// MakeThruSections:
//=============================================================================
-GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeFuse (GEOM::GEOM_Object_ptr theShape1,
- GEOM::GEOM_Object_ptr theShape2)
+GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeThruSections(const GEOM::ListOfGO& theSeqSections,
+ CORBA::Boolean theModeSolid,
+ CORBA::Double thePreci,
+ CORBA::Boolean theRuled)
{
- MESSAGE("GEOM_Superv_i::MakeFuse");
- getBoolOp();
- return myBoolOp->MakeBoolean(theShape1, theShape2, 3);
+ beginService( " GEOM_Superv_i::MakeThruSections" );
+ MESSAGE("GEOM_Superv_i::MakeThruSections");
+ get3DPrimOp();
+ GEOM::GEOM_Object_ptr anObj = my3DPrimOp->MakeThruSections(theSeqSections, theModeSolid,thePreci,theRuled);
+ endService( " GEOM_Superv_i::MakeThruSections" );
+ return anObj;
}
//=============================================================================
-// MakePartition:
+// MakePipe:
//=============================================================================
-GEOM::GEOM_Object_ptr GEOM_Superv_i::MakePartition (GEOM::GEOM_List_ptr theShapes,
- GEOM::GEOM_List_ptr theTools,
- GEOM::GEOM_List_ptr theKeepInside,
- GEOM::GEOM_List_ptr theRemoveInside,
- CORBA::Short theLimit,
- CORBA::Boolean theRemoveWebs,
- GEOM::GEOM_List_ptr theMaterials)
+GEOM::GEOM_Object_ptr GEOM_Superv_i::MakePipeWithDifferentSections
+ (const GEOM::ListOfGO& theBases,
+ const GEOM::ListOfGO& theLocations,
+ GEOM::GEOM_Object_ptr thePath,
+ CORBA::Boolean theWithContact,
+ CORBA::Boolean theWithCorrections)
{
- MESSAGE("GEOM_Superv_i::MakePartition");
- GEOM_List_i<GEOM::ListOfGO>* aListImplS =
- dynamic_cast<GEOM_List_i<GEOM::ListOfGO>*>(GetServant(theShapes, myPOA).in());
- GEOM_List_i<GEOM::ListOfGO>* aListImplT =
- dynamic_cast<GEOM_List_i<GEOM::ListOfGO>*>(GetServant(theTools, myPOA).in());
- GEOM_List_i<GEOM::ListOfGO>* aListImplKI =
- dynamic_cast<GEOM_List_i<GEOM::ListOfGO>*>(GetServant(theKeepInside, myPOA).in());
- GEOM_List_i<GEOM::ListOfGO>* aListImplRI =
- dynamic_cast<GEOM_List_i<GEOM::ListOfGO>*>(GetServant(theRemoveInside, myPOA).in());
- GEOM_List_i<GEOM::ListOfLong>* aListImplM =
- dynamic_cast<GEOM_List_i<GEOM::ListOfLong>*>(GetServant(theMaterials, myPOA).in());
- if (aListImplS && aListImplT && aListImplKI && aListImplRI && aListImplM) {
- getBoolOp();
- return myBoolOp->MakePartition(aListImplS->GetList(), aListImplT->GetList(),
- aListImplKI->GetList(), aListImplRI->GetList(),
- theLimit, theRemoveWebs, aListImplM->GetList());
+ beginService( " GEOM_Superv_i::MakePipeWithDifferentSections" );
+ MESSAGE("GEOM_Superv_i::MakePipeWithDifferentSections");
+ get3DPrimOp();
+ GEOM::ListOfGO_var aList = my3DPrimOp->MakePipeWithDifferentSections(theBases,theLocations, thePath,theWithContact,theWithCorrections, false, false);
+ endService( " GEOM_Superv_i::MakePipeWithDifferentSections" );
+ return aList[0];
+}
+
+
+//=============================================================================
+// MakePipe:
+//=============================================================================
+GEOM::GEOM_Object_ptr GEOM_Superv_i::MakePipeWithShellSections
+ (const GEOM::ListOfGO& theBases,
+ const GEOM::ListOfGO& theSubBases,
+ const GEOM::ListOfGO& theLocations,
+ GEOM::GEOM_Object_ptr thePath,
+ CORBA::Boolean theWithContact,
+ CORBA::Boolean theWithCorrections)
+{
+ beginService( " GEOM_Superv_i::MakePipeWithShellSections" );
+ MESSAGE("GEOM_Superv_i::MakePipeWithShellSections");
+ get3DPrimOp();
+ GEOM::ListOfGO_var aList =
+ my3DPrimOp->MakePipeWithShellSections(theBases, theSubBases,
+ theLocations, thePath,
+ theWithContact, theWithCorrections,
+ false);
+ endService( " GEOM_Superv_i::MakePipeWithShellSections" );
+ return aList[0];
+}
+
+
+//=============================================================================
+// MakePipe:
+//=============================================================================
+GEOM::GEOM_Object_ptr GEOM_Superv_i::MakePipeShellsWithoutPath
+ (const GEOM::ListOfGO& theBases,
+ const GEOM::ListOfGO& theLocations)
+{
+ beginService( " GEOM_Superv_i::MakePipeShellsWithoutPath" );
+ MESSAGE("GEOM_Superv_i::MakePipeShellsWithoutPath");
+ get3DPrimOp();
+ GEOM::ListOfGO_var aList =
+ my3DPrimOp->MakePipeShellsWithoutPath(theBases,theLocations, false);
+ endService( " GEOM_Superv_i::MakePipeShellsWithoutPath" );
+ return aList[0];
+}
+
+
+//=============================================================================
+// MakePipe:
+//=============================================================================
+GEOM::GEOM_Object_ptr GEOM_Superv_i::MakePipeBiNormalAlongVector
+ (GEOM::GEOM_Object_ptr theBase,
+ GEOM::GEOM_Object_ptr thePath,
+ GEOM::GEOM_Object_ptr theVec)
+{
+ beginService( " GEOM_Superv_i::MakePipeBiNormalAlongVector" );
+ MESSAGE("GEOM_Superv_i::MakePipeBiNormalAlongVector");
+ get3DPrimOp();
+ GEOM::ListOfGO_var aList =
+ my3DPrimOp->MakePipeBiNormalAlongVector(theBase, thePath, theVec, false);
+ endService( " GEOM_Superv_i::MakePipeBiNormalAlongVector" );
+ return aList[0];
+}
+
+
+//=============================================================================
+// MakeFuse:
+//=============================================================================
+GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeFuse
+ (GEOM::GEOM_Object_ptr theShape1,
+ GEOM::GEOM_Object_ptr theShape2)
+{
+ beginService( " GEOM_Superv_i::MakeFuse" );
+ MESSAGE("GEOM_Superv_i::MakeFuse");
+ getBoolOp();
+ GEOM::GEOM_Object_ptr anObj =
+ myBoolOp->MakeBoolean(theShape1, theShape2, 3, false);
+ endService( " GEOM_Superv_i::MakeFuse" );
+ return anObj;
+}
+
+GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeCommon (GEOM::GEOM_Object_ptr theShape1,
+ GEOM::GEOM_Object_ptr theShape2)
+{
+ beginService( " GEOM_Superv_i::MakeCommon" );
+ MESSAGE("GEOM_Superv_i::MakeCommon");
+ getBoolOp();
+ GEOM::GEOM_Object_ptr anObj =
+ myBoolOp->MakeBoolean(theShape1, theShape2, 1, false);
+ endService( " GEOM_Superv_i::MakeCommon" );
+ return anObj;
+}
+
+GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeCut (GEOM::GEOM_Object_ptr theShape1,
+ GEOM::GEOM_Object_ptr theShape2)
+{
+ beginService( " GEOM_Superv_i::MakeCut" );
+ MESSAGE("GEOM_Superv_i::MakeCut");
+ getBoolOp();
+ GEOM::GEOM_Object_ptr anObj =
+ myBoolOp->MakeBoolean(theShape1, theShape2, 2, false);
+ endService( " GEOM_Superv_i::MakeCut" );
+ return anObj;
+}
+
+GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeSection (GEOM::GEOM_Object_ptr theShape1,
+ GEOM::GEOM_Object_ptr theShape2)
+{
+ beginService( " GEOM_Superv_i::MakeCut" );
+ MESSAGE("GEOM_Superv_i::MakeCut");
+ getBoolOp();
+ GEOM::GEOM_Object_ptr anObj =
+ myBoolOp->MakeBoolean(theShape1, theShape2, 4, false);
+ endService( " GEOM_Superv_i::MakeCut" );
+ return anObj;
+}
+
+//=============================================================================
+// MakePartition:
+//=============================================================================
+GEOM::GEOM_Object_ptr GEOM_Superv_i::MakePartition (GEOM::GEOM_List_ptr theShapes,
+ GEOM::GEOM_List_ptr theTools,
+ GEOM::GEOM_List_ptr theKeepInside,
+ GEOM::GEOM_List_ptr theRemoveInside,
+ CORBA::Short theLimit,
+ CORBA::Boolean theRemoveWebs,
+ GEOM::GEOM_List_ptr theMaterials,
+ CORBA::Short theKeepNonlimitShapes)
+{
+ beginService( " GEOM_Superv_i::MakePartition" );
+ MESSAGE("GEOM_Superv_i::MakePartition");
+ GEOM_List_i<GEOM::ListOfGO>* aListImplS =
+ dynamic_cast<GEOM_List_i<GEOM::ListOfGO>*>(GetServant(theShapes, myPOA).in());
+ GEOM_List_i<GEOM::ListOfGO>* aListImplT =
+ dynamic_cast<GEOM_List_i<GEOM::ListOfGO>*>(GetServant(theTools, myPOA).in());
+ GEOM_List_i<GEOM::ListOfGO>* aListImplKI =
+ dynamic_cast<GEOM_List_i<GEOM::ListOfGO>*>(GetServant(theKeepInside, myPOA).in());
+ GEOM_List_i<GEOM::ListOfGO>* aListImplRI =
+ dynamic_cast<GEOM_List_i<GEOM::ListOfGO>*>(GetServant(theRemoveInside, myPOA).in());
+ GEOM_List_i<GEOM::ListOfLong>* aListImplM =
+ dynamic_cast<GEOM_List_i<GEOM::ListOfLong>*>(GetServant(theMaterials, myPOA).in());
+ if (aListImplS && aListImplT && aListImplKI && aListImplRI && aListImplM) {
+ getBoolOp();
+ GEOM::GEOM_Object_ptr anObj =
+ myBoolOp->MakePartition(aListImplS->GetList(), aListImplT->GetList(),
+ aListImplKI->GetList(), aListImplRI->GetList(),
+ theLimit, theRemoveWebs, aListImplM->GetList(),
+ theKeepNonlimitShapes);
+ endService( " GEOM_Superv_i::MakePartition" );
+ return anObj;
}
+ endService( " GEOM_Superv_i::MakePartition" );
return NULL;
}
// MakeHalfPartition:
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeHalfPartition (GEOM::GEOM_Object_ptr theShape,
- GEOM::GEOM_Object_ptr thePlane)
+ GEOM::GEOM_Object_ptr thePlane)
{
+ beginService( " GEOM_Superv_i::MakeHalfPartition" );
MESSAGE("GEOM_Superv_i::MakeHalfPartition");
getBoolOp();
- return myBoolOp->MakeHalfPartition(theShape, thePlane);
+ GEOM::GEOM_Object_ptr anObj =
+ myBoolOp->MakeHalfPartition(theShape, thePlane);
+ endService( " GEOM_Superv_i::MakeHalfPartition" );
+ return anObj;
}
//============================== InsertOperations =============================
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeCopy (GEOM::GEOM_Object_ptr theOriginal)
{
+ beginService( " GEOM_Superv_i::MakeCopy" );
MESSAGE("GEOM_Superv_i::MakeCopy");
getInsOp();
- return myInsOp->MakeCopy(theOriginal);
+ GEOM::GEOM_Object_ptr anObj = myInsOp->MakeCopy(theOriginal);
+ endService( " GEOM_Superv_i::MakeCopy" );
+ return anObj;
}
//=============================================================================
// Export:
//=============================================================================
-void GEOM_Superv_i::Export (GEOM::GEOM_Object_ptr theObject,
- const char* theFileName,
- const char* theFormatName)
+void GEOM_Superv_i::Export (GEOM::GEOM_Object_ptr theObject,
+ const char* theFileName,
+ const char* theFormatName)
{
+ beginService( " GEOM_Superv_i::Export" );
MESSAGE("GEOM_Superv_i::Export");
getInsOp();
myInsOp->Export(theObject, theFileName, theFormatName);
+ endService( " GEOM_Superv_i::Export" );
}
//=============================================================================
// Import:
//=============================================================================
-GEOM::GEOM_Object_ptr GEOM_Superv_i::Import (const char* theFileName,
- const char* theFormatName)
+GEOM::GEOM_Object_ptr GEOM_Superv_i::ImportFile (const char* theFileName,
+ const char* theFormatName)
{
- MESSAGE("GEOM_Superv_i::Import");
+ beginService( " GEOM_Superv_i::ImportFile" );
+ MESSAGE("GEOM_Superv_i::ImportFile");
getInsOp();
- return myInsOp->Import(theFileName, theFormatName);
-}
-
-//=============================================================================
-// ImportTranslators:
-//=============================================================================
-void GEOM_Superv_i::ImportTranslators (GEOM::string_array_out theFormats,
- GEOM::string_array_out thePatterns)
-{
- MESSAGE("GEOM_Superv_i::ImportTranslators");
- getInsOp();
- myInsOp->ImportTranslators(theFormats, thePatterns);
-}
+ GEOM::ListOfGBO_var aSeq = myInsOp->ImportFile(theFileName, theFormatName);
+ GEOM::GEOM_Object_var anObj;
+
+ if (aSeq->length() > 0) {
+ anObj = GEOM::GEOM_Object::_narrow(aSeq[0]);
+ }
-//=============================================================================
-// ExportTranslators:
-//=============================================================================
-void GEOM_Superv_i::ExportTranslators (GEOM::string_array_out theFormats,
- GEOM::string_array_out thePatterns)
-{
- MESSAGE("GEOM_Superv_i::ExportTranslators");
- getInsOp();
- myInsOp->ExportTranslators(theFormats, thePatterns);
+ endService( " GEOM_Superv_i::ImportFile" );
+ return anObj._retn();
}
//============================= TransformOperations ===========================
// TranslateTwoPoints:
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_Superv_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)
{
+ beginService( " GEOM_Superv_i::TranslateTwoPoints" );
MESSAGE("GEOM_Superv_i::TranslateTwoPoints");
getTransfOp();
- return myTransfOp->TranslateTwoPoints(theObject, thePoint1, thePoint2);
+ GEOM::GEOM_Object_ptr anObj = myTransfOp->TranslateTwoPoints(theObject, thePoint1, thePoint2);
+ endService( " GEOM_Superv_i::TranslateTwoPoints" );
+ return anObj;
}
//=============================================================================
// TranslateTwoPointsCopy:
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_Superv_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)
{
+ beginService( " GEOM_Superv_i::TranslateTwoPointsCopy" );
MESSAGE("GEOM_Superv_i::TranslateTwoPointsCopy");
getTransfOp();
- return myTransfOp->TranslateTwoPointsCopy(theObject, thePoint1, thePoint2);
+ GEOM::GEOM_Object_ptr anObj = myTransfOp->TranslateTwoPointsCopy(theObject, thePoint1, thePoint2);
+ endService( " GEOM_Superv_i::TranslateTwoPointsCopy" );
+ return anObj;
}
//=============================================================================
// TranslateDXDYDZ:
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_Superv_i::TranslateDXDYDZ (GEOM::GEOM_Object_ptr theObject,
- CORBA::Double theDX,
- CORBA::Double theDY,
- CORBA::Double theDZ)
+ CORBA::Double theDX,
+ CORBA::Double theDY,
+ CORBA::Double theDZ)
{
+ beginService( " GEOM_Superv_i::TranslateDXDYDZ" );
MESSAGE("GEOM_Superv_i::TranslateDXDYDZ");
getTransfOp();
- return myTransfOp->TranslateDXDYDZ(theObject, theDX, theDY, theDZ);
+ GEOM::GEOM_Object_ptr anObj = myTransfOp->TranslateDXDYDZ(theObject, theDX, theDY, theDZ);
+ endService( " GEOM_Superv_i::TranslateDXDYDZ" );
+ return anObj;
}
//=============================================================================
// TranslateDXDYDZCopy:
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_Superv_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)
{
+ beginService( " GEOM_Superv_i::TranslateDXDYDZCopy" );
MESSAGE("GEOM_Superv_i::TranslateDXDYDZCopy");
getTransfOp();
- return myTransfOp->TranslateDXDYDZCopy(theObject, theDX, theDY, theDZ);
+ GEOM::GEOM_Object_ptr anObj = myTransfOp->TranslateDXDYDZCopy(theObject, theDX, theDY, theDZ);
+ endService( " GEOM_Superv_i::TranslateDXDYDZCopy" );
+ return anObj;
}
//=============================================================================
// TranslateVector:
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_Superv_i::TranslateVector (GEOM::GEOM_Object_ptr theObject,
- GEOM::GEOM_Object_ptr theVector)
+ GEOM::GEOM_Object_ptr theVector)
{
+ beginService( " GEOM_Superv_i::TranslateVector" );
MESSAGE("GEOM_Superv_i::TranslateVector");
getTransfOp();
- return myTransfOp->TranslateVector(theObject, theVector);
+ GEOM::GEOM_Object_ptr anObj = myTransfOp->TranslateVector(theObject, theVector);
+ endService( " GEOM_Superv_i::TranslateVector" );
+ return anObj;
}
//=============================================================================
// TranslateVectorCopy:
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_Superv_i::TranslateVectorCopy (GEOM::GEOM_Object_ptr theObject,
- GEOM::GEOM_Object_ptr theVector)
+ GEOM::GEOM_Object_ptr theVector)
{
+ beginService( " GEOM_Superv_i::TranslateVectorCopy" );
MESSAGE("GEOM_Superv_i::TranslateVectorCopy");
getTransfOp();
- return myTransfOp->TranslateVectorCopy(theObject, theVector);
+ GEOM::GEOM_Object_ptr anObj = myTransfOp->TranslateVectorCopy(theObject, theVector);
+ endService( " GEOM_Superv_i::TranslateVectorCopy" );
+ return anObj;
+}
+
+//=============================================================================
+// TranslateVectorDistance:
+//=============================================================================
+GEOM::GEOM_Object_ptr GEOM_Superv_i::TranslateVectorDistance (GEOM::GEOM_Object_ptr theObject,
+ GEOM::GEOM_Object_ptr theVector,
+ CORBA::Double theDistance,
+ CORBA::Boolean theCopy)
+{
+ beginService( " GEOM_Superv_i::TranslateVectorDistance" );
+ MESSAGE("GEOM_Superv_i::TranslateVectorDistance");
+ getTransfOp();
+ GEOM::GEOM_Object_ptr anObj = myTransfOp->TranslateVectorDistance(theObject,
+ theVector, theDistance, theCopy);
+ endService( " GEOM_Superv_i::TranslateVectorDistance" );
+ return anObj;
}
//=============================================================================
// MultiTranslate1D:
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_Superv_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)
{
+ beginService( " GEOM_Superv_i::MultiTranslate1D" );
MESSAGE("GEOM_Superv_i::MultiTranslate1D");
getTransfOp();
- return myTransfOp->MultiTranslate1D(theObject, theVector, theStep, theNbTimes);
+ GEOM::GEOM_Object_ptr anObj = myTransfOp->MultiTranslate1D(theObject, theVector, theStep, theNbTimes);
+ endService( " GEOM_Superv_i::MultiTranslate1D" );
+ return anObj;
}
//=============================================================================
// MultiTranslate2D:
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_Superv_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)
+{
+ beginService( " GEOM_Superv_i::MultiTranslate2D" );
MESSAGE("GEOM_Superv_i::MultiTranslate2D");
getTransfOp();
- return myTransfOp->MultiTranslate2D(theObject, theVector1, theStep1, theNbTimes1,
- theVector2, theStep2, theNbTimes2);
+ GEOM::GEOM_Object_ptr anObj = myTransfOp->MultiTranslate2D(theObject, theVector1, theStep1, theNbTimes1,
+ theVector2, theStep2, theNbTimes2);
+ endService( " GEOM_Superv_i::MultiTranslate2D" );
+ return anObj;
}
//=============================================================================
// Rotate:
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_Superv_i::Rotate (GEOM::GEOM_Object_ptr theObject,
- GEOM::GEOM_Object_ptr theAxis,
- CORBA::Double theAngle)
+ GEOM::GEOM_Object_ptr theAxis,
+ CORBA::Double theAngle)
{
+ beginService( " GEOM_Superv_i::Rotate" );
MESSAGE("GEOM_Superv_i::Rotate");
getTransfOp();
- return myTransfOp->Rotate(theObject, theAxis, theAngle);
+ GEOM::GEOM_Object_ptr anObj = myTransfOp->Rotate(theObject, theAxis, theAngle);
+ endService( " GEOM_Superv_i::Rotate" );
+ return anObj;
}
//=============================================================================
// RotateCopy:
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_Superv_i::RotateCopy (GEOM::GEOM_Object_ptr theObject,
- GEOM::GEOM_Object_ptr theAxis,
- CORBA::Double theAngle)
+ GEOM::GEOM_Object_ptr theAxis,
+ CORBA::Double theAngle)
{
+ beginService( " GEOM_Superv_i::RotateCopy" );
MESSAGE("GEOM_Superv_i::RotateCopy");
getTransfOp();
- return myTransfOp->RotateCopy(theObject, theAxis, theAngle);
+ GEOM::GEOM_Object_ptr anObj = myTransfOp->RotateCopy(theObject, theAxis, theAngle);
+ endService( " GEOM_Superv_i::RotateCopy" );
+ return anObj;
+}
+//=============================================================================
+// RotateThreePoints:
+//=============================================================================
+GEOM::GEOM_Object_ptr GEOM_Superv_i::RotateThreePoints (GEOM::GEOM_Object_ptr theObject,
+ GEOM::GEOM_Object_ptr theCentPoint,
+ GEOM::GEOM_Object_ptr thePoint1,
+ GEOM::GEOM_Object_ptr thePoint2)
+{
+ beginService( " GEOM_Superv_i::RotateThreePoints" );
+ MESSAGE("GEOM_Superv_i::RotateThreePoints");
+ getTransfOp();
+ GEOM::GEOM_Object_ptr anObj = myTransfOp->RotateThreePoints(theObject, theCentPoint, thePoint1, thePoint2);
+ endService( " GEOM_Superv_i::RotateThreePoints" );
+ return anObj;
+}
+
+//=============================================================================
+// RotateThreePointsCopy:
+//=============================================================================
+GEOM::GEOM_Object_ptr GEOM_Superv_i::RotateThreePointsCopy (GEOM::GEOM_Object_ptr theObject,
+ GEOM::GEOM_Object_ptr theCentPoint,
+ GEOM::GEOM_Object_ptr thePoint1,
+ GEOM::GEOM_Object_ptr thePoint2)
+{
+ beginService( " GEOM_Superv_i::RotateThreePointsCopy" );
+ MESSAGE("GEOM_Superv_i::RotateThreePointsCopy");
+ getTransfOp();
+ GEOM::GEOM_Object_ptr anObj = myTransfOp->RotateThreePointsCopy(theObject, theCentPoint, thePoint1, thePoint2);
+ endService( " GEOM_Superv_i::RotateThreePointsCopy" );
+ return anObj;
}
//=============================================================================
// MultiRotate1D:
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_Superv_i::MultiRotate1D (GEOM::GEOM_Object_ptr theObject,
- GEOM::GEOM_Object_ptr theAxis,
- CORBA::Long theNbTimes)
+ GEOM::GEOM_Object_ptr theAxis,
+ CORBA::Long theNbTimes)
{
+ beginService( " GEOM_Superv_i::MultiRotate1D" );
MESSAGE("GEOM_Superv_i::MultiRotate1D");
getTransfOp();
- return myTransfOp->MultiRotate1D(theObject, theAxis, theNbTimes);
+ GEOM::GEOM_Object_ptr anObj = myTransfOp->MultiRotate1D(theObject, theAxis, theNbTimes);
+ endService( " GEOM_Superv_i::MultiRotate1D" );
+ return anObj;
}
//=============================================================================
// MultiRotate2D:
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_Superv_i::MultiRotate2D (GEOM::GEOM_Object_ptr theObject,
- GEOM::GEOM_Object_ptr theAxis,
- CORBA::Double theAngle,
- CORBA::Long theNbTimes1,
- CORBA::Double theStep,
- CORBA::Long theNbTimes2)
+ GEOM::GEOM_Object_ptr theAxis,
+ CORBA::Double theAngle,
+ CORBA::Long theNbTimes1,
+ CORBA::Double theStep,
+ CORBA::Long theNbTimes2)
{
+ beginService( " GEOM_Superv_i::MultiRotate2D" );
MESSAGE("GEOM_Superv_i::MultiRotate2D");
getTransfOp();
- return myTransfOp->MultiRotate2D(theObject, theAxis, theAngle, theNbTimes1, theStep, theNbTimes2);
+ GEOM::GEOM_Object_ptr anObj = myTransfOp->MultiRotate2D(theObject, theAxis, theAngle, theNbTimes1, theStep, theNbTimes2);
+ endService( " GEOM_Superv_i::MultiRotate2D" );
+ return anObj;
}
//=============================================================================
// MirrorPlane:
//=============================================================================
-GEOM::GEOM_Object_ptr GEOM_Superv_i::MirrorPlane (GEOM::GEOM_Object_ptr theObject,
- GEOM::GEOM_Object_ptr thePlane)
+GEOM::GEOM_Object_ptr GEOM_Superv_i::MirrorPlane (GEOM::GEOM_Object_ptr theObject,
+ GEOM::GEOM_Object_ptr thePlane)
{
+ beginService( " GEOM_Superv_i::MirrorPlane" );
MESSAGE("GEOM_Superv_i::MirrorPlane");
getTransfOp();
- return myTransfOp->MirrorPlane(theObject, thePlane);
+ GEOM::GEOM_Object_ptr anObj = myTransfOp->MirrorPlane(theObject, thePlane);
+ endService( " GEOM_Superv_i::MirrorPlane" );
+ return anObj;
}
//=============================================================================
// MirrorPlaneCopy:
//=============================================================================
-GEOM::GEOM_Object_ptr GEOM_Superv_i::MirrorPlaneCopy (GEOM::GEOM_Object_ptr theObject,
- GEOM::GEOM_Object_ptr thePlane)
+GEOM::GEOM_Object_ptr GEOM_Superv_i::MirrorPlaneCopy (GEOM::GEOM_Object_ptr theObject,
+ GEOM::GEOM_Object_ptr thePlane)
{
+ beginService( " GEOM_Superv_i::MirrorPlaneCopy" );
MESSAGE("GEOM_Superv_i::MirrorPlaneCopy");
getTransfOp();
- return myTransfOp->MirrorPlaneCopy(theObject, thePlane);
+ GEOM::GEOM_Object_ptr anObj = myTransfOp->MirrorPlaneCopy(theObject, thePlane);
+ endService( " GEOM_Superv_i::MirrorPlaneCopy" );
+ return anObj;
}
//=============================================================================
// MirrorAxis:
//=============================================================================
-GEOM::GEOM_Object_ptr GEOM_Superv_i::MirrorAxis (GEOM::GEOM_Object_ptr theObject,
- GEOM::GEOM_Object_ptr theAxis)
+GEOM::GEOM_Object_ptr GEOM_Superv_i::MirrorAxis (GEOM::GEOM_Object_ptr theObject,
+ GEOM::GEOM_Object_ptr theAxis)
{
+ beginService( " GEOM_Superv_i::MirrorAxis" );
MESSAGE("GEOM_Superv_i::MirrorAxis");
getTransfOp();
- return myTransfOp->MirrorAxis(theObject, theAxis);
+ GEOM::GEOM_Object_ptr anObj = myTransfOp->MirrorAxis(theObject, theAxis);
+ endService( " GEOM_Superv_i::MirrorAxis" );
+ return anObj;
}
//=============================================================================
// MirrorAxisCopy:
//=============================================================================
-GEOM::GEOM_Object_ptr GEOM_Superv_i::MirrorAxisCopy (GEOM::GEOM_Object_ptr theObject,
- GEOM::GEOM_Object_ptr theAxis)
+GEOM::GEOM_Object_ptr GEOM_Superv_i::MirrorAxisCopy (GEOM::GEOM_Object_ptr theObject,
+ GEOM::GEOM_Object_ptr theAxis)
{
+ beginService( " GEOM_Superv_i::MirrorAxisCopy" );
MESSAGE("GEOM_Superv_i::MirrorAxisCopy");
getTransfOp();
- return myTransfOp->MirrorAxisCopy(theObject, theAxis);
+ GEOM::GEOM_Object_ptr anObj = myTransfOp->MirrorAxisCopy(theObject, theAxis);
+ endService( " GEOM_Superv_i::MirrorAxisCopy" );
+ return anObj;
}
//=============================================================================
// MirrorPoint:
//=============================================================================
-GEOM::GEOM_Object_ptr GEOM_Superv_i::MirrorPoint (GEOM::GEOM_Object_ptr theObject,
- GEOM::GEOM_Object_ptr thePoint)
+GEOM::GEOM_Object_ptr GEOM_Superv_i::MirrorPoint (GEOM::GEOM_Object_ptr theObject,
+ GEOM::GEOM_Object_ptr thePoint)
{
+ beginService( " GEOM_Superv_i::MirrorPoint" );
MESSAGE("GEOM_Superv_i::MirrorPoint");
getTransfOp();
- return myTransfOp->MirrorPoint(theObject, thePoint);
+ GEOM::GEOM_Object_ptr anObj = myTransfOp->MirrorPoint(theObject, thePoint);
+ endService( " GEOM_Superv_i::MirrorPoint" );
+ return anObj;
}
//=============================================================================
// MirrorPointCopy:
//=============================================================================
-GEOM::GEOM_Object_ptr GEOM_Superv_i::MirrorPointCopy (GEOM::GEOM_Object_ptr theObject,
- GEOM::GEOM_Object_ptr thePoint)
+GEOM::GEOM_Object_ptr GEOM_Superv_i::MirrorPointCopy (GEOM::GEOM_Object_ptr theObject,
+ GEOM::GEOM_Object_ptr thePoint)
{
+ beginService( " GEOM_Superv_i::MirrorPoint" );
MESSAGE("GEOM_Superv_i::MirrorPointCopy");
getTransfOp();
- return myTransfOp->MirrorPointCopy(theObject, thePoint);
+ GEOM::GEOM_Object_ptr anObj = myTransfOp->MirrorPointCopy(theObject, thePoint);
+ endService( " GEOM_Superv_i::MirrorPoint" );
+ return anObj;
}
//=============================================================================
// OffsetShape:
//=============================================================================
-GEOM::GEOM_Object_ptr GEOM_Superv_i::OffsetShape (GEOM::GEOM_Object_ptr theObject,
- CORBA::Double theOffset)
+GEOM::GEOM_Object_ptr GEOM_Superv_i::OffsetShape (GEOM::GEOM_Object_ptr theObject,
+ CORBA::Double theOffset)
{
+ beginService( " GEOM_Superv_i::OffsetShape" );
MESSAGE("GEOM_Superv_i::OffsetShape");
getTransfOp();
- return myTransfOp->OffsetShape(theObject, theOffset);
+ GEOM::GEOM_Object_ptr anObj = myTransfOp->OffsetShape(theObject, theOffset, true);
+ endService( " GEOM_Superv_i::OffsetShape" );
+ return anObj;
}
//=============================================================================
// OffsetShapeCopy:
//=============================================================================
-GEOM::GEOM_Object_ptr GEOM_Superv_i::OffsetShapeCopy (GEOM::GEOM_Object_ptr theObject,
- CORBA::Double theOffset)
+GEOM::GEOM_Object_ptr GEOM_Superv_i::OffsetShapeCopy (GEOM::GEOM_Object_ptr theObject,
+ CORBA::Double theOffset)
{
+ beginService( " GEOM_Superv_i::OffsetShapeCopy" );
MESSAGE("GEOM_Superv_i::OffsetShapeCopy");
getTransfOp();
- return myTransfOp->OffsetShapeCopy(theObject, theOffset);
+ GEOM::GEOM_Object_ptr anObj = myTransfOp->OffsetShapeCopy(theObject, theOffset, true);
+ endService( " GEOM_Superv_i::OffsetShapeCopy" );
+ return anObj;
}
//=============================================================================
// ScaleShape:
//=============================================================================
-GEOM::GEOM_Object_ptr GEOM_Superv_i::ScaleShape (GEOM::GEOM_Object_ptr theObject,
- GEOM::GEOM_Object_ptr thePoint,
- CORBA::Double theFactor)
+GEOM::GEOM_Object_ptr GEOM_Superv_i::ScaleShape (GEOM::GEOM_Object_ptr theObject,
+ GEOM::GEOM_Object_ptr thePoint,
+ CORBA::Double theFactor)
{
+ beginService( " GEOM_Superv_i::ScaleShape" );
MESSAGE("GEOM_Superv_i::ScaleShape");
getTransfOp();
- return myTransfOp->ScaleShape(theObject, thePoint, theFactor);
+ GEOM::GEOM_Object_ptr anObj = myTransfOp->ScaleShape(theObject, thePoint, theFactor);
+ endService( " GEOM_Superv_i::ScaleShape" );
+ return anObj;
}
//=============================================================================
// ScaleShapeCopy:
//=============================================================================
-GEOM::GEOM_Object_ptr GEOM_Superv_i::ScaleShapeCopy (GEOM::GEOM_Object_ptr theObject,
- GEOM::GEOM_Object_ptr thePoint,
- CORBA::Double theFactor)
+GEOM::GEOM_Object_ptr GEOM_Superv_i::ScaleShapeCopy (GEOM::GEOM_Object_ptr theObject,
+ GEOM::GEOM_Object_ptr thePoint,
+ CORBA::Double theFactor)
{
+ beginService( " GEOM_Superv_i::ScaleShapeCopy" );
MESSAGE("GEOM_Superv_i::ScaleShapeCopy");
getTransfOp();
- return myTransfOp->ScaleShapeCopy(theObject, thePoint, theFactor);
+ GEOM::GEOM_Object_ptr anObj = myTransfOp->ScaleShapeCopy(theObject, thePoint, theFactor);
+ endService( " GEOM_Superv_i::ScaleShapeCopy" );
+ return anObj;
+}
+
+//=============================================================================
+// ScaleShapeAlongAxes:
+//=============================================================================
+GEOM::GEOM_Object_ptr GEOM_Superv_i::ScaleShapeAlongAxes (GEOM::GEOM_Object_ptr theObject,
+ GEOM::GEOM_Object_ptr thePoint,
+ CORBA::Double theFactorX,
+ CORBA::Double theFactorY,
+ CORBA::Double theFactorZ)
+{
+ beginService( " GEOM_Superv_i::ScaleShapeAlongAxes" );
+ MESSAGE("GEOM_Superv_i::ScaleShapeAlongAxes");
+ getTransfOp();
+ GEOM::GEOM_Object_ptr anObj = myTransfOp->ScaleShapeAlongAxes
+ (theObject, thePoint, theFactorX, theFactorY, theFactorZ);
+ endService( " GEOM_Superv_i::ScaleShapeAlongAxes" );
+ return anObj;
+}
+
+//=============================================================================
+// ScaleShapeAlongAxesCopy:
+//=============================================================================
+GEOM::GEOM_Object_ptr GEOM_Superv_i::ScaleShapeAlongAxesCopy (GEOM::GEOM_Object_ptr theObject,
+ GEOM::GEOM_Object_ptr thePoint,
+ CORBA::Double theFactorX,
+ CORBA::Double theFactorY,
+ CORBA::Double theFactorZ)
+{
+ beginService( " GEOM_Superv_i::ScaleShapeAlongAxesCopy" );
+ MESSAGE("GEOM_Superv_i::ScaleShapeAlongAxesCopy");
+ getTransfOp();
+ GEOM::GEOM_Object_ptr anObj = myTransfOp->ScaleShapeAlongAxesCopy
+ (theObject, thePoint, theFactorX, theFactorY, theFactorZ);
+ endService( " GEOM_Superv_i::ScaleShapeAlongAxesCopy" );
+ return anObj;
}
//=============================================================================
// PositionShape:
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_Superv_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)
{
+ beginService( " GEOM_Superv_i::PositionShape" );
MESSAGE("GEOM_Superv_i::PositionShape");
getTransfOp();
- return myTransfOp->PositionShape(theObject, theStartLCS, theEndLCS);
+ GEOM::GEOM_Object_ptr anObj = myTransfOp->PositionShape(theObject, theStartLCS, theEndLCS);
+ endService( " GEOM_Superv_i::PositionShape" );
+ return anObj;
}
//=============================================================================
// PositionShapeCopy:
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_Superv_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)
{
+ beginService( " GEOM_Superv_i::PositionShapeCopy" );
MESSAGE("GEOM_Superv_i::PositionShapeCopy");
getTransfOp();
- return myTransfOp->PositionShapeCopy(theObject, theStartLCS, theEndLCS);
+ GEOM::GEOM_Object_ptr anObj = myTransfOp->PositionShapeCopy(theObject, theStartLCS, theEndLCS);
+ endService( " GEOM_Superv_i::PositionShapeCopy" );
+ return anObj;
+}
+
+//=============================================================================
+// PositionAlongPath:
+//=============================================================================
+GEOM::GEOM_Object_ptr GEOM_Superv_i::PositionAlongPath (GEOM::GEOM_Object_ptr theObject,
+ GEOM::GEOM_Object_ptr thePath,
+ CORBA::Double theDistance,
+ CORBA::Boolean theCopy,
+ CORBA::Boolean theReverse)
+{
+ beginService( " GEOM_Superv_i::PositionAlongPath" );
+ MESSAGE("GEOM_Superv_i::PositionAlongPath");
+ getTransfOp();
+ GEOM::GEOM_Object_ptr anObj = myTransfOp->PositionAlongPath(theObject, thePath, theDistance, theCopy, theReverse);
+ endService( " GEOM_Superv_i::PositionAlongPath" );
+ return anObj;
}
//=============================== ShapesOperations ============================
// Make:
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeEdge (GEOM::GEOM_Object_ptr thePnt1,
- GEOM::GEOM_Object_ptr thePnt2)
+ GEOM::GEOM_Object_ptr thePnt2)
{
+ beginService( " GEOM_Superv_i::MakeEdge" );
MESSAGE("GEOM_Superv_i::MakeEdge");
getShapesOp();
- return myShapesOp->MakeEdge(thePnt1, thePnt2);
+ GEOM::GEOM_Object_ptr anObj = myShapesOp->MakeEdge(thePnt1, thePnt2);
+ endService( " GEOM_Superv_i::MakeEdge" );
+ return anObj;
+}
+
+//=============================================================================
+// MakeEdgeOnCurveByLength:
+//=============================================================================
+GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeEdgeOnCurveByLength (GEOM::GEOM_Object_ptr theRefCurve,
+ CORBA::Double theLength,
+ GEOM::GEOM_Object_ptr theStartPoint)
+{
+ beginService( " GEOM_Superv_i::MakeEdgeOnCurveByLength" );
+ MESSAGE("GEOM_Superv_i::MakeEdgeOnCurveByLength");
+ getShapesOp();
+ GEOM::GEOM_Object_ptr anObj = myShapesOp->MakeEdgeOnCurveByLength(theRefCurve, theLength, theStartPoint);
+ endService( " GEOM_Superv_i::MakeEdgeOnCurveByLength" );
+ return anObj;
}
//=============================================================================
// MakeWire:
//=============================================================================
-GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeWire (GEOM::GEOM_List_ptr theEdgesAndWires)
+GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeWire (GEOM::GEOM_List_ptr theEdgesAndWires,
+ CORBA::Double theTolerance)
{
+ beginService( " GEOM_Superv_i::MakeWire" );
MESSAGE("GEOM_Superv_i::MakeWire");
- if (GEOM_List_i<GEOM::ListOfGO>* aListImplEW =
+ if (GEOM_List_i<GEOM::ListOfGO>* aListImplEW =
dynamic_cast<GEOM_List_i<GEOM::ListOfGO>*>(GetServant(theEdgesAndWires, myPOA).in())) {
getShapesOp();
- return myShapesOp->MakeWire(aListImplEW->GetList());
+ GEOM::GEOM_Object_ptr anObj = myShapesOp->MakeWire(aListImplEW->GetList(), theTolerance);
+ endService( " GEOM_Superv_i::MakeWire" );
+ return anObj;
}
+ endService( " GEOM_Superv_i::MakeWire" );
return NULL;
}
// MakeFace:
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeFace (GEOM::GEOM_Object_ptr theWire,
- CORBA::Boolean isPlanarWanted)
+ CORBA::Boolean isPlanarWanted)
{
+ beginService( " GEOM_Superv_i::MakeFace" );
MESSAGE("GEOM_Superv_i::MakeFace");
getShapesOp();
- return myShapesOp->MakeFace(theWire, isPlanarWanted);
+ GEOM::GEOM_Object_ptr anObj = myShapesOp->MakeFace(theWire, isPlanarWanted);
+ endService( " GEOM_Superv_i::MakeFace" );
+ return anObj;
}
//=============================================================================
// MakeFaceWires:
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeFaceWires (GEOM::GEOM_List_ptr theWires,
- CORBA::Boolean isPlanarWanted)
+ CORBA::Boolean isPlanarWanted)
{
+ beginService( " GEOM_Superv_i::MakeFaceWires" );
MESSAGE("GEOM_Superv_i::MakeFaceWires");
- if (GEOM_List_i<GEOM::ListOfGO>* aListImplW =
+ if (GEOM_List_i<GEOM::ListOfGO>* aListImplW =
dynamic_cast<GEOM_List_i<GEOM::ListOfGO>*>(GetServant(theWires, myPOA).in())) {
getShapesOp();
- return myShapesOp->MakeFaceWires(aListImplW->GetList(), isPlanarWanted);
+ GEOM::GEOM_Object_ptr anObj = myShapesOp->MakeFaceWires(aListImplW->GetList(), isPlanarWanted);
+ endService( " GEOM_Superv_i::MakeFaceWires" );
+ return anObj;
+ }
+ endService( " GEOM_Superv_i::MakeFaceWires" );
+ return NULL;
+}
+
+//=============================================================================
+// MakeFaceWithConstraints:
+//=============================================================================
+GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeFaceWithConstraints (GEOM::GEOM_List_ptr theConstraints)
+{
+ beginService( " GEOM_Superv_i::MakeFaceWithConstraints" );
+ MESSAGE("GEOM_Superv_i::MakeFaceWithConstraints");
+ if (GEOM_List_i<GEOM::ListOfGO>* aConstraints =
+ dynamic_cast<GEOM_List_i<GEOM::ListOfGO>*>(GetServant(theConstraints, myPOA).in())) {
+ getShapesOp();
+ GEOM::GEOM_Object_ptr anObj = myShapesOp->MakeFaceWithConstraints(aConstraints->GetList());
+ endService( " GEOM_Superv_i::MakeFaceWithConstraints" );
+ return anObj;
}
+ endService( " GEOM_Superv_i::MakeFaceWithConstraints" );
return NULL;
}
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeShell (GEOM::GEOM_List_ptr theFacesAndShells)
{
+ beginService( " GEOM_Superv_i::MakeShell" );
MESSAGE("GEOM_Superv_i::MakeShell");
- if (GEOM_List_i<GEOM::ListOfGO>* aListImplFS =
+ if (GEOM_List_i<GEOM::ListOfGO>* aListImplFS =
dynamic_cast<GEOM_List_i<GEOM::ListOfGO>*>(GetServant(theFacesAndShells, myPOA).in())) {
getShapesOp();
- return myShapesOp->MakeShell(aListImplFS->GetList());
+ GEOM::GEOM_Object_ptr anObj = myShapesOp->MakeShell(aListImplFS->GetList());
+ endService( " GEOM_Superv_i::MakeShell" );
+ return anObj;
}
+ endService( " GEOM_Superv_i::MakeShell" );
return NULL;
}
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeSolidShell (GEOM::GEOM_Object_ptr theShell)
{
+ beginService( " GEOM_Superv_i::MakeSolidShell" );
MESSAGE("GEOM_Superv_i::MakeSolidShell");
getShapesOp();
- return myShapesOp->MakeSolidShell(theShell);
+ GEOM::GEOM_Object_ptr anObj = myShapesOp->MakeSolidShell(theShell);
+ endService( " GEOM_Superv_i::MakeSolidShell" );
+ return anObj;
}
//=============================================================================
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeSolidShells (GEOM::GEOM_List_ptr theShells)
{
+ beginService( " GEOM_Superv_i::MakeSolidShells" );
MESSAGE("GEOM_Superv_i::MakeSolidShells");
- if (GEOM_List_i<GEOM::ListOfGO>* aListImplS =
+ if (GEOM_List_i<GEOM::ListOfGO>* aListImplS =
dynamic_cast<GEOM_List_i<GEOM::ListOfGO>*>(GetServant(theShells, myPOA).in())) {
getShapesOp();
- return myShapesOp->MakeSolidShells(aListImplS->GetList());
+ GEOM::GEOM_Object_ptr anObj = myShapesOp->MakeSolidShells(aListImplS->GetList());
+ endService( " GEOM_Superv_i::MakeSolidShells" );
+ return anObj;
}
+ endService( " GEOM_Superv_i::MakeSolidShells" );
return NULL;
}
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeCompound (GEOM::GEOM_List_ptr theShapes)
{
+ beginService( " GEOM_Superv_i::MakeCompound" );
MESSAGE("GEOM_Superv_i::MakeCompound");
- if (GEOM_List_i<GEOM::ListOfGO>* aListImpl =
+ if (GEOM_List_i<GEOM::ListOfGO>* aListImpl =
dynamic_cast<GEOM_List_i<GEOM::ListOfGO>*>(GetServant(theShapes, myPOA).in())) {
getShapesOp();
- return myShapesOp->MakeCompound(aListImpl->GetList());
+ GEOM::GEOM_Object_ptr anObj = myShapesOp->MakeCompound(aListImpl->GetList());
+ endService( " GEOM_Superv_i::MakeCompound" );
+ return anObj;
+ }
+ endService( " GEOM_Superv_i::MakeCompound" );
+ return NULL;
+}
+
+//=============================================================================
+// MakeSolidFromConnectedFaces:
+//=============================================================================
+GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeSolidFromConnectedFaces (GEOM::GEOM_List_ptr theFacesOrShells,
+ CORBA::Boolean isIntersect)
+{
+ beginService( " GEOM_Superv_i::MakeSolidFromConnectedFaces" );
+ MESSAGE("GEOM_Superv_i::MakeSolidFromConnectedFaces");
+ if (GEOM_List_i<GEOM::ListOfGO>* aListImpl =
+ dynamic_cast<GEOM_List_i<GEOM::ListOfGO>*>(GetServant(theFacesOrShells, myPOA).in())) {
+ getShapesOp();
+ GEOM::GEOM_Object_ptr anObj = myShapesOp->MakeSolidFromConnectedFaces(aListImpl->GetList(), isIntersect);
+ endService( " GEOM_Superv_i::MakeSolidFromConnectedFaces" );
+ return anObj;
}
+ endService( " GEOM_Superv_i::MakeSolidFromConnectedFaces" );
return NULL;
}
// MakeGlueFaces:
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeGlueFaces (GEOM::GEOM_Object_ptr theShape,
- CORBA::Double theTolerance)
+ CORBA::Double theTolerance,
+ CORBA::Boolean doKeepNonSolids)
{
+ beginService( " GEOM_Superv_i::MakeGlueFaces" );
MESSAGE("GEOM_Superv_i::MakeGlueFaces");
getShapesOp();
- return myShapesOp->MakeGlueFaces(theShape, theTolerance);
+ GEOM::ListOfGO_var objList = new GEOM::ListOfGO;
+ objList->length( 1 );
+ objList[0] = theShape;
+ GEOM::GEOM_Object_ptr anObj =
+ myShapesOp->MakeGlueFaces(objList, theTolerance, doKeepNonSolids);
+ endService( " GEOM_Superv_i::MakeGlueFaces" );
+ return anObj;
+}
+
+//=============================================================================
+// GetGlueFaces:
+//=============================================================================
+GEOM::GEOM_List_ptr GEOM_Superv_i::GetGlueFaces (GEOM::GEOM_Object_ptr theShape,
+ CORBA::Double theTolerance)
+{
+ beginService( " GEOM_Superv_i::GetGlueFaces" );
+ MESSAGE("GEOM_Superv_i::GetGlueFaces");
+ getShapesOp();
+ GEOM::ListOfGO_var objList = new GEOM::ListOfGO;
+ objList->length( 1 );
+ objList[0] = theShape;
+ GEOM::ListOfGO* aList = myShapesOp->GetGlueFaces(objList, theTolerance);
+ GEOM_List_i<GEOM::ListOfGO>* aListPtr = new GEOM_List_i<GEOM::ListOfGO>(*(aList));
+ MESSAGE(" List of "<<aListPtr->GetList().length()<<" element(s)");
+ endService( " GEOM_Superv_i::GetGlueFaces" );
+ return aListPtr->_this();
+}
+
+//=============================================================================
+// MakeGlueFacesByList:
+//=============================================================================
+GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeGlueFacesByList (GEOM::GEOM_Object_ptr theShape,
+ CORBA::Double theTolerance,
+ const GEOM::ListOfGO& theFaces,
+ CORBA::Boolean doKeepNonSolids,
+ CORBA::Boolean doGlueAllEdges)
+{
+ beginService( " GEOM_Superv_i::MakeGlueFacesByList" );
+ MESSAGE("GEOM_Superv_i::MakeGlueFacesByList");
+ getShapesOp();
+ GEOM::ListOfGO_var objList = new GEOM::ListOfGO;
+ objList->length( 1 );
+ objList[0] = theShape;
+ GEOM::GEOM_Object_ptr anObj =
+ myShapesOp->MakeGlueFacesByList(objList, theTolerance, theFaces,
+ doKeepNonSolids, doGlueAllEdges);
+ endService( " GEOM_Superv_i::MakeGlueFacesByList" );
+ return anObj;
}
//=============================================================================
// MakeExplode:
//=============================================================================
GEOM::GEOM_List_ptr GEOM_Superv_i::MakeExplode (GEOM::GEOM_Object_ptr theShape,
- CORBA::Long theShapeType,
- CORBA::Boolean isSorted)
+ CORBA::Long theShapeType,
+ CORBA::Boolean isSorted)
{
+ beginService( " GEOM_Superv_i::MakeExplode" );
MESSAGE("GEOM_Superv_i::MakeExplode");
getShapesOp();
GEOM::ListOfGO* aList = myShapesOp->MakeExplode(theShape, theShapeType, isSorted);
GEOM_List_i<GEOM::ListOfGO>* aListPtr = new GEOM_List_i<GEOM::ListOfGO>(*(aList));
MESSAGE(" List of "<<aListPtr->GetList().length()<<" element(s)");
+ endService( " GEOM_Superv_i::MakeExplode" );
return aListPtr->_this();
}
//=============================================================================
CORBA::Long GEOM_Superv_i::NumberOfFaces (GEOM::GEOM_Object_ptr theShape)
{
+ beginService( " GEOM_Superv_i::NumberOfFaces" );
MESSAGE("GEOM_Superv_i::NumberOfFaces");
getShapesOp();
- return myShapesOp->NumberOfFaces(theShape);
+ CORBA::Long aRes = myShapesOp->NumberOfFaces(theShape);
+ endService( " GEOM_Superv_i::NumberOfFaces" );
+ return aRes;
}
//=============================================================================
//=============================================================================
CORBA::Long GEOM_Superv_i::NumberOfEdges (GEOM::GEOM_Object_ptr theShape)
{
+ beginService( " GEOM_Superv_i::NumberOfEdges" );
MESSAGE("GEOM_Superv_i::NumberOfEdges");
getShapesOp();
- return myShapesOp->NumberOfEdges(theShape);
+ CORBA::Long aRes = myShapesOp->NumberOfEdges(theShape);
+ endService( " GEOM_Superv_i::NumberOfEdges" );
+ return aRes;
}
+
//=============================================================================
// ChangeOrientation:
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_Superv_i::ChangeOrientation (GEOM::GEOM_Object_ptr theShape)
{
+ beginService( " GEOM_Superv_i::ChangeOrientation" );
MESSAGE("GEOM_Superv_i::ChangeOrientation");
getShapesOp();
- return myShapesOp->ChangeOrientation(theShape);
+ GEOM::GEOM_Object_ptr anObj = myShapesOp->ChangeOrientation(theShape);
+ endService( " GEOM_Superv_i::ChangeOrientation" );
+ return anObj;
+}
+
+
+//=============================================================================
+// GetShapesOnShape:
+//=============================================================================
+GEOM::GEOM_List_ptr GEOM_Superv_i::GetShapesOnShape
+ (GEOM::GEOM_Object_ptr theCheckShape,
+ GEOM::GEOM_Object_ptr theShape,
+ CORBA::Short theShapeType,
+ GEOM::shape_state theState)
+{
+ beginService( " GEOM_Superv_i::GetShapesOnShape" );
+ MESSAGE("GEOM_Superv_i::GetShapesOnShape");
+ getShapesOp();
+ GEOM::ListOfGO* aList =
+ myShapesOp->GetShapesOnShape(theCheckShape, theShape, theShapeType, theState);
+ GEOM_List_i<GEOM::ListOfGO>* aListPtr = new GEOM_List_i<GEOM::ListOfGO>(*(aList));
+ MESSAGE(" List of "<<aListPtr->GetList().length()<<" element(s)");
+ endService( " GEOM_Superv_i::GetShapesOnShape" );
+ return aListPtr->_this();
+}
+
+
+//=============================================================================
+// GetShapesOnShapeAsCompound:
+//=============================================================================
+GEOM::GEOM_Object_ptr GEOM_Superv_i::GetShapesOnShapeAsCompound
+ (GEOM::GEOM_Object_ptr theCheckShape,
+ GEOM::GEOM_Object_ptr theShape,
+ CORBA::Short theShapeType,
+ GEOM::shape_state theState)
+{
+ beginService( " GEOM_Superv_i::GetShapesOnShapeAsCompound" );
+ MESSAGE("GEOM_Superv_i::GetShapesOnShapeAsCompound");
+ getShapesOp();
+ GEOM::GEOM_Object_ptr anObj =
+ myShapesOp->GetShapesOnShapeAsCompound(theCheckShape, theShape, theShapeType, theState);
+ endService( " GEOM_Superv_i::GetShapesOnShapeAsCompound" );
+ return anObj;
}
// MakeQuad4Vertices:
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_Superv_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 thePnt2,
+ GEOM::GEOM_Object_ptr thePnt3,
+ GEOM::GEOM_Object_ptr thePnt4)
{
+ beginService( " GEOM_Superv_i::MakeQuad4Vertices" );
MESSAGE("GEOM_Superv_i::MakeQuad4Vertices");
getBlocksOp();
- return myBlocksOp->MakeQuad4Vertices(thePnt1, thePnt2, thePnt3, thePnt4);
+ GEOM::GEOM_Object_ptr anObj = myBlocksOp->MakeQuad4Vertices(thePnt1, thePnt2, thePnt3, thePnt4);
+ endService( " GEOM_Superv_i::MakeQuad4Vertices" );
+ return anObj;
}
//=============================================================================
// MakeQuad:
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_Superv_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 theEdge2,
+ GEOM::GEOM_Object_ptr theEdge3,
+ GEOM::GEOM_Object_ptr theEdge4)
{
+ beginService( " GEOM_Superv_i::MakeQuad" );
MESSAGE("GEOM_Superv_i::MakeQuad");
getBlocksOp();
- return myBlocksOp->MakeQuad(theEdge1, theEdge2, theEdge3, theEdge4);
+ GEOM::GEOM_Object_ptr anObj = myBlocksOp->MakeQuad(theEdge1, theEdge2, theEdge3, theEdge4);
+ endService( " GEOM_Superv_i::MakeQuad" );
+ return anObj;
}
//=============================================================================
// MakeQuad2Edges:
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeQuad2Edges (GEOM::GEOM_Object_ptr theEdge1,
- GEOM::GEOM_Object_ptr theEdge2)
+ GEOM::GEOM_Object_ptr theEdge2)
{
+ beginService( " GEOM_Superv_i::MakeQuad2Edges" );
MESSAGE("GEOM_Superv_i::MakeQuad2Edges");
getBlocksOp();
- return myBlocksOp->MakeQuad2Edges(theEdge1, theEdge2);
+ GEOM::GEOM_Object_ptr anObj = myBlocksOp->MakeQuad2Edges(theEdge1, theEdge2);
+ endService( " GEOM_Superv_i::MakeQuad2Edges" );
+ return anObj;
}
//=============================================================================
// MakeHexa:
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_Superv_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 theFace2,
+ GEOM::GEOM_Object_ptr theFace3,
+ GEOM::GEOM_Object_ptr theFace4,
+ GEOM::GEOM_Object_ptr theFace5,
+ GEOM::GEOM_Object_ptr theFace6)
{
+ beginService( " GEOM_Superv_i::MakeHexa" );
MESSAGE("GEOM_Superv_i::MakeHexa");
getBlocksOp();
- return myBlocksOp->MakeHexa(theFace1, theFace2, theFace3, theFace4, theFace5, theFace6);
+ GEOM::GEOM_Object_ptr anObj = myBlocksOp->MakeHexa(theFace1, theFace2, theFace3, theFace4, theFace5, theFace6);
+ endService( " GEOM_Superv_i::MakeHexa" );
+ return anObj;
}
//=============================================================================
// MakeHexa2Faces:
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeHexa2Faces (GEOM::GEOM_Object_ptr theFace1,
- GEOM::GEOM_Object_ptr theFace2)
+ GEOM::GEOM_Object_ptr theFace2)
{
+ beginService( " GEOM_Superv_i::MakeHexa2Faces" );
MESSAGE("GEOM_Superv_i::MakeHexa2Faces");
getBlocksOp();
- return myBlocksOp->MakeHexa2Faces(theFace1, theFace2);
+ GEOM::GEOM_Object_ptr anObj = myBlocksOp->MakeHexa2Faces(theFace1, theFace2);
+ endService( " GEOM_Superv_i::MakeHexa2Faces" );
+ return anObj;
}
//=============================================================================
// GetPoint:
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_Superv_i::GetPoint (GEOM::GEOM_Object_ptr theShape,
- CORBA::Double theX,
- CORBA::Double theY,
- CORBA::Double theZ,
- CORBA::Double theEpsilon)
+ CORBA::Double theX,
+ CORBA::Double theY,
+ CORBA::Double theZ,
+ CORBA::Double theEpsilon)
{
+ beginService( " GEOM_Superv_i::GetPoint" );
MESSAGE("GEOM_Superv_i::GetPoint");
getBlocksOp();
- return myBlocksOp->GetPoint(theShape, theX, theY, theZ, theEpsilon);
+ GEOM::GEOM_Object_ptr anObj = myBlocksOp->GetPoint(theShape, theX, theY, theZ, theEpsilon);
+ endService( " GEOM_Superv_i::GetPoint" );
+ return anObj;
}
//=============================================================================
// GetEdge:
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_Superv_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)
{
+ beginService( " GEOM_Superv_i::GetEdge" );
MESSAGE("GEOM_Superv_i::GetEdge");
getBlocksOp();
- return myBlocksOp->GetEdge(theShape, thePoint1, thePoint2);
+ GEOM::GEOM_Object_ptr anObj = myBlocksOp->GetEdge(theShape, thePoint1, thePoint2);
+ endService( " GEOM_Superv_i::GetEdge" );
+ return anObj;
}
//=============================================================================
// GetEdgeNearPoint:
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_Superv_i::GetEdgeNearPoint (GEOM::GEOM_Object_ptr theShape,
- GEOM::GEOM_Object_ptr thePoint)
+ GEOM::GEOM_Object_ptr thePoint)
{
+ beginService( " GEOM_Superv_i::GetEdgeNearPoint" );
MESSAGE("GEOM_Superv_i::GetEdgeNearPoint");
getBlocksOp();
- return myBlocksOp->GetEdgeNearPoint(theShape, thePoint);
+ GEOM::GEOM_Object_ptr anObj = myBlocksOp->GetEdgeNearPoint(theShape, thePoint);
+ endService( " GEOM_Superv_i::GetEdgeNearPoint" );
+ return anObj;
}
//=============================================================================
// GetFaceByPoints:
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_Superv_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)
{
+ beginService( " GEOM_Superv_i::GetFaceByPoints" );
MESSAGE("GEOM_Superv_i::GetFaceByPoints");
getBlocksOp();
- return myBlocksOp->GetFaceByPoints(theShape, thePoint1, thePoint2, thePoint3, thePoint4);
+ GEOM::GEOM_Object_ptr anObj = myBlocksOp->GetFaceByPoints(theShape, thePoint1, thePoint2, thePoint3, thePoint4);
+ endService( " GEOM_Superv_i::GetFaceByPoints" );
+ return anObj;
}
//=============================================================================
// GetFaceByEdges:
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_Superv_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)
{
+ beginService( " GEOM_Superv_i::GetFaceByEdges" );
MESSAGE("GEOM_Superv_i::GetFaceByEdges");
getBlocksOp();
- return myBlocksOp->GetFaceByEdges(theShape, theEdge1, theEdge2);
+ GEOM::GEOM_Object_ptr anObj = myBlocksOp->GetFaceByEdges(theShape, theEdge1, theEdge2);
+ endService( " GEOM_Superv_i::GetFaceByEdges" );
+ return anObj;
}
//=============================================================================
// GetOppositeFace:
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_Superv_i::GetOppositeFace (GEOM::GEOM_Object_ptr theBlock,
- GEOM::GEOM_Object_ptr theFace)
+ GEOM::GEOM_Object_ptr theFace)
{
+ beginService( " GEOM_Superv_i::GetOppositeFace" );
MESSAGE("GEOM_Superv_i::GetOppositeFace");
getBlocksOp();
- return myBlocksOp->GetOppositeFace(theBlock, theFace);
+ GEOM::GEOM_Object_ptr anObj = myBlocksOp->GetOppositeFace(theBlock, theFace);
+ endService( " GEOM_Superv_i::GetOppositeFace" );
+ return anObj;
}
//=============================================================================
// GetFaceNearPoint:
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_Superv_i::GetFaceNearPoint (GEOM::GEOM_Object_ptr theShape,
- GEOM::GEOM_Object_ptr thePoint)
+ GEOM::GEOM_Object_ptr thePoint)
{
+ beginService( " GEOM_Superv_i::GetFaceNearPoint" );
MESSAGE("GEOM_Superv_i::GetFaceNearPoint");
getBlocksOp();
- return myBlocksOp->GetFaceNearPoint(theShape, thePoint);
+ GEOM::GEOM_Object_ptr anObj = myBlocksOp->GetFaceNearPoint(theShape, thePoint);
+ endService( " GEOM_Superv_i::GetFaceNearPoint" );
+ return anObj;
}
//=============================================================================
// GetFaceByNormale:
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_Superv_i::GetFaceByNormale (GEOM::GEOM_Object_ptr theBlock,
- GEOM::GEOM_Object_ptr theVector)
+ GEOM::GEOM_Object_ptr theVector)
{
+ beginService( " GEOM_Superv_i::GetFaceByNormale" );
MESSAGE("GEOM_Superv_i::GetFaceByNormale");
getBlocksOp();
- return myBlocksOp->GetFaceByNormale(theBlock, theVector);
+ GEOM::GEOM_Object_ptr anObj = myBlocksOp->GetFaceByNormale(theBlock, theVector);
+ endService( " GEOM_Superv_i::GetFaceByNormale" );
+ return anObj;
}
//=============================================================================
// IsCompoundOfBlocks:
//=============================================================================
CORBA::Boolean GEOM_Superv_i::IsCompoundOfBlocks (GEOM::GEOM_Object_ptr theCompound,
- CORBA::Long theMinNbFaces,
- CORBA::Long theMaxNbFaces,
- CORBA::Long& theNbBlocks)
+ CORBA::Long theMinNbFaces,
+ CORBA::Long theMaxNbFaces,
+ CORBA::Long& theNbBlocks)
{
+ beginService( " GEOM_Superv_i::IsCompoundOfBlocks" );
MESSAGE("GEOM_Superv_i::IsCompoundOfBlocks");
getBlocksOp();
- return myBlocksOp->IsCompoundOfBlocks(theCompound, theMinNbFaces, theMaxNbFaces, theNbBlocks);
+ CORBA::Boolean aRes = myBlocksOp->IsCompoundOfBlocks(theCompound, theMinNbFaces, theMaxNbFaces, theNbBlocks);
+ endService( " GEOM_Superv_i::IsCompoundOfBlocks" );
+ return aRes;
}
//=============================================================================
// CheckCompoundOfBlocks:
//=============================================================================
-CORBA::Boolean GEOM_Superv_i::CheckCompoundOfBlocks
+CORBA::Boolean GEOM_Superv_i::CheckCompoundOfBlocks
(GEOM::GEOM_Object_ptr theCompound,
GEOM::GEOM_IBlocksOperations::BCErrors_out theErrors)
{
+ beginService( " GEOM_Superv_i::CheckCompoundOfBlocks" );
MESSAGE("GEOM_Superv_i::CheckCompoundOfBlocks");
getBlocksOp();
- return myBlocksOp->CheckCompoundOfBlocks(theCompound, theErrors);
+ CORBA::Boolean aRes = myBlocksOp->CheckCompoundOfBlocks(theCompound, -1., theErrors);
+ endService( " GEOM_Superv_i::CheckCompoundOfBlocks" );
+ return aRes;
}
//=============================================================================
// PrintBCErrors:
//=============================================================================
char* GEOM_Superv_i::PrintBCErrors (GEOM::GEOM_Object_ptr theCompound,
- const GEOM::GEOM_IBlocksOperations::BCErrors& theErrors)
+ const GEOM::GEOM_IBlocksOperations::BCErrors& theErrors)
{
+ beginService( " GEOM_Superv_i::PrintBCErrors" );
MESSAGE("GEOM_Superv_i::PrintBCErrors");
getBlocksOp();
- return myBlocksOp->PrintBCErrors(theCompound, theErrors);
+ char* anErrors = myBlocksOp->PrintBCErrors(theCompound, theErrors);
+ endService( " GEOM_Superv_i::PrintBCErrors" );
+ return anErrors;
}
//=============================================================================
// ExplodeCompoundOfBlocks:
//=============================================================================
GEOM::GEOM_List_ptr GEOM_Superv_i::ExplodeCompoundOfBlocks (GEOM::GEOM_Object_ptr theCompound,
- CORBA::Long theMinNbFaces,
- CORBA::Long theMaxNbFaces)
+ CORBA::Long theMinNbFaces,
+ CORBA::Long theMaxNbFaces)
{
+ beginService( " GEOM_Superv_i::ExplodeCompoundOfBlocks" );
MESSAGE("GEOM_Superv_i::ExplodeCompoundOfBlocks");
getBlocksOp();
GEOM::ListOfGO* aBlocks = myBlocksOp->ExplodeCompoundOfBlocks(theCompound, theMinNbFaces, theMaxNbFaces);
GEOM_List_i<GEOM::ListOfGO>* aListPtr = new GEOM_List_i<GEOM::ListOfGO>(*(aBlocks));
+ endService( " GEOM_Superv_i::ExplodeCompoundOfBlocks" );
return aListPtr->_this();
}
// GetBlockNearPoint:
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_Superv_i::GetBlockNearPoint (GEOM::GEOM_Object_ptr theCompound,
- GEOM::GEOM_Object_ptr thePoint)
+ GEOM::GEOM_Object_ptr thePoint)
{
+ beginService( " GEOM_Superv_i::GetBlockNearPoint" );
MESSAGE("GEOM_Superv_i::GetBlockNearPoint");
getBlocksOp();
- return myBlocksOp->GetBlockNearPoint(theCompound, thePoint);
+ GEOM::GEOM_Object_ptr anObj = myBlocksOp->GetBlockNearPoint(theCompound, thePoint);
+ endService( " GEOM_Superv_i::GetBlockNearPoint" );
+ return anObj;
}
//=============================================================================
// GetBlockByParts:
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_Superv_i::GetBlockByParts (GEOM::GEOM_Object_ptr theCompound,
- GEOM::GEOM_List_ptr theParts)
+ GEOM::GEOM_List_ptr theParts)
{
+ beginService( " GEOM_Superv_i::GetBlockByParts" );
MESSAGE("GEOM_Superv_i::GetBlockByParts");
- if (GEOM_List_i<GEOM::ListOfGO>* aListImplP =
+ if (GEOM_List_i<GEOM::ListOfGO>* aListImplP =
dynamic_cast<GEOM_List_i<GEOM::ListOfGO>*>(GetServant(theParts, myPOA).in())) {
getBlocksOp();
- return myBlocksOp->GetBlockByParts(theCompound, aListImplP->GetList());
+ GEOM::GEOM_Object_ptr anObj = myBlocksOp->GetBlockByParts(theCompound, aListImplP->GetList());
+ endService( " GEOM_Superv_i::GetBlockByParts" );
+ return anObj;
}
+ endService( " GEOM_Superv_i::GetBlockByParts" );
return NULL;
}
// GetBlocksByParts:
//=============================================================================
GEOM::GEOM_List_ptr GEOM_Superv_i::GetBlocksByParts (GEOM::GEOM_Object_ptr theCompound,
- GEOM::GEOM_List_ptr theParts)
+ GEOM::GEOM_List_ptr theParts)
{
+ beginService( " GEOM_Superv_i::GetBlocksByParts" );
MESSAGE("GEOM_Superv_i::GetBlocksByParts");
- if (GEOM_List_i<GEOM::ListOfGO>* aListImplP =
+ if (GEOM_List_i<GEOM::ListOfGO>* aListImplP =
dynamic_cast<GEOM_List_i<GEOM::ListOfGO>*>(GetServant(theParts, myPOA).in())) {
getBlocksOp();
-
+
GEOM::ListOfGO* aBlocks = myBlocksOp->GetBlocksByParts(theCompound, aListImplP->GetList());
GEOM_List_i<GEOM::ListOfGO>* aListPtr = new GEOM_List_i<GEOM::ListOfGO>(*(aBlocks));
+ endService( " GEOM_Superv_i::GetBlocksByParts" );
return aListPtr->_this();
}
+ endService( " GEOM_Superv_i::GetBlocksByParts" );
return NULL;
}
// MakeMultiTransformation1D:
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeMultiTransformation1D (GEOM::GEOM_Object_ptr theBlock,
- CORBA::Long theDirFace1,
- CORBA::Long theDirFace2,
- CORBA::Long theNbTimes)
+ CORBA::Long theDirFace1,
+ CORBA::Long theDirFace2,
+ CORBA::Long theNbTimes)
{
+ beginService( " GEOM_Superv_i::MakeMultiTransformation1D" );
MESSAGE("GEOM_Superv_i::MakeMultiTransformation1D");
getBlocksOp();
- return myBlocksOp->MakeMultiTransformation1D(theBlock, theDirFace1, theDirFace2, theNbTimes);
+ GEOM::GEOM_Object_ptr anObj = myBlocksOp->MakeMultiTransformation1D(theBlock, theDirFace1, theDirFace2, theNbTimes);
+ endService( " GEOM_Superv_i::MakeMultiTransformation1D" );
+ return anObj;
}
//=============================================================================
// MakeMultiTransformation2D:
//=============================================================================
-GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeMultiTransformation2D
+GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeMultiTransformation2D
(GEOM::GEOM_Object_ptr theBlock,
CORBA::Long theDirFace1U,
CORBA::Long theDirFace2U,
CORBA::Long theDirFace2V,
CORBA::Long theNbTimesV)
{
+ beginService( " GEOM_Superv_i::MakeMultiTransformation2D" );
MESSAGE("GEOM_Superv_i::MakeMultiTransformation2D");
getBlocksOp();
- return myBlocksOp->MakeMultiTransformation2D(theBlock,
- theDirFace1U, theDirFace2U, theNbTimesU,
- theDirFace1V, theDirFace2V, theNbTimesV);
+ GEOM::GEOM_Object_ptr anObj = myBlocksOp->MakeMultiTransformation2D(theBlock,
+ theDirFace1U, theDirFace2U, theNbTimesU,
+ theDirFace1V, theDirFace2V, theNbTimesV);
+ endService( " GEOM_Superv_i::MakeMultiTransformation2D" );
+ return anObj;
}
//=============================== CurvesOperations ============================
// MakeCirclePntVecR:
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeCirclePntVecR (GEOM::GEOM_Object_ptr theCenter,
- GEOM::GEOM_Object_ptr theVector,
- CORBA::Double theR)
+ GEOM::GEOM_Object_ptr theVector,
+ CORBA::Double theR)
{
+ beginService( " GEOM_Superv_i::MakeCirclePntVecR" );
MESSAGE("GEOM_Superv_i::MakeCirclePntVecR");
getCurvesOp();
- return myCurvesOp->MakeCirclePntVecR(theCenter, theVector, theR);
+ GEOM::GEOM_Object_ptr anObj = myCurvesOp->MakeCirclePntVecR(theCenter, theVector, theR);
+ endService( " GEOM_Superv_i::MakeCirclePntVecR" );
+ return anObj;
}
//=============================================================================
// MakeCircleThreePnt:
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeCircleThreePnt (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)
{
+ beginService( " GEOM_Superv_i::MakeCircleThreePnt" );
MESSAGE("GEOM_Superv_i::MakeCircleThreePnt");
getCurvesOp();
- return myCurvesOp->MakeCircleThreePnt(thePnt1, thePnt2, thePnt3);
+ GEOM::GEOM_Object_ptr anObj = myCurvesOp->MakeCircleThreePnt(thePnt1, thePnt2, thePnt3);
+ endService( " GEOM_Superv_i::MakeCircleThreePnt" );
+ return anObj;
+}
+//=============================================================================
+// MakeCircleCenter2Pnt:
+//=============================================================================
+GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeCircleCenter2Pnt (GEOM::GEOM_Object_ptr thePnt1,
+ GEOM::GEOM_Object_ptr thePnt2,
+ GEOM::GEOM_Object_ptr thePnt3)
+{
+ beginService( " GEOM_Superv_i::MakeCircleCenter2Pnt" );
+ MESSAGE("GEOM_Superv_i::MakeCircleCenter2Pnt");
+ getCurvesOp();
+ GEOM::GEOM_Object_ptr anObj = myCurvesOp->MakeCircleCenter2Pnt(thePnt1, thePnt2, thePnt3);
+ endService( " GEOM_Superv_i::MakeCircleCenter2Pnt" );
+ return anObj;
}
//=============================================================================
// MakeEllipse:
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeEllipse (GEOM::GEOM_Object_ptr theCenter,
- GEOM::GEOM_Object_ptr theVector,
- CORBA::Double theRMajor,
- CORBA::Double theRMinor)
+ GEOM::GEOM_Object_ptr theVector,
+ CORBA::Double theRMajor,
+ CORBA::Double theRMinor)
{
+ beginService( " GEOM_Superv_i::MakeEllipse" );
MESSAGE("GEOM_Superv_i::MakeEllipse");
getCurvesOp();
- return myCurvesOp->MakeEllipse(theCenter, theVector, theRMajor, theRMinor);
+ GEOM::GEOM_Object_ptr anObj = myCurvesOp->MakeEllipse(theCenter, theVector, theRMajor, theRMinor);
+ endService( " GEOM_Superv_i::MakeEllipse" );
+ return anObj;
+}
+
+//=============================================================================
+// MakeEllipseVec:
+//=============================================================================
+GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeEllipseVec (GEOM::GEOM_Object_ptr theCenter,
+ GEOM::GEOM_Object_ptr theVector,
+ CORBA::Double theRMajor,
+ CORBA::Double theRMinor,
+ GEOM::GEOM_Object_ptr theVectorMajor)
+{
+ beginService( " GEOM_Superv_i::MakeEllipseVec" );
+ MESSAGE("GEOM_Superv_i::MakeEllipseVec");
+ getCurvesOp();
+ GEOM::GEOM_Object_ptr anObj = myCurvesOp->MakeEllipseVec(theCenter, theVector, theRMajor, theRMinor, theVectorMajor);
+ endService( " GEOM_Superv_i::MakeEllipseVec" );
+ return anObj;
}
//=============================================================================
// MakeArc:
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_Superv_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)
{
+ beginService( " GEOM_Superv_i::MakeArc" );
MESSAGE("GEOM_Superv_i::MakeArc");
getCurvesOp();
- return myCurvesOp->MakeArc(thePnt1, thePnt2, thePnt3);
+ GEOM::GEOM_Object_ptr anObj = myCurvesOp->MakeArc(thePnt1, thePnt2, thePnt3);
+ endService( " GEOM_Superv_i::MakeArc" );
+ return anObj;
+}
+
+//=============================================================================
+// MakeArcCenter:
+//=============================================================================
+GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeArcCenter (GEOM::GEOM_Object_ptr theCenter,
+ GEOM::GEOM_Object_ptr thePnt1,
+ GEOM::GEOM_Object_ptr thePnt2,
+ CORBA::Boolean theSense)
+{
+ beginService( " GEOM_Superv_i::MakeArcCenter" );
+ MESSAGE("GEOM_Superv_i::MakeArcCenter");
+ getCurvesOp();
+ GEOM::GEOM_Object_ptr anObj = myCurvesOp->MakeArcCenter(theCenter, thePnt1, thePnt2,theSense);
+ endService( " GEOM_Superv_i::MakeArcCenter" );
+ return anObj;
+}
+
+//=============================================================================
+// MakeArcOfEllipse:
+//=============================================================================
+GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeArcOfEllipse (GEOM::GEOM_Object_ptr thePnt1,
+ GEOM::GEOM_Object_ptr thePnt2,
+ GEOM::GEOM_Object_ptr thePnt3)
+{
+ beginService( " GEOM_Superv_i::MakeArcOfEllipse" );
+ MESSAGE("GEOM_Superv_i::MakeArcOfEllipse");
+ getCurvesOp();
+ GEOM::GEOM_Object_ptr anObj = myCurvesOp->MakeArcOfEllipse(thePnt1, thePnt2, thePnt3);
+ endService( " GEOM_Superv_i::MakeArcOfEllipse" );
+ return anObj;
}
//=============================================================================
// MakePolyline:
//=============================================================================
-GEOM::GEOM_Object_ptr GEOM_Superv_i::MakePolyline (GEOM::GEOM_List_ptr thePoints)
+GEOM::GEOM_Object_ptr GEOM_Superv_i::MakePolyline (GEOM::GEOM_List_ptr thePoints,
+ CORBA::Boolean theIsClosed)
{
+ beginService( " GEOM_Superv_i::MakePolyline" );
MESSAGE("GEOM_Superv_i::MakePolyline");
- if (GEOM_List_i<GEOM::ListOfGO>* aListImplP =
+ if (GEOM_List_i<GEOM::ListOfGO>* aListImplP =
dynamic_cast<GEOM_List_i<GEOM::ListOfGO>*>(GetServant(thePoints, myPOA).in())) {
getCurvesOp();
- return myCurvesOp->MakePolyline(aListImplP->GetList());
+ GEOM::GEOM_Object_ptr anObj = myCurvesOp->MakePolyline(aListImplP->GetList(), theIsClosed);
+ endService( " GEOM_Superv_i::MakePolyline" );
+ return anObj;
}
+ endService( " GEOM_Superv_i::MakePolyline" );
return NULL;
}
//=============================================================================
// MakeSplineBezier:
//=============================================================================
-GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeSplineBezier (GEOM::GEOM_List_ptr thePoints)
+GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeSplineBezier (GEOM::GEOM_List_ptr thePoints,
+ CORBA::Boolean theIsClosed)
{
+ beginService( " GEOM_Superv_i::MakeSplineBezier" );
MESSAGE("GEOM_Superv_i::MakeSplineBezier");
- if (GEOM_List_i<GEOM::ListOfGO>* aListImplP =
+ if (GEOM_List_i<GEOM::ListOfGO>* aListImplP =
dynamic_cast<GEOM_List_i<GEOM::ListOfGO>*>(GetServant(thePoints, myPOA).in())) {
getCurvesOp();
- return myCurvesOp->MakeSplineBezier(aListImplP->GetList());
+ GEOM::GEOM_Object_ptr anObj = myCurvesOp->MakeSplineBezier(aListImplP->GetList(), theIsClosed);
+ endService( " GEOM_Superv_i::MakeSplineBezier" );
+ return anObj;
}
+ endService( " GEOM_Superv_i::MakeSplineBezier" );
return NULL;
}
//=============================================================================
// MakeSplineInterpolation:
//=============================================================================
-GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeSplineInterpolation (GEOM::GEOM_List_ptr thePoints)
+GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeSplineInterpolation (GEOM::GEOM_List_ptr thePoints,
+ CORBA::Boolean theIsClosed,
+ CORBA::Boolean theDoReordering)
{
+ beginService( " GEOM_Superv_i::MakeSplineInterpolation" );
MESSAGE("GEOM_Superv_i::MakeSplineInterpolation");
- if (GEOM_List_i<GEOM::ListOfGO>* aListImplP =
+ if (GEOM_List_i<GEOM::ListOfGO>* aListImplP =
dynamic_cast<GEOM_List_i<GEOM::ListOfGO>*>(GetServant(thePoints, myPOA).in())) {
getCurvesOp();
- return myCurvesOp->MakeSplineInterpolation(aListImplP->GetList());
+ GEOM::GEOM_Object_ptr anObj = myCurvesOp->MakeSplineInterpolation(aListImplP->GetList(), theIsClosed, theDoReordering);
+ endService( " GEOM_Superv_i::MakeSplineInterpolation" );
+ return anObj;
}
+ endService( " GEOM_Superv_i::MakeSplineInterpolation" );
return NULL;
}
//=============================================================================
// MakeSketcher:
//=============================================================================
-GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeSketcher (const char* theCommand,
- GEOM::GEOM_List_ptr theWorkingPlane)
+GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeSketcher (const char* theCommand,
+ GEOM::GEOM_List_ptr theWorkingPlane)
{
+ beginService( " GEOM_Superv_i::MakeSketcher" );
MESSAGE("GEOM_Superv_i::MakeSketcher");
- if (GEOM_List_i<GEOM::ListOfDouble>* aListImplWP =
+ if (GEOM_List_i<GEOM::ListOfDouble>* aListImplWP =
dynamic_cast<GEOM_List_i<GEOM::ListOfDouble>*>(GetServant(theWorkingPlane, myPOA).in())) {
getCurvesOp();
- return myCurvesOp->MakeSketcher(theCommand, aListImplWP->GetList());
+ GEOM::GEOM_Object_ptr anObj = myCurvesOp->MakeSketcher(theCommand, aListImplWP->GetList());
+ endService( " GEOM_Superv_i::MakeSketcher" );
+ return anObj;
}
+ endService( " GEOM_Superv_i::MakeSketcher" );
+ return NULL;
+}
+
+//=============================================================================
+// Make3DSketcher:
+//=============================================================================
+GEOM::GEOM_Object_ptr GEOM_Superv_i::Make3DSketcher ( GEOM::GEOM_List_ptr theCoordinates)
+{
+ beginService( " GEOM_Superv_i::Make3DSketcher" );
+ MESSAGE("GEOM_Superv_i::Make3DSketcher");
+ if (GEOM_List_i<GEOM::ListOfDouble>* aListImpl =
+ dynamic_cast<GEOM_List_i<GEOM::ListOfDouble>*>(GetServant(theCoordinates, myPOA).in())) {
+ getCurvesOp();
+ GEOM::GEOM_Object_ptr anObj = myCurvesOp->Make3DSketcher(aListImpl->GetList());
+ endService( " GEOM_Superv_i::Make3DSketcher" );
+ return anObj;
+ }
+ endService( " GEOM_Superv_i::Make3DSketcher" );
return NULL;
}
// MakeFilletAll:
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeFilletAll (GEOM::GEOM_Object_ptr theShape,
- CORBA::Double theR)
+ CORBA::Double theR)
{
+ beginService( " GEOM_Superv_i::MakeFilletAll" );
MESSAGE("GEOM_Superv_i::MakeFilletAllMakeSketcher");
getLocalOp();
- return myLocalOp->MakeFilletAll(theShape, theR);
+ GEOM::GEOM_Object_ptr anObj = myLocalOp->MakeFilletAll(theShape, theR);
+ endService( " GEOM_Superv_i::MakeFilletAll" );
+ return anObj;
}
//=============================================================================
// MakeFilletEdges:
//=============================================================================
-GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeFilletEdges (GEOM::GEOM_Object_ptr theShape,
- CORBA::Double theR,
- GEOM::GEOM_List_ptr theEdges)
+GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeFilletEdges (GEOM::GEOM_Object_ptr theShape,
+ CORBA::Double theR,
+ GEOM::GEOM_List_ptr theEdges)
{
+ beginService( " GEOM_Superv_i::MakeFilletEdges" );
MESSAGE("GEOM_Superv_i::MakeFilletEdges");
- if (GEOM_List_i<GEOM::ListOfLong>* aListImplE =
+ if (GEOM_List_i<GEOM::ListOfLong>* aListImplE =
dynamic_cast<GEOM_List_i<GEOM::ListOfLong>*>(GetServant(theEdges, myPOA).in())) {
getLocalOp();
- return myLocalOp->MakeFilletEdges(theShape, theR, aListImplE->GetList());
+ GEOM::GEOM_Object_ptr anObj = myLocalOp->MakeFilletEdges(theShape, theR, aListImplE->GetList());
+ endService( " GEOM_Superv_i::MakeFilletEdges" );
+ return anObj;
}
+ endService( " GEOM_Superv_i::MakeFilletEdges" );
+ return NULL;
+}
+
+//=============================================================================
+// MakeFilletEdges R1 R2:
+//=============================================================================
+GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeFilletEdgesR1R2 (GEOM::GEOM_Object_ptr theShape,
+ CORBA::Double theR1,
+ CORBA::Double theR2,
+ GEOM::GEOM_List_ptr theEdges)
+{
+ beginService( " GEOM_Superv_i::MakeFilletEdgesR1R2" );
+ MESSAGE("GEOM_Superv_i::MakeFilletEdgesR1R2");
+ if (GEOM_List_i<GEOM::ListOfLong>* aListImplE =
+ dynamic_cast<GEOM_List_i<GEOM::ListOfLong>*>(GetServant(theEdges, myPOA).in())) {
+ getLocalOp();
+ GEOM::GEOM_Object_ptr anObj = myLocalOp->MakeFilletEdgesR1R2(theShape, theR1,
+ theR2, aListImplE->GetList());
+ endService( " GEOM_Superv_i::MakeFilletEdgesR1R2" );
+ return anObj;
+ }
+ endService( " GEOM_Superv_i::MakeFilletEdgesR1R2" );
return NULL;
}
//=============================================================================
// MakeFilletFaces:
//=============================================================================
-GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeFilletFaces (GEOM::GEOM_Object_ptr theShape,
- CORBA::Double theR,
- GEOM::GEOM_List_ptr theFaces)
+GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeFilletFaces (GEOM::GEOM_Object_ptr theShape,
+ CORBA::Double theR,
+ GEOM::GEOM_List_ptr theFaces)
{
+ beginService( " GEOM_Superv_i::MakeFilletFaces" );
MESSAGE("GEOM_Superv_i::MakeFilletFaces");
- if (GEOM_List_i<GEOM::ListOfLong>* aListImplF =
+ if (GEOM_List_i<GEOM::ListOfLong>* aListImplF =
dynamic_cast<GEOM_List_i<GEOM::ListOfLong>*>(GetServant(theFaces, myPOA).in())) {
getLocalOp();
- return myLocalOp->MakeFilletFaces(theShape, theR, aListImplF->GetList());
+ GEOM::GEOM_Object_ptr anObj = myLocalOp->MakeFilletFaces(theShape, theR, aListImplF->GetList());
+ endService( " GEOM_Superv_i::MakeFilletFaces" );
+ return anObj;
+ }
+ endService( " GEOM_Superv_i::MakeFilletFaces" );
+ return NULL;
+}
+
+//=============================================================================
+// MakeFilletFaces R1 R2:
+//=============================================================================
+GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeFilletFacesR1R2 (GEOM::GEOM_Object_ptr theShape,
+ CORBA::Double theR1,
+ CORBA::Double theR2,
+ GEOM::GEOM_List_ptr theFaces)
+{
+ beginService( " GEOM_Superv_i::MakeFilletFacesR1R2" );
+ MESSAGE("GEOM_Superv_i::MakeFilletFacesR1R2");
+ if (GEOM_List_i<GEOM::ListOfLong>* aListImplF =
+ dynamic_cast<GEOM_List_i<GEOM::ListOfLong>*>(GetServant(theFaces, myPOA).in())) {
+ getLocalOp();
+ GEOM::GEOM_Object_ptr anObj = myLocalOp->MakeFilletFacesR1R2(theShape, theR1, theR2,
+ aListImplF->GetList());
+ endService( " GEOM_Superv_i::MakeFilletFacesR1R2" );
+ return anObj;
+ }
+ endService( " GEOM_Superv_i::MakeFilletFacesR1R2" );
+ return NULL;
+}
+
+//=============================================================================
+// MakeFillet2D:
+//=============================================================================
+GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeFillet2D (GEOM::GEOM_Object_ptr theShape,
+ CORBA::Double theR,
+ GEOM::GEOM_List_ptr theVertexes)
+{
+ beginService( " GEOM_Superv_i::MakeFillet2D" );
+ MESSAGE("GEOM_Superv_i::MakeFillet2D");
+ if (GEOM_List_i<GEOM::ListOfLong>* aListImplV =
+ dynamic_cast<GEOM_List_i<GEOM::ListOfLong>*>(GetServant(theVertexes, myPOA).in())) {
+ getLocalOp();
+ GEOM::GEOM_Object_ptr anObj = myLocalOp->MakeFillet2D(theShape, theR, aListImplV->GetList());
+ endService( " GEOM_Superv_i::MakeFillet2D" );
+ return anObj;
+ }
+ endService( " GEOM_Superv_i::MakeFillet2D" );
+ return NULL;
+}
+
+//=============================================================================
+// MakeFillet1D:
+//=============================================================================
+GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeFillet1D (GEOM::GEOM_Object_ptr theShape,
+ CORBA::Double theR,
+ GEOM::GEOM_List_ptr theVertexes,
+ CORBA::Boolean doIgnoreSecantVertices)
+{
+ beginService( " GEOM_Superv_i::MakeFillet1D" );
+ MESSAGE("GEOM_Superv_i::MakeFillet1D");
+ if (GEOM_List_i<GEOM::ListOfLong>* aListImplV =
+ dynamic_cast<GEOM_List_i<GEOM::ListOfLong>*>(GetServant(theVertexes, myPOA).in())) {
+ getLocalOp();
+ GEOM::GEOM_Object_ptr anObj = myLocalOp->MakeFillet1D
+ (theShape, theR, aListImplV->GetList(), doIgnoreSecantVertices);
+ endService( " GEOM_Superv_i::MakeFillet1D" );
+ return anObj;
}
+ endService( " GEOM_Superv_i::MakeFillet1D" );
return NULL;
}
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeChamferAll (GEOM::GEOM_Object_ptr theShape, CORBA::Double theD)
{
+ beginService( " GEOM_Superv_i::MakeChamferAll" );
MESSAGE("GEOM_Superv_i::MakeChamferAll");
getLocalOp();
- return myLocalOp->MakeChamferAll(theShape, theD);
+ GEOM::GEOM_Object_ptr anObj = myLocalOp->MakeChamferAll(theShape, theD);
+ endService( " GEOM_Superv_i::MakeChamferAll" );
+ return anObj;
}
-
+
//=============================================================================
// MakeChamferEdge:
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_Superv_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)
{
+ beginService( " GEOM_Superv_i::MakeChamferEdge" );
MESSAGE("GEOM_Superv_i::MakeChamferEdge");
getLocalOp();
- return myLocalOp->MakeChamferEdge(theShape, theD1, theD2, theFace1, theFace2);
+ GEOM::GEOM_Object_ptr anObj = myLocalOp->MakeChamferEdge(theShape, theD1, theD2, theFace1, theFace2);
+ endService( " GEOM_Superv_i::MakeChamferEdge" );
+ return anObj;
+}
+
+//=============================================================================
+// MakeChamferEdgeAD:
+//=============================================================================
+GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeChamferEdgeAD (GEOM::GEOM_Object_ptr theShape,
+ CORBA::Double theD, CORBA::Double theAngle,
+ CORBA::Long theFace1, CORBA::Long theFace2)
+{
+ beginService( " GEOM_Superv_i::MakeChamferEdgeAD" );
+ MESSAGE("GEOM_Superv_i::MakeChamferEdgeAD");
+ getLocalOp();
+ GEOM::GEOM_Object_ptr anObj = myLocalOp->MakeChamferEdgeAD(theShape, theD, theAngle, theFace1, theFace2);
+ endService( " GEOM_Superv_i::MakeChamferEdgeAD" );
+ return anObj;
}
//=============================================================================
// MakeChamferFaces:
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeChamferFaces (GEOM::GEOM_Object_ptr theShape,
- CORBA::Double theD1, CORBA::Double theD2,
- GEOM::GEOM_List_ptr theFaces)
+ CORBA::Double theD1, CORBA::Double theD2,
+ GEOM::GEOM_List_ptr theFaces)
{
+ beginService( " GEOM_Superv_i::MakeChamferFaces" );
MESSAGE("GEOM_Superv_i::MakeChamferFaces");
- if (GEOM_List_i<GEOM::ListOfLong>* aListImplF =
+ if (GEOM_List_i<GEOM::ListOfLong>* aListImplF =
dynamic_cast<GEOM_List_i<GEOM::ListOfLong>*>(GetServant(theFaces, myPOA).in())) {
getLocalOp();
- return myLocalOp->MakeChamferFaces(theShape, theD1, theD2, aListImplF->GetList());
+ GEOM::GEOM_Object_ptr anObj = myLocalOp->MakeChamferFaces(theShape, theD1, theD2, aListImplF->GetList());
+ endService( " GEOM_Superv_i::MakeChamferFaces" );
+ return anObj;
+ }
+ endService( " GEOM_Superv_i::MakeChamferFaces" );
+ return NULL;
+}
+
+//=============================================================================
+// MakeChamferFacesAD:
+//=============================================================================
+GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeChamferFacesAD (GEOM::GEOM_Object_ptr theShape,
+ CORBA::Double theD, CORBA::Double theAngle,
+ GEOM::GEOM_List_ptr theFaces)
+{
+ beginService( " GEOM_Superv_i::MakeChamferFacesAD" );
+ MESSAGE("GEOM_Superv_i::MakeChamferFacesAD");
+ if (GEOM_List_i<GEOM::ListOfLong>* aListImplF =
+ dynamic_cast<GEOM_List_i<GEOM::ListOfLong>*>(GetServant(theFaces, myPOA).in())) {
+ getLocalOp();
+ GEOM::GEOM_Object_ptr anObj = myLocalOp->MakeChamferFacesAD(theShape, theD, theAngle, aListImplF->GetList());
+ endService( " GEOM_Superv_i::MakeChamferFacesAD" );
+ return anObj;
+ }
+ endService( " GEOM_Superv_i::MakeChamferFacesAD" );
+ return NULL;
+}
+
+//=============================================================================
+// MakeChamferEdges:
+//=============================================================================
+GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeChamferEdges (GEOM::GEOM_Object_ptr theShape,
+ CORBA::Double theD1, CORBA::Double theD2,
+ GEOM::GEOM_List_ptr theEdges)
+{
+ beginService( " GEOM_Superv_i::MakeChamferEdges" );
+ MESSAGE("GEOM_Superv_i::MakeChamferEdges");
+ if (GEOM_List_i<GEOM::ListOfLong>* aListImplF =
+ dynamic_cast<GEOM_List_i<GEOM::ListOfLong>*>(GetServant(theEdges, myPOA).in())) {
+ getLocalOp();
+ GEOM::GEOM_Object_ptr anObj = myLocalOp->MakeChamferEdges(theShape, theD1, theD2, aListImplF->GetList());
+ endService( " GEOM_Superv_i::MakeChamferEdges" );
+ return anObj;
}
+ endService( " GEOM_Superv_i::MakeChamferEdges" );
+ return NULL;
+}
+
+//=============================================================================
+// MakeChamferEdgesAD:
+//=============================================================================
+GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeChamferEdgesAD (GEOM::GEOM_Object_ptr theShape,
+ CORBA::Double theD, CORBA::Double theAngle,
+ GEOM::GEOM_List_ptr theEdges)
+{
+ beginService( " GEOM_Superv_i::MakeChamferEdgesAD" );
+ MESSAGE("GEOM_Superv_i::MakeChamferEdgesAD");
+ if (GEOM_List_i<GEOM::ListOfLong>* aListImplF =
+ dynamic_cast<GEOM_List_i<GEOM::ListOfLong>*>(GetServant(theEdges, myPOA).in())) {
+ getLocalOp();
+ GEOM::GEOM_Object_ptr anObj = myLocalOp->MakeChamferEdgesAD(theShape, theD, theAngle, aListImplF->GetList());
+ endService( " GEOM_Superv_i::MakeChamferEdgesAD" );
+ return anObj;
+ }
+ endService( " GEOM_Superv_i::MakeChamferEdgesAD" );
return NULL;
}
// MakeArchimede:
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_Superv_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)
{
+ beginService( " GEOM_Superv_i::MakeArchimede" );
MESSAGE("GEOM_Superv_i::MakeArchimede");
getLocalOp();
- return myLocalOp->MakeArchimede(theShape, theWeight, theWaterDensity, theMeshingDeflection);
+ GEOM::GEOM_Object_ptr anObj = myLocalOp->MakeArchimede(theShape, theWeight, theWaterDensity, theMeshingDeflection);
+ endService( " GEOM_Superv_i::MakeArchimede" );
+ return anObj;
}
//=============================================================================
// GetSubShapeIndexMakeFilletAll:
//=============================================================================
CORBA::Long GEOM_Superv_i::GetSubShapeIndex (GEOM::GEOM_Object_ptr theShape,
- GEOM::GEOM_Object_ptr theSubShape)
+ GEOM::GEOM_Object_ptr theSubShape)
{
+ beginService( " GEOM_Superv_i::GetSubShapeIndex" );
MESSAGE("GEOM_Superv_i::GetSubShapeIndexMakeArchimede");
getLocalOp();
- return myLocalOp->GetSubShapeIndex(theShape, theSubShape);
+ CORBA::Long aRes = myLocalOp->GetSubShapeIndex(theShape, theSubShape);
+ endService( " GEOM_Superv_i::GetSubShapeIndex" );
+ return aRes;
}
//=============================== GroupOperations =============================
//=============================================================================
// CreateGroup:
//=============================================================================
-GEOM::GEOM_Object_ptr GEOM_Superv_i::CreateGroup (GEOM::GEOM_Object_ptr theMainShape,
- CORBA::Long theShapeType)
+GEOM::GEOM_Object_ptr GEOM_Superv_i::CreateGroup (GEOM::GEOM_Object_ptr theMainShape,
+ CORBA::Long theShapeType)
{
+ beginService( " GEOM_Superv_i::CreateGroup" );
MESSAGE("GEOM_Superv_i::CreateGroup");
getGroupOp();
- return myGroupOp->CreateGroup(theMainShape, theShapeType);
+ GEOM::GEOM_Object_ptr anObj = myGroupOp->CreateGroup(theMainShape, theShapeType);
+ endService( " GEOM_Superv_i::CreateGroup" );
+ return anObj;
}
//=============================================================================
// AddObject:
//=============================================================================
-void GEOM_Superv_i::AddObject (GEOM::GEOM_Object_ptr theGroup,
- CORBA::Long theSubShapeId)
+void GEOM_Superv_i::AddObject (GEOM::GEOM_Object_ptr theGroup,
+ CORBA::Long theSubShapeId)
{
+ beginService( " GEOM_Superv_i::AddObject" );
MESSAGE("GEOM_Superv_i::AddObject");
getGroupOp();
myGroupOp->AddObject(theGroup, theSubShapeId);
+ endService( " GEOM_Superv_i::AddObject" );
}
//=============================================================================
// RemoveObject:
//=============================================================================
-void GEOM_Superv_i::RemoveObject (GEOM::GEOM_Object_ptr theGroup,
- CORBA::Long theSubShapeId)
+void GEOM_Superv_i::RemoveObject (GEOM::GEOM_Object_ptr theGroup,
+ CORBA::Long theSubShapeId)
{
+ beginService( " GEOM_Superv_i::RemoveObject" );
MESSAGE("GEOM_Superv_i::RemoveObject");
getGroupOp();
myGroupOp->RemoveObject(theGroup, theSubShapeId);
+ endService( " GEOM_Superv_i::RemoveObject" );
}
//=============================================================================
//=============================================================================
CORBA::Long GEOM_Superv_i::GetType (GEOM::GEOM_Object_ptr theGroup)
{
+ beginService( " GEOM_Superv_i::GetType" );
MESSAGE("GEOM_Superv_i::GetType");
getGroupOp();
- return myGroupOp->GetType(theGroup);
+ CORBA::Long aResult = myGroupOp->GetType(theGroup);
+ endService( " GEOM_Superv_i::GetType" );
+ return aResult;
}
//=============================================================================
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_Superv_i::GetMainShape (GEOM::GEOM_Object_ptr theGroup)
{
+ beginService( " GEOM_Superv_i::GetMainShape" );
MESSAGE("GEOM_Superv_i::GetMainShape");
getGroupOp();
- return myGroupOp->GetMainShape(theGroup);
+ GEOM::GEOM_Object_ptr anObj = myGroupOp->GetMainShape(theGroup);
+ endService( " GEOM_Superv_i::GetMainShape" );
+ return anObj;
}
//=============================================================================
//=============================================================================
GEOM::GEOM_List_ptr GEOM_Superv_i::GetObjects (GEOM::GEOM_Object_ptr theGroup)
{
+ beginService( " GEOM_Superv_i::GetObjects" );
MESSAGE("GEOM_Superv_i::GetObjects");
getGroupOp();
GEOM::ListOfLong* aList = myGroupOp->GetObjects(theGroup);
GEOM_List_i<GEOM::ListOfLong>* aListPtr = new GEOM_List_i<GEOM::ListOfLong>(*(aList));
MESSAGE(" List of "<<aListPtr->GetList().length()<<" element(s)");
+ endService( " GEOM_Superv_i::GetObjects" );
return aListPtr->_this();
}
+//=============================== Import/Export Operations =============================
+//=============================================================================
+// Export STL
+//=============================================================================
+void GEOM_Superv_i::ExportSTL( GEOM::GEOM_Object_ptr theObject,
+ const char* theFileName,
+ const bool theIsASCII,
+ CORBA::Double theDeflection,
+ const bool theIsRelative )
+{
+ beginService( " GEOM_Superv_i::ExportSTL" );
+ MESSAGE("GEOM_Superv_i::ExportSTL");
+ getSTLPluginOp();
+ mySTLOp->ExportSTL( theObject, theFileName, theIsASCII, theDeflection, theIsRelative );
+ endService( " GEOM_Superv_i::ExportSTL" );
+}
+
+//=============================================================================
+// Import STL
+//=============================================================================
+GEOM::GEOM_Object_ptr GEOM_Superv_i::ImportSTL( const char* theFileName )
+{
+ beginService( " GEOM_Superv_i::ImportSTL" );
+ MESSAGE("GEOM_Superv_i::ImportSTL");
+ getSTLPluginOp();
+ GEOM::ListOfGO* aSeq = mySTLOp->ImportSTL(theFileName );
+ GEOM::GEOM_Object_var anObj;
+
+ if (aSeq->length() > 0) {
+ anObj = aSeq->operator[](0);
+ }
+
+ endService( " GEOM_Superv_i::ImportSTL" );
+ return anObj._retn();
+}
+
+//=============================================================================
+// Export BREP
+//=============================================================================
+void GEOM_Superv_i::ExportBREP( GEOM::GEOM_Object_ptr theObject,
+ const char* theFileName )
+{
+ beginService( " GEOM_Superv_i::ExportBREP" );
+ MESSAGE("GEOM_Superv_i::ExportBREP");
+ getBREPPluginOp();
+ myBREPOp->ExportBREP( theObject, theFileName );
+ endService( " GEOM_Superv_i::ExportBREP" );
+}
+
+//=============================================================================
+// Import BREP
+//=============================================================================
+GEOM::GEOM_Object_ptr GEOM_Superv_i::ImportBREP( const char* theFileName )
+{
+ beginService( " GEOM_Superv_i::ImportBREP" );
+ MESSAGE("GEOM_Superv_i::ImportBREP");
+ getBREPPluginOp();
+ GEOM::ListOfGO* aSeq = myBREPOp->ImportBREP(theFileName );
+ GEOM::GEOM_Object_var anObj;
+
+ if (aSeq->length() > 0) {
+ anObj = aSeq->operator[](0);
+ }
+
+ endService( " GEOM_Superv_i::ImportBREP" );
+ return anObj._retn();
+}
+
+//=============================================================================
+// Export STEP
+//=============================================================================
+void GEOM_Superv_i::ExportSTEP( GEOM::GEOM_Object_ptr theObject,
+ const char* theFileName )
+{
+ beginService( " GEOM_Superv_i::ExportSTEP" );
+ MESSAGE("GEOM_Superv_i::ExportSTEP");
+ getSTEPPluginOp();
+
+ const GEOM::length_unit aUnit = GEOM::LU_METER;
+
+ mySTEPOp->ExportSTEP( theObject, theFileName, aUnit );
+ endService( " GEOM_Superv_i::ExportSTEP" );
+}
+
+//=============================================================================
+// Import STEP
+//=============================================================================
+GEOM::GEOM_Object_ptr GEOM_Superv_i::ImportSTEP( const char* theFileName,
+ const bool theIsIgnoreUnits )
+{
+ beginService( " GEOM_Superv_i::ImportSTEP" );
+ MESSAGE("GEOM_Superv_i::ImportSTEP");
+ getSTEPPluginOp();
+ GEOM::ListOfGO* aSeq = mySTEPOp->ImportSTEP(theFileName, theIsIgnoreUnits, false );
+ GEOM::GEOM_Object_var anObj;
+
+ if (aSeq->length() > 0) {
+ anObj = aSeq->operator[](0);
+ }
+
+ endService( " GEOM_Superv_i::ImportSTEP" );
+ return anObj._retn();
+}
+
+//=============================================================================
+// Export IGES
+//=============================================================================
+void GEOM_Superv_i::ExportIGES( GEOM::GEOM_Object_ptr theObject,
+ const char* theFileName,
+ const char* theVersion )
+{
+ beginService( " GEOM_Superv_i::ExportIGES" );
+ MESSAGE("GEOM_Superv_i::ExportIGES");
+ getIGESPluginOp();
+ myIGESOp->ExportIGES( theObject, theFileName, theVersion );
+ endService( " GEOM_Superv_i::ExportIGES" );
+}
+
+//=============================================================================
+// Import IGES
+//=============================================================================
+GEOM::GEOM_Object_ptr GEOM_Superv_i::ImportIGES( const char* theFileName,
+ const bool theIsIgnoreUnits )
+{
+ beginService( " GEOM_Superv_i::ImportIGES" );
+ MESSAGE("GEOM_Superv_i::ImportIGES");
+ getIGESPluginOp();
+ GEOM::ListOfGO* aSeq = myIGESOp->ImportIGES(theFileName, theIsIgnoreUnits );
+ GEOM::GEOM_Object_var anObj;
+
+ if (aSeq->length() > 0) {
+ anObj = aSeq->operator[](0);
+ }
+
+ endService( " GEOM_Superv_i::ImportIGES" );
+ return anObj._retn();
+}
+
+//=============================================================================
+// Export XAO
+//=============================================================================
+CORBA::Boolean GEOM_Superv_i::ExportXAO( GEOM::GEOM_Object_ptr shape,
+ const GEOM::ListOfGO& groups,
+ const GEOM::ListOfFields& fields,
+ const char* author,
+ const char* fileName,
+ const char* shapeFileName )
+{
+ beginService( " GEOM_Superv_i::ExportXAO" );
+ MESSAGE("GEOM_Superv_i::ExportXAO");
+ getXAOPluginOp();
+ CORBA::Boolean isGood = myXAOOp->ExportXAO( shape, groups, fields, author, fileName, shapeFileName );
+ endService( " GEOM_Superv_i::ExportXAO" );
+ return isGood;
+}
+
+//=============================================================================
+// Import XAO
+//=============================================================================
+CORBA::Boolean GEOM_Superv_i::ImportXAO( const char* /*fileName*/,
+ GEOM::GEOM_Object_out /*shape*/,
+ GEOM::ListOfGO_out /*subShapes*/,
+ GEOM::ListOfGO_out /*groups*/,
+ GEOM::ListOfFields_out /*fields*/ )
+{
+ return false;
+}
+
+
+//=============================================================================
+// Export VTK
+//=============================================================================
+void GEOM_Superv_i::ExportVTK( GEOM::GEOM_Object_ptr theObject,
+ const char* theFileName,
+ CORBA::Double theDeflection )
+{
+ #ifdef WITH_VTK
+ beginService( " GEOM_Superv_i::ExportVTK" );
+ MESSAGE("GEOM_Superv_i::ExportVTK");
+ getVTKPluginOp();
+ myVTKOp->ExportVTK( theObject, theFileName, theDeflection );
+ endService( " GEOM_Superv_i::ExportVTK" );
+#else
+ std::string message("GEOM_Superv_i::ExportVTK functionality is unavailable");
+ THROW_SALOME_CORBA_EXCEPTION(message.c_str(), SALOME::INTERNAL_ERROR);
+#endif
+}
+
+//=============================== Advanced Operations =============================
+//=============================================================================
+// MakePipeTShape
+//=============================================================================
+GEOM::GEOM_List_ptr GEOM_Superv_i::MakePipeTShape
+ (CORBA::Double theR1, CORBA::Double theW1, CORBA::Double theL1,
+ CORBA::Double theR2, CORBA::Double theW2, CORBA::Double theL2,
+ CORBA::Boolean theHexMesh)
+{
+ beginService( " GEOM_Superv_i::MakePipeTShape" );
+ MESSAGE("GEOM_Superv_i::MakePipeTShape");
+ getAdvancedOp();
+
+ GEOM::ListOfGO* aSeq = myAdvancedOp->MakePipeTShape(theR1, theW1, theL1, theR2, theW2, theL2, theHexMesh);
+ GEOM_List_i<GEOM::ListOfGO>* aSeqPtr = new GEOM_List_i<GEOM::ListOfGO>(*(aSeq));
+ MESSAGE(" List of "<<aSeqPtr->GetList().length()<<" element(s)");
+ endService( " GEOM_Superv_i::MakePipeTShape" );
+ return aSeqPtr->_this();
+}
+
+//=============================================================================
+// MakePipeTShapeWithPosition
+//=============================================================================
+GEOM::GEOM_List_ptr GEOM_Superv_i::MakePipeTShapeWithPosition
+ (CORBA::Double theR1, CORBA::Double theW1, CORBA::Double theL1,
+ CORBA::Double theR2, CORBA::Double theW2, CORBA::Double theL2, CORBA::Boolean theHexMesh,
+ GEOM::GEOM_Object_ptr theP1, GEOM::GEOM_Object_ptr theP2, GEOM::GEOM_Object_ptr theP3)
+{
+ beginService( " GEOM_Superv_i::MakePipeTShapeWithPosition" );
+ MESSAGE("GEOM_Superv_i::MakePipeTShapeWithPosition");
+ getAdvancedOp();
+
+ GEOM::ListOfGO* aSeq = myAdvancedOp->MakePipeTShapeWithPosition(theR1, theW1, theL1, theR2, theW2, theL2, theHexMesh, theP1, theP2, theP3);
+ GEOM_List_i<GEOM::ListOfGO>* aSeqPtr = new GEOM_List_i<GEOM::ListOfGO>(*(aSeq));
+ MESSAGE(" List of "<<aSeqPtr->GetList().length()<<" element(s)");
+ endService( " GEOM_Superv_i::MakePipeTShapeWithPosition" );
+ return aSeqPtr->_this();
+}
+
+//=============================================================================
+// MakePipeTShapeChamfer
+//=============================================================================
+GEOM::GEOM_List_ptr GEOM_Superv_i::MakePipeTShapeChamfer
+ (CORBA::Double theR1, CORBA::Double theW1, CORBA::Double theL1,
+ CORBA::Double theR2, CORBA::Double theW2, CORBA::Double theL2,
+ CORBA::Double theH, CORBA::Double theW, CORBA::Boolean theHexMesh)
+{
+ beginService( " GEOM_Superv_i::MakePipeTShapeChamfer" );
+ MESSAGE("GEOM_Superv_i::MakePipeTShapeChamfer");
+ getAdvancedOp();
+
+ GEOM::ListOfGO* aSeq = myAdvancedOp->MakePipeTShapeChamfer(theR1, theW1, theL1, theR2, theW2, theL2, theH, theW, theHexMesh);
+ GEOM_List_i<GEOM::ListOfGO>* aSeqPtr = new GEOM_List_i<GEOM::ListOfGO>(*(aSeq));
+ MESSAGE(" List of "<<aSeqPtr->GetList().length()<<" element(s)");
+ endService( " GEOM_Superv_i::MakePipeTShapeChamfer" );
+ return aSeqPtr->_this();
+}
+
+//=============================================================================
+// MakePipeTShapeChamferWithPosition
+//=============================================================================
+GEOM::GEOM_List_ptr GEOM_Superv_i::MakePipeTShapeChamferWithPosition
+ (CORBA::Double theR1, CORBA::Double theW1, CORBA::Double theL1,
+ CORBA::Double theR2, CORBA::Double theW2, CORBA::Double theL2,
+ CORBA::Double theH, CORBA::Double theW, CORBA::Boolean theHexMesh,
+ GEOM::GEOM_Object_ptr theP1, GEOM::GEOM_Object_ptr theP2, GEOM::GEOM_Object_ptr theP3)
+{
+ beginService( " GEOM_Superv_i::MakePipeTShapeChamferWithPosition" );
+ MESSAGE("GEOM_Superv_i::MakePipeTShapeChamferWithPosition");
+ getAdvancedOp();
+
+ GEOM::ListOfGO* aSeq = myAdvancedOp->MakePipeTShapeChamferWithPosition(theR1, theW1, theL1, theR2, theW2, theL2, theH, theW, theHexMesh, theP1, theP2, theP3);
+ GEOM_List_i<GEOM::ListOfGO>* aSeqPtr = new GEOM_List_i<GEOM::ListOfGO>(*(aSeq));
+ MESSAGE(" List of "<<aSeqPtr->GetList().length()<<" element(s)");
+ endService( " GEOM_Superv_i::MakePipeTShapeChamferWithPosition" );
+ return aSeqPtr->_this();
+}
+
+//=============================================================================
+// MakePipeTShapeFillet
+//=============================================================================
+GEOM::GEOM_List_ptr GEOM_Superv_i::MakePipeTShapeFillet
+ (CORBA::Double theR1, CORBA::Double theW1, CORBA::Double theL1,
+ CORBA::Double theR2, CORBA::Double theW2, CORBA::Double theL2,
+ CORBA::Double theRF, CORBA::Boolean theHexMesh)
+{
+ beginService( " GEOM_Superv_i::MakePipeTShapeFillet" );
+ MESSAGE("GEOM_Superv_i::MakePipeTShapeFillet");
+ getAdvancedOp();
+
+ GEOM::ListOfGO* aSeq = myAdvancedOp->MakePipeTShapeFillet(theR1, theW1, theL1, theR2, theW2, theL2, theRF, theHexMesh);
+ GEOM_List_i<GEOM::ListOfGO>* aSeqPtr = new GEOM_List_i<GEOM::ListOfGO>(*(aSeq));
+ MESSAGE(" List of "<<aSeqPtr->GetList().length()<<" element(s)");
+ endService( " GEOM_Superv_i::MakePipeTShapeFillet" );
+ return aSeqPtr->_this();
+}
+
+//=============================================================================
+// MakePipeTShapeFilletWithPosition
+//=============================================================================
+GEOM::GEOM_List_ptr GEOM_Superv_i::MakePipeTShapeFilletWithPosition
+ (CORBA::Double theR1, CORBA::Double theW1, CORBA::Double theL1,
+ CORBA::Double theR2, CORBA::Double theW2, CORBA::Double theL2,
+ CORBA::Double theRF, CORBA::Boolean theHexMesh,
+ GEOM::GEOM_Object_ptr theP1, GEOM::GEOM_Object_ptr theP2, GEOM::GEOM_Object_ptr theP3)
+{
+ beginService( " GEOM_Superv_i::MakePipeTShapeFilletWithPosition" );
+ MESSAGE("GEOM_Superv_i::MakePipeTShapeFilletWithPosition");
+ getAdvancedOp();
+
+ GEOM::ListOfGO* aSeq = myAdvancedOp->MakePipeTShapeFilletWithPosition(theR1, theW1, theL1, theR2, theW2, theL2, theRF, theHexMesh, theP1, theP2, theP3);
+ GEOM_List_i<GEOM::ListOfGO>* aSeqPtr = new GEOM_List_i<GEOM::ListOfGO>(*(aSeq));
+ MESSAGE(" List of "<<aSeqPtr->GetList().length()<<" element(s)");
+ endService( " GEOM_Superv_i::MakePipeTShapeFilletWithPosition" );
+ return aSeqPtr->_this();
+}
+
+//=============================================================================
+// MakeDividedDisk
+//=============================================================================
+GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeDividedDisk (CORBA::Double theR, CORBA::Double theRatio,
+ CORBA::Short theOrientation, GEOM::pattern thePattern)
+{
+ beginService( " GEOM_Superv_i::MakeDividedDisk" );
+ MESSAGE("GEOM_Superv_i::MakeDividedDisk");
+ getAdvancedOp();
+ GEOM::GEOM_Object_ptr anObj = myAdvancedOp->MakeDividedDisk(theR, theRatio, theOrientation, thePattern);
+ endService( " GEOM_Superv_i::MakeDividedDisk" );
+ return anObj;
+}
+
+//=============================================================================
+// MakeDividedCylinder
+//=============================================================================
+GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeDividedCylinder (CORBA::Double theR,
+ CORBA::Double theH,
+ GEOM::pattern thePattern)
+{
+ beginService( " GEOM_Superv_i::MakeDividedCylinder" );
+ MESSAGE("GEOM_Superv_i::MakeDividedCylinder");
+ getAdvancedOp();
+ GEOM::GEOM_Object_ptr anObj = myAdvancedOp->MakeDividedCylinder(theR, theH, thePattern);
+ endService( " GEOM_Superv_i::MakeDividedCylinder" );
+ return anObj;
+}
+
+//=============================================================================
+// MakeSmoothingSurface
+//=============================================================================
+GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeSmoothingSurface (GEOM::GEOM_List_ptr thelPoints)
+{
+ beginService( " GEOM_Superv_i::MakeSmoothingSurface" );
+ MESSAGE("GEOM_Superv_i::MakeSmoothingSurface");
+ getAdvancedOp();
+ if (GEOM_List_i<GEOM::ListOfGO>* aListImplP =
+ dynamic_cast<GEOM_List_i<GEOM::ListOfGO>*>(GetServant(thelPoints, myPOA).in())) {
+ getCurvesOp();
+ GEOM::GEOM_Object_ptr anObj = myAdvancedOp->MakeSmoothingSurface(aListImplP->GetList(), 2, 8, 0.);
+ endService( " GEOM_Superv_i::MakeSmoothingSurface" );
+ return anObj;
+ }
+ endService( " GEOM_Superv_i::MakeSmoothingSurface" );
+ return NULL;
+}
+
+/*@@ insert new functions before this line @@ do not remove this line @@*/
+
+GEOM_Superv_i_With_Session::GEOM_Superv_i_With_Session(CORBA::ORB_ptr orb,
+ PortableServer::POA_ptr poa,
+ PortableServer::ObjectId * contId,
+ const char *instanceName,
+ const char *interfaceName):GEOM_Superv_i(orb,poa,contId,instanceName,interfaceName,true,new SALOME_NamingService(orb))
+{
+}
+
+GEOM_Superv_i_Without_Session::GEOM_Superv_i_Without_Session(CORBA::ORB_ptr orb,
+ PortableServer::POA_ptr poa,
+ PortableServer::ObjectId * contId,
+ const char *instanceName,
+ const char *interfaceName, SALOME_NamingService_Abstract *my_name_service):GEOM_Superv_i(orb,poa,contId,instanceName,interfaceName,false, my_name_service)
+{
+}
+
//=====================================================================================
// EXPORTED METHODS
//=====================================================================================
extern "C"
{
+#ifdef WIN32
+ __declspec( dllexport )
+#endif
PortableServer::ObjectId * GEOM_SupervEngine_factory(CORBA::ORB_ptr orb,
- PortableServer::POA_ptr poa,
- PortableServer::ObjectId * contId,
- const char *instanceName,
- const char * interfaceName)
+ PortableServer::POA_ptr poa,
+ PortableServer::ObjectId * contId,
+ const char *instanceName,
+ const char * interfaceName)
{
- GEOM_Superv_i * myGEOM_Superv_i = new GEOM_Superv_i(orb, poa, contId, instanceName, interfaceName);
- myGEOM_Superv_i->register_name("/myGEOM_Superv");
- return myGEOM_Superv_i->getId() ;
+ CORBA::Object_var o = poa->id_to_reference(*contId);
+ Engines::Container_var cont = Engines::Container::_narrow(o);
+ GEOM_Superv_i *myGEOM_Superv_i(nullptr);
+ if(cont->is_SSL_mode())
+ {
+ PortableServer::ServantBase *contPtr = poa->reference_to_servant(cont);
+ Abstract_Engines_Container_i *contPtrEff = dynamic_cast<Abstract_Engines_Container_i *>(contPtr);
+ SALOME_NamingService_Abstract *decoNS = new SALOME_NamingService_Abstract_Decorator(contPtrEff->getNS());
+ myGEOM_Superv_i = new GEOM_Superv_i_Without_Session(orb, poa, contId, instanceName, interfaceName,decoNS);
+ //Don't understand the reason why this component is registered ???
+ // myGEOM_Superv_i->register_name("/myGEOM_Superv");
+ return myGEOM_Superv_i->getId() ;
+ }
+ else
+ {
+ myGEOM_Superv_i = new GEOM_Superv_i_With_Session(orb, poa, contId, instanceName, interfaceName);
+ return myGEOM_Superv_i->getId() ;
+ }
}
}
