X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGEOM_I%2FGEOM_Gen_i.cc;h=f4da6559580e882eb24336f21e96feb2f9c9e7e7;hb=cfc267474fbe4c092b88a40e8d28031a00950450;hp=5c99e5876f4250cc0a94afdaa8a28316e1306663;hpb=5e7cf6df5a668d1e1608ba946c59ba34234d8942;p=modules%2Fgeom.git diff --git a/src/GEOM_I/GEOM_Gen_i.cc b/src/GEOM_I/GEOM_Gen_i.cc index 5c99e5876..f4da65595 100644 --- a/src/GEOM_I/GEOM_Gen_i.cc +++ b/src/GEOM_I/GEOM_Gen_i.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2016 CEA/DEN, EDF R&D, OPEN CASCADE +// 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 @@ -98,13 +98,12 @@ GEOM_Gen_i::GEOM_Gen_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) + const char* interfaceName, + bool withRegistry) : + Engines_Component_i(orb, poa, contId, instanceName, interfaceName, false, withRegistry) { _thisObj = this; _id = _poa->activate_object(_thisObj); - name_service = new SALOME_NamingService(_orb); - _impl = new ::GEOMImpl_Gen; //PAL10867: disable signals catching with "noexcepthandler" option @@ -140,10 +139,8 @@ GEOM_Gen_i::GEOM_Gen_i(CORBA::ORB_ptr orb, // purpose : destructor //============================================================================ GEOM_Gen_i::~GEOM_Gen_i() { - delete name_service; delete _impl; - std::map::const_iterator it; - for ( it = myOpCreatorMap.begin(); it != myOpCreatorMap.end(); ++it) + for (auto it = myOpCreatorMap.cbegin(); it != myOpCreatorMap.cend(); ++it) delete (*it).second; } @@ -152,15 +149,15 @@ GEOM_Gen_i::~GEOM_Gen_i() { // function : IORToLocalPersistentID() // purpose : //============================================================================ -char* GEOM_Gen_i::IORToLocalPersistentID(SALOMEDS::SObject_ptr theSObject, +char* GEOM_Gen_i::IORToLocalPersistentID(SALOMEDS::SObject_ptr /*theSObject*/, const char* IORString, - CORBA::Boolean isMultiFile, - CORBA::Boolean isASCII) + CORBA::Boolean /*isMultiFile*/, + CORBA::Boolean /*isASCII*/) { GEOM::GEOM_BaseObject_var anObject = GEOM::GEOM_BaseObject::_narrow(_orb->string_to_object(IORString)); if (!CORBA::is_nil(anObject)) { - return CORBA::string_dup(anObject->GetEntry()); + return anObject->GetEntry(); } return 0; } @@ -172,12 +169,12 @@ char* GEOM_Gen_i::IORToLocalPersistentID(SALOMEDS::SObject_ptr theSObject, // : Used when a study is loaded // : The IOR (IORName) of object created is returned //============================================================================ -char* GEOM_Gen_i::LocalPersistentIDToIOR(SALOMEDS::SObject_ptr theSObject, +char* GEOM_Gen_i::LocalPersistentIDToIOR(SALOMEDS::SObject_ptr /*theSObject*/, const char* aLocalPersistentID, - CORBA::Boolean isMultiFile, - CORBA::Boolean isASCII) + CORBA::Boolean /*isMultiFile*/, + CORBA::Boolean /*isASCII*/) { - HANDLE_NAMESPACE(GEOM_BaseObject) anObject = + Handle(::GEOM_BaseObject) anObject = _impl->GetObject(aLocalPersistentID); if ( !anObject.IsNull() ) { @@ -212,7 +209,7 @@ bool GEOM_Gen_i::CanPublishInStudy(CORBA::Object_ptr theIOR) SALOMEDS::SObject_ptr GEOM_Gen_i::PublishInStudy(SALOMEDS::SObject_ptr theSObject, CORBA::Object_ptr theObject, const char* theName) - throw (SALOME::SALOME_Exception) + { Unexpect aCatch(SALOME_SalomeException); SALOMEDS::SObject_var aResultSO; @@ -226,23 +223,7 @@ SALOMEDS::SObject_ptr GEOM_Gen_i::PublishInStudy(SALOMEDS::SObject_ptr theSObjec SALOMEDS::StudyBuilder_var aStudyBuilder = aStudy->NewBuilder(); SALOMEDS::UseCaseBuilder_wrap useCaseBuilder = aStudy->GetUseCaseBuilder(); - SALOMEDS::SComponent_var aFather = aStudy->FindComponent("GEOM"); - if (aFather->_is_nil()) { - aFather = aStudyBuilder->NewComponent("GEOM"); - anAttr = aStudyBuilder->FindOrCreateAttribute(aFather, "AttributeName"); - SALOMEDS::AttributeName_var aName = SALOMEDS::AttributeName::_narrow(anAttr); - aName->SetValue("Geometry"); - aName->UnRegister(); - anAttr = aStudyBuilder->FindOrCreateAttribute(aFather, "AttributePixMap"); - SALOMEDS::AttributePixMap_var aPixMap=SALOMEDS::AttributePixMap::_narrow(anAttr); - aPixMap->SetPixMap("ICON_OBJBROWSER_Geometry"); - aPixMap->UnRegister(); - aStudyBuilder->DefineComponentInstance(aFather, (GEOM::GEOM_Gen_var)GEOM_Gen::_this()); - // add component to the use case tree - // (to support tree representation customization and drag-n-drop) - useCaseBuilder->SetRootCurrent(); - useCaseBuilder->Append( aFather ); // component object is added as the top level item - } + SALOMEDS::SComponent_var aFather = findOrCreateComponent(); if (aFather->_is_nil()) return aResultSO; if (CORBA::is_nil(theSObject)) { @@ -261,9 +242,9 @@ SALOMEDS::SObject_ptr GEOM_Gen_i::PublishInStudy(SALOMEDS::SObject_ptr theSObjec // BEGIN: try to find existed name for current shape if ( !aShape->_is_nil() && mytype != GEOM_GROUP) { - // recieve current TopoDS shape + // receive current TopoDS shape CORBA::String_var entry = aShape->GetEntry(); - HANDLE_NAMESPACE(GEOM_Object) aGShape = HANDLE_NAMESPACE(GEOM_Object)::DownCast + Handle(::GEOM_Object) aGShape = Handle(::GEOM_Object)::DownCast ( _impl->GetObject( entry )); TopoDS_Shape TopoSh = aGShape->GetValue(); // find label of main shape @@ -272,7 +253,7 @@ SALOMEDS::SObject_ptr GEOM_Gen_i::PublishInStudy(SALOMEDS::SObject_ptr theSObjec aMainSh = aMainSh->GetMainShape(); } entry = aMainSh->GetEntry(); - HANDLE_NAMESPACE(GEOM_BaseObject) anObj = _impl->GetObject( entry ); + Handle(::GEOM_BaseObject) anObj = _impl->GetObject( entry ); TDF_Label aMainLbl = anObj->GetFunction(1)->GetNamingEntry(); // check all named shapes using iterator @@ -312,6 +293,8 @@ SALOMEDS::SObject_ptr GEOM_Gen_i::PublishInStudy(SALOMEDS::SObject_ptr theSObjec aResultSO->SetAttrString("AttributePixMap","ICON_OBJBROWSER_GROUP_SOLID"); aNamePrefix = "Group_Of_Solids_"; break; + default: + aNamePrefix = "Group_"; } } else if ( mytype == GEOM_MARKER ) { aResultSO->SetAttrString("AttributePixMap","ICON_OBJBROWSER_LCS"); @@ -449,17 +432,17 @@ SALOMEDS::SObject_ptr GEOM_Gen_i::PublishInStudy(SALOMEDS::SObject_ptr theSObjec //============================================================================ // function : CreateAndPublishGroup -// purpose : auxilary for PublishNamedShapesInStudy +// purpose : auxiliary for PublishNamedShapesInStudy //============================================================================ void GEOM_Gen_i::CreateAndPublishGroup(GEOM::GEOM_Object_var theMainShape, const TopTools_IndexedMapOfShape& anIndices, const TopTools_SequenceOfShape& SeqS, - const TColStd_SequenceOfAsciiString& SeqN, + const TColStd_SequenceOfAsciiString& /*SeqN*/, const Standard_CString& GrName, - GEOM::ListOfGO_var aResList) + GEOM::ListOfGO_var /*aResList*/) { CORBA::String_var entry = theMainShape->GetEntry(); - //HANDLE_NAMESPACE(GEOM_Object) aMainShape = _impl->GetObject(entry); + //Handle(::GEOM_Object) aMainShape = _impl->GetObject(entry); Handle(TColStd_HArray1OfInteger) anArray; if(SeqS.Length()>0) { // create a group @@ -467,9 +450,9 @@ void GEOM_Gen_i::CreateAndPublishGroup(GEOM::GEOM_Object_var theMainShape, GEOM::GEOM_Object_wrap GrObj = GOp->CreateGroup( theMainShape, SeqS(1).ShapeType() ); AddInStudy(GrObj, GrName, theMainShape._retn()); //CORBA::String_var GrEntry = GrObj->GetEntry(); - //HANDLE_NAMESPACE(GEOM_Object) HGrObj = _impl->GetObject(GrEntry); + //Handle(::GEOM_Object) HGrObj = _impl->GetObject(GrEntry); // add named objects - //HANDLE_NAMESPACE(GEOM_Object) anObj; + //Handle(::GEOM_Object) anObj; for(int i=1; i<=SeqS.Length(); i++) { TopoDS_Shape aValue = SeqS.Value(i); //anArray = new TColStd_HArray1OfInteger(1,1); @@ -478,7 +461,7 @@ void GEOM_Gen_i::CreateAndPublishGroup(GEOM::GEOM_Object_var theMainShape, GOp->AddObject(GrObj,anIndex); //anObj = GEOM_Engine::GetEngine()->AddObject(GEOM_SUBSHAPE); //if (anObj.IsNull()) continue; - //HANDLE_NAMESPACE(GEOM_Function) aFunction = anObj->AddFunction(GEOM_Object::GetSubShapeID(), 1); + //Handle(::GEOM_Function) aFunction = anObj->AddFunction(GEOM_Object::GetSubShapeID(), 1); //if (aFunction.IsNull()) continue; //GEOM_ISubShape aSSI(aFunction); //aSSI.SetMainShape(aMainShape->GetLastFunction()); @@ -511,7 +494,7 @@ GEOM::ListOfGO* GEOM_Gen_i:: if(theMainShape->_is_nil()) return aResList._retn(); CORBA::String_var entry = theMainShape->GetEntry(); - HANDLE_NAMESPACE(GEOM_Object) aMainShape = HANDLE_NAMESPACE(GEOM_Object)::DownCast + Handle(::GEOM_Object) aMainShape = Handle(::GEOM_Object)::DownCast ( _impl->GetObject( entry )); if (aMainShape.IsNull()) return aResList._retn(); TopoDS_Shape MainSh = aMainShape->GetValue(); @@ -572,7 +555,7 @@ GEOM::ListOfGO* GEOM_Gen_i:: // function : Save() // purpose : save OCAF/Geom document //============================================================================ -SALOMEDS::TMPFile* GEOM_Gen_i::Save(SALOMEDS::SComponent_ptr theComponent, +SALOMEDS::TMPFile* GEOM_Gen_i::Save(SALOMEDS::SComponent_ptr /*theComponent*/, const char* theURL, bool isMultiFile) { SALOMEDS::TMPFile_var aStreamFile; @@ -594,24 +577,20 @@ SALOMEDS::TMPFile* GEOM_Gen_i::Save(SALOMEDS::SComponent_ptr theComponent, aSeq.reserve(1); // Prepare a file name to open TCollection_AsciiString aNameWithExt(""); - if (isMultiFile) - aNameWithExt = TCollection_AsciiString( (char*)(SALOMEDS_Tool::GetNameFromPath( - Kernel_Utils::encode(getStudyServant()->URL())).c_str())); -#if OCC_VERSION_MAJOR > 6 + if (isMultiFile) + aNameWithExt = TCollection_AsciiString((char*)(SALOMEDS_Tool::GetNameFromPath( + Kernel_Utils::encode(getStudyServant()->URL())).c_str())); aNameWithExt += TCollection_AsciiString("_GEOM.cbf"); -#else - aNameWithExt += TCollection_AsciiString("_GEOM.sgd"); -#endif aSeq.push_back(CORBA::string_dup(aNameWithExt.ToCString())); // Build a full file name of temporary file TCollection_AsciiString aFullName = TCollection_AsciiString((char*)aTmpDir.c_str()) + aNameWithExt; // Save GEOM component in this file - _impl->Save((char*) aFullName.ToCString()); - // Conver a file to the byte stream - aStreamFile = SALOMEDS_Tool::PutFilesToStream(aTmpDir.c_str(), aSeq, isMultiFile); - // Remove the created file and tmp directory - if (!isMultiFile) SALOMEDS_Tool::RemoveTemporaryFiles(aTmpDir.c_str(), aSeq, true); - + if (_impl->Save((char*) aFullName.ToCString())) { + // Convert a file to the byte stream + aStreamFile = SALOMEDS_Tool::PutFilesToStream(aTmpDir.c_str(), aSeq, isMultiFile); + // Remove the created file and tmp directory + if (!isMultiFile) SALOMEDS_Tool::RemoveTemporaryFiles(aTmpDir.c_str(), aSeq, true); + } // Return the created byte stream return aStreamFile._retn(); } @@ -664,7 +643,6 @@ CORBA::Boolean GEOM_Gen_i::Load(SALOMEDS::SComponent_ptr theComponent, TCollection_AsciiString aNameWithExt(""); SALOMEDS::Study_var study = getStudyServant(); -#if OCC_VERSION_MAJOR > 6 // Get the file name. int i; int aLength = aSeq.size(); @@ -680,14 +658,6 @@ CORBA::Boolean GEOM_Gen_i::Load(SALOMEDS::SComponent_ptr theComponent, break; } } -#else - if (isMultiFile) { - CORBA::String_var url = study->URL(); - aNameWithExt = (char*)SALOMEDS_Tool::GetNameFromPath(url.in()).c_str(); - } - - aNameWithExt += "_GEOM.sgd"; -#endif TCollection_AsciiString aFullName = (TCollection_AsciiString((char*)aTmpDir.c_str()) + aNameWithExt); @@ -732,7 +702,7 @@ CORBA::Boolean GEOM_Gen_i::LoadASCII(SALOMEDS::SComponent_ptr theComponent, // function : Close() // purpose : //============================================================================ -void GEOM_Gen_i::Close(SALOMEDS::SComponent_ptr theComponent) +void GEOM_Gen_i::Close(SALOMEDS::SComponent_ptr /*theComponent*/) { _impl->Close(); } @@ -786,7 +756,7 @@ SALOMEDS::TMPFile* GEOM_Gen_i::CopyFrom(SALOMEDS::SObject_ptr theObject, CORBA:: // function : CanPaste() // purpose : //============================================================================ -CORBA::Boolean GEOM_Gen_i::CanPaste(const char* theComponentName, CORBA::Long theObjectID) { +CORBA::Boolean GEOM_Gen_i::CanPaste(const char* theComponentName, CORBA::Long /*theObjectID*/) { // The Geometry component can paste only objects copied by Geometry component // and with the object type = 1 if (strcmp(theComponentName, ComponentDataType()) != 0) return false; @@ -811,7 +781,7 @@ SALOMEDS::SObject_ptr GEOM_Gen_i::PasteInto(const SALOMEDS::TMPFile& theStream, BRep_Builder aBuilder; try { BRepTools::Read(aTopology, aStreamedBrep, aBuilder); - } catch (Standard_Failure) { + } catch (Standard_Failure&) { return aNewSO._retn(); } @@ -822,8 +792,8 @@ SALOMEDS::SObject_ptr GEOM_Gen_i::PasteInto(const SALOMEDS::TMPFile& theStream, //Create a new GEOM_Object - HANDLE_NAMESPACE(GEOM_Object) anObj = _impl->AddObject(theObjectID); - HANDLE_NAMESPACE(GEOM_Function) aFunction = anObj->AddFunction(GEOMImpl_CopyDriver::GetID(), COPY_WITHOUT_REF); + Handle(::GEOM_Object) anObj = _impl->AddObject(theObjectID); + Handle(::GEOM_Function) aFunction = anObj->AddFunction(GEOMImpl_CopyDriver::GetID(), COPY_WITHOUT_REF); aFunction->SetValue(aTopology); TCollection_AsciiString anEntry; @@ -926,7 +896,7 @@ GEOM::ListOfGO* GEOM_Gen_i::RestoreSubShapesO (GEOM::GEOM_Object_ptr theObject CORBA::String_var anIORo = _orb->object_to_string(theObject); SALOMEDS::SObject_var aSO = aStudy->FindObjectIOR(anIORo.in()); //PTv, IMP 0020001, The salome object - // is not obligatory in case of invokation from script + // is not obligatory in case of invocation from script // if (CORBA::is_nil(aSO)) // return aParts._retn(); @@ -955,7 +925,7 @@ GEOM::ListOfGO* GEOM_Gen_i::RestoreGivenSubShapesO (GEOM::GEOM_Object_ptr theO CORBA::String_var anIORo = _orb->object_to_string(theObject); SALOMEDS::SObject_var aSO = getStudyServant()->FindObjectIOR(anIORo.in()); //PTv, IMP 0020001, The salome object - // is not obligatory in case of invokation from script + // is not obligatory in case of invocation from script // if (CORBA::is_nil(aSO)) // return aParts._retn(); @@ -1038,7 +1008,7 @@ GEOM::ListOfGO* GEOM_Gen_i::RestoreSubShapes(GEOM::GEOM_Object_ptr theObject, GEOM::ListOfGO_var aParts = new GEOM::ListOfGO; SALOMEDS::Study_var aStudy = getStudyServant(); //PTv, IMP 0020001, The salome object - // is not obligatory in case of invokation from script + // is not obligatory in case of invocation from script if (CORBA::is_nil(aStudy) || CORBA::is_nil(theObject) /*|| CORBA::is_nil(theSObject)*/) return aParts._retn(); @@ -1108,7 +1078,8 @@ GEOM::ListOfGO* GEOM_Gen_i::RestoreSubShapes(GEOM::GEOM_Object_ptr theObject, // Reconstruct arguments and tree of sub-shapes of the arguments CORBA::String_var anIOR; - SALOMEDS::StudyBuilder_var aStudyBuilder = aStudy->NewBuilder(); + SALOMEDS::StudyBuilder_var aStudyBuilder = aStudy->NewBuilder(); + SALOMEDS::UseCaseBuilder_wrap useCaseBuilder = aStudy->GetUseCaseBuilder(); for (Standard_Integer i = 0; i < aLength; i++) { GEOM::GEOM_Object_var anArgO = aList[i]; @@ -1139,16 +1110,16 @@ GEOM::ListOfGO* GEOM_Gen_i::RestoreSubShapes(GEOM::GEOM_Object_ptr theObject, GEOM::GEOM_Object_var anArgOTrsf = aTrsfOpSv->TransformLikeOtherCopy(anArgO, theObject); if (!CORBA::is_nil(anArgOTrsf)) { CORBA::String_var anArgOTrsfEntry = anArgOTrsf->GetEntry(); - HANDLE_NAMESPACE(GEOM_BaseObject) anArgOTrsfImpl = _impl->GetObject(anArgOTrsfEntry); - HANDLE_NAMESPACE(GEOM_Function) anArgOTrsfFun = anArgOTrsfImpl->GetLastFunction(); + Handle(::GEOM_BaseObject) anArgOTrsfImpl = _impl->GetObject(anArgOTrsfEntry); + Handle(::GEOM_Function) anArgOTrsfFun = anArgOTrsfImpl->GetLastFunction(); anArgOTrsfFun->SetDescription(""); aSubO = aShapesOp->GetInPlace(theObject, anArgOTrsf); } /* - HANDLE_NAMESPACE(GEOM_Function) anOFun = theObject->GetLastFunction(); + Handle(::GEOM_Function) anOFun = theObject->GetLastFunction(); if (!anOFun.IsNull()) { CORBA::String_var entryArg = anArgO->GetEntry(); - HANDLE_NAMESPACE(GEOM_Object) anArgOImpl = _impl->GetObject(entryArg); + Handle(::GEOM_Object) anArgOImpl = _impl->GetObject(entryArg); if (!anArgOImpl.IsNull()) { TopoDS_Shape anArgOShape = anArgOImpl->GetValue(); TopoDS_Shape aMultiArgShape; @@ -1183,7 +1154,7 @@ GEOM::ListOfGO* GEOM_Gen_i::RestoreSubShapes(GEOM::GEOM_Object_ptr theObject, {} } GEOM::GEOM_Object_var anArgOMulti = (aMultiArgShape); // TODO - HANDLE_NAMESPACE(GEOM_Function) anArgOMultiFun = anArgOMulti->GetLastFunction(); + Handle(::GEOM_Function) anArgOMultiFun = anArgOMulti->GetLastFunction(); anArgOMultiFun->SetDescription(""); aSubO = aShapesOp->GetInPlace(theObject, anArgOMulti); } @@ -1275,7 +1246,10 @@ GEOM::ListOfGO* GEOM_Gen_i::RestoreSubShapes(GEOM::GEOM_Object_ptr theObject, if (!CORBA::is_nil(anArgSO)) { SALOMEDS::SObject_var aSubSO; if (!CORBA::is_nil(theSObject)) + { aSubSO = aStudyBuilder->NewObject(theSObject); + useCaseBuilder->AppendTo( theSObject, aSubSO ); + } // Restore published sub-shapes of the argument GEOM::ListOfGO_var aSubParts = @@ -1335,8 +1309,8 @@ GEOM::ListOfGO* GEOM_Gen_i::RestoreSubShapes(GEOM::GEOM_Object_ptr theObject, aResParts->length(nb); if (nb > 0) { - HANDLE_NAMESPACE(GEOM_BaseObject) aMainObj = _impl->GetObject(theObject->GetEntry()); - HANDLE_NAMESPACE(GEOM_Function) aFunction = aMainObj->GetLastFunction(); + Handle(::GEOM_BaseObject) aMainObj = _impl->GetObject(theObject->GetEntry()); + Handle(::GEOM_Function) aFunction = aMainObj->GetLastFunction(); GEOM::TPythonDump pd (aFunction, true); pd <<"["; int i = 0, j = 0; @@ -1351,8 +1325,8 @@ GEOM::ListOfGO* GEOM_Gen_i::RestoreSubShapes(GEOM::GEOM_Object_ptr theObject, anObjEntryMap.insert(anEntry); aResParts[nbRes++] = anObj; // clear python dump of object - HANDLE_NAMESPACE(GEOM_BaseObject) aGeomObj = _impl->GetObject(anEntry); - HANDLE_NAMESPACE(GEOM_Function) anObjFun = aGeomObj->GetLastFunction(); + Handle(::GEOM_BaseObject) aGeomObj = _impl->GetObject(anEntry); + Handle(::GEOM_Function) anObjFun = aGeomObj->GetLastFunction(); if ( !anObjFun.IsNull() ) anObjFun->SetDescription( "" ); if ( j > 0 ) @@ -1369,7 +1343,7 @@ GEOM::ListOfGO* GEOM_Gen_i::RestoreSubShapes(GEOM::GEOM_Object_ptr theObject, GEOM::GEOM_Object_var anObj = anOutArgs[ i ]; if (CORBA::is_nil(anObj)) continue; - HANDLE_NAMESPACE(GEOM_BaseObject) aGeomObj = _impl->GetObject(anObj->GetEntry()); + Handle(::GEOM_BaseObject) aGeomObj = _impl->GetObject(anObj->GetEntry()); if ( j > 0 ) pd << ", "; pd << aGeomObj; @@ -1416,7 +1390,8 @@ GEOM::ListOfGO* GEOM_Gen_i::RestoreSubShapesOneLevel (SALOMEDS::SObject_ptr th CORBA::is_nil(theNewO) /*|| CORBA::is_nil(theNewSO)*/) return aParts._retn(); - SALOMEDS::StudyBuilder_var aStudyBuilder = aStudy->NewBuilder(); + SALOMEDS::StudyBuilder_var aStudyBuilder = aStudy->NewBuilder(); + SALOMEDS::UseCaseBuilder_wrap useCaseBuilder = aStudy->GetUseCaseBuilder(); // Get interface, containing method, which we will use to reconstruct sub-shapes GEOM::GEOM_IShapesOperations_var aShapesOp = GetIShapesOperations(); @@ -1461,8 +1436,8 @@ GEOM::ListOfGO* GEOM_Gen_i::RestoreSubShapesOneLevel (SALOMEDS::SObject_ptr th GEOM::GEOM_Object_var anArgOTrsf = aTrsfOpSv->TransformLikeOtherCopy(anOldSubO, theNewO); if (!CORBA::is_nil(anArgOTrsf)) { CORBA::String_var anArgOTrsfEntry = anArgOTrsf->GetEntry(); - HANDLE_NAMESPACE(GEOM_BaseObject) anArgOTrsfImpl = _impl->GetObject(anArgOTrsfEntry); - HANDLE_NAMESPACE(GEOM_Function) anArgOTrsfFun = anArgOTrsfImpl->GetLastFunction(); + Handle(::GEOM_BaseObject) anArgOTrsfImpl = _impl->GetObject(anArgOTrsfEntry); + Handle(::GEOM_Function) anArgOTrsfFun = anArgOTrsfImpl->GetLastFunction(); anArgOTrsfFun->SetDescription(""); aNewSubO = aShapesOp->GetInPlace(theNewO, anArgOTrsf); } @@ -1535,6 +1510,10 @@ GEOM::ListOfGO* GEOM_Gen_i::RestoreSubShapesOneLevel (SALOMEDS::SObject_ptr th if (anOldSubO->GetMarkerType() == GEOM::MT_USER) aNewSubO->SetMarkerTexture(anOldSubO->GetMarkerTexture()); } + // reference to arg + SALOMEDS::SObject_wrap aReferenceSO = aStudyBuilder->NewObject( aNewSubSO ); + aStudyBuilder->Addreference( aReferenceSO, anOldSubSO ); + useCaseBuilder->AppendTo( theNewSO, aReferenceSO ); } // Restore published sub-shapes of the argument GEOM::ListOfGO_var aSubParts; @@ -1551,8 +1530,10 @@ GEOM::ListOfGO* GEOM_Gen_i::RestoreSubShapesOneLevel (SALOMEDS::SObject_ptr th else { // GetInPlace failed, try to build from published parts SALOMEDS::SObject_var aNewSubSO; if (!CORBA::is_nil(theNewSO)) + { aNewSubSO = aStudyBuilder->NewObject(theNewSO); - + useCaseBuilder->AppendTo( theNewSO, aNewSubSO ); + } // Restore published sub-shapes of the argument GEOM::ListOfGO_var aSubParts = RestoreSubShapesOneLevel(anOldSubSO, aNewSubSO, @@ -1631,7 +1612,7 @@ GEOM::ListOfGO* GEOM_Gen_i::RestoreGivenSubShapes(GEOM::GEOM_Object_ptr theObj GEOM::ListOfGO_var aParts = new GEOM::ListOfGO; SALOMEDS::Study_var aStudy = getStudyServant(); //PTv, IMP 0020001, The salome object - // is not obligatory in case of invokation from script + // is not obligatory in case of invocation from script if (CORBA::is_nil(aStudy) || CORBA::is_nil(theObject) /*|| CORBA::is_nil(theSObject)*/) return aParts._retn(); @@ -1642,7 +1623,8 @@ GEOM::ListOfGO* GEOM_Gen_i::RestoreGivenSubShapes(GEOM::GEOM_Object_ptr theObj // Get all arguments GEOM::ListOfGBO_var anOpArgsList = theObject->GetDependency(); - Standard_Integer nbArgsActual = anOpArgsList->length(); + Standard_Integer nbOpArgs = anOpArgsList->length(); + Standard_Integer nbArgsActual = nbOpArgs; // If anOpArgsList list is empty, nothing to do if (nbArgsActual == 0) @@ -1674,7 +1656,7 @@ GEOM::ListOfGO* GEOM_Gen_i::RestoreGivenSubShapes(GEOM::GEOM_Object_ptr theObj if (nbArgsActual < 1) return aParts._retn(); - if (theInheritFirstArg || (nbArgsActual == 1)) { + if (theInheritFirstArg || (nbOpArgs == 1)) { // Do not publish argument's reflection, // but only reconstruct its published sub-shapes @@ -1706,7 +1688,8 @@ GEOM::ListOfGO* GEOM_Gen_i::RestoreGivenSubShapes(GEOM::GEOM_Object_ptr theObj // Reconstruct arguments and tree of sub-shapes of the arguments CORBA::String_var anIOR; - SALOMEDS::StudyBuilder_var aStudyBuilder = aStudy->NewBuilder(); + SALOMEDS::StudyBuilder_var aStudyBuilder = aStudy->NewBuilder(); + SALOMEDS::UseCaseBuilder_wrap useCaseBuilder = aStudy->GetUseCaseBuilder(); for (Standard_Integer i = 0; i < nbArgsActual; i++) { GEOM::GEOM_Object_var anArgO = aList[i]; @@ -1737,8 +1720,8 @@ GEOM::ListOfGO* GEOM_Gen_i::RestoreGivenSubShapes(GEOM::GEOM_Object_ptr theObj GEOM::GEOM_Object_var anArgOTrsf = aTrsfOpSv->TransformLikeOtherCopy(anArgO, theObject); if (!CORBA::is_nil(anArgOTrsf)) { CORBA::String_var anArgOTrsfEntry = anArgOTrsf->GetEntry(); - HANDLE_NAMESPACE(GEOM_BaseObject) anArgOTrsfImpl = _impl->GetObject(anArgOTrsfEntry); - HANDLE_NAMESPACE(GEOM_Function) anArgOTrsfFun = anArgOTrsfImpl->GetLastFunction(); + Handle(::GEOM_BaseObject) anArgOTrsfImpl = _impl->GetObject(anArgOTrsfEntry); + Handle(::GEOM_Function) anArgOTrsfFun = anArgOTrsfImpl->GetLastFunction(); anArgOTrsfFun->SetDescription(""); aSubO = aShapesOp->GetInPlace(theObject, anArgOTrsf); } @@ -1825,8 +1808,10 @@ GEOM::ListOfGO* GEOM_Gen_i::RestoreGivenSubShapes(GEOM::GEOM_Object_ptr theObj if (!CORBA::is_nil(anArgSO)) { SALOMEDS::SObject_var aSubSO; if (!CORBA::is_nil(theSObject)) + { aSubSO = aStudyBuilder->NewObject(theSObject); - + useCaseBuilder->AppendTo( theSObject, aSubSO ); + } // Restore published sub-shapes of the argument GEOM::ListOfGO_var aSubParts = RestoreGivenSubShapesOneLevel(anArgSO, aSubSO, @@ -1881,8 +1866,8 @@ GEOM::ListOfGO* GEOM_Gen_i::RestoreGivenSubShapes(GEOM::GEOM_Object_ptr theObj aResParts->length(nb); if (nb > 0) { - HANDLE_NAMESPACE(GEOM_BaseObject) aMainObj = _impl->GetObject(theObject->GetEntry()); - HANDLE_NAMESPACE(GEOM_Function) aFunction = aMainObj->GetLastFunction(); + Handle(::GEOM_BaseObject) aMainObj = _impl->GetObject(theObject->GetEntry()); + Handle(::GEOM_Function) aFunction = aMainObj->GetLastFunction(); GEOM::TPythonDump pd (aFunction, true); pd <<"["; int i = 0, j = 0; @@ -1897,8 +1882,8 @@ GEOM::ListOfGO* GEOM_Gen_i::RestoreGivenSubShapes(GEOM::GEOM_Object_ptr theObj anObjEntryMap.insert(anEntry); aResParts[nbRes++] = anObj; // clear python dump of object - HANDLE_NAMESPACE(GEOM_BaseObject) aGeomObj = _impl->GetObject(anEntry); - HANDLE_NAMESPACE(GEOM_Function) anObjFun = aGeomObj->GetLastFunction(); + Handle(::GEOM_BaseObject) aGeomObj = _impl->GetObject(anEntry); + Handle(::GEOM_Function) anObjFun = aGeomObj->GetLastFunction(); if ( !anObjFun.IsNull() ) anObjFun->SetDescription( "" ); if ( j > 0 ) @@ -1913,7 +1898,7 @@ GEOM::ListOfGO* GEOM_Gen_i::RestoreGivenSubShapes(GEOM::GEOM_Object_ptr theObj GEOM::GEOM_Object_var anObj = theArgs[ i ]; if (CORBA::is_nil(anObj)) continue; - HANDLE_NAMESPACE(GEOM_BaseObject) aGeomObj = _impl->GetObject(anObj->GetEntry()); + Handle(::GEOM_BaseObject) aGeomObj = _impl->GetObject(anObj->GetEntry()); if ( j > 0 ) pd << ", "; pd << aGeomObj; @@ -1960,7 +1945,8 @@ GEOM::ListOfGO* GEOM_Gen_i::RestoreGivenSubShapesOneLevel (SALOMEDS::SObject_ptr CORBA::is_nil(theNewO) /*|| CORBA::is_nil(theNewSO)*/) return aParts._retn(); - SALOMEDS::StudyBuilder_var aStudyBuilder = aStudy->NewBuilder(); + SALOMEDS::StudyBuilder_var aStudyBuilder = aStudy->NewBuilder(); + SALOMEDS::UseCaseBuilder_wrap useCaseBuilder = aStudy->GetUseCaseBuilder(); // Get interface, containing method, which we will use to reconstruct sub-shapes GEOM::GEOM_IShapesOperations_var aShapesOp = GetIShapesOperations(); @@ -2013,8 +1999,8 @@ GEOM::ListOfGO* GEOM_Gen_i::RestoreGivenSubShapesOneLevel (SALOMEDS::SObject_ptr GEOM::GEOM_Object_var anArgOTrsf = aTrsfOpSv->TransformLikeOtherCopy(anOldSubO, theNewO); if (!CORBA::is_nil(anArgOTrsf)) { CORBA::String_var anArgOTrsfEntry = anArgOTrsf->GetEntry(); - HANDLE_NAMESPACE(GEOM_BaseObject) anArgOTrsfImpl = _impl->GetObject(anArgOTrsfEntry); - HANDLE_NAMESPACE(GEOM_Function) anArgOTrsfFun = anArgOTrsfImpl->GetLastFunction(); + Handle(::GEOM_BaseObject) anArgOTrsfImpl = _impl->GetObject(anArgOTrsfEntry); + Handle(::GEOM_Function) anArgOTrsfFun = anArgOTrsfImpl->GetLastFunction(); anArgOTrsfFun->SetDescription(""); aNewSubO = aShapesOp->GetInPlace(theNewO, anArgOTrsf); } @@ -2084,6 +2070,10 @@ GEOM::ListOfGO* GEOM_Gen_i::RestoreGivenSubShapesOneLevel (SALOMEDS::SObject_ptr if (anOldSubO->GetMarkerType() == GEOM::MT_USER) aNewSubO->SetMarkerTexture(anOldSubO->GetMarkerTexture()); } + // reference to arg + SALOMEDS::SObject_wrap aReferenceSO = aStudyBuilder->NewObject( aNewSubSO ); + aStudyBuilder->Addreference( aReferenceSO, anOldSubSO ); + useCaseBuilder->AppendTo( theNewSO, aReferenceSO ); } // Restore published sub-shapes of the argument GEOM::ListOfGO_var aSubParts; @@ -2100,8 +2090,10 @@ GEOM::ListOfGO* GEOM_Gen_i::RestoreGivenSubShapesOneLevel (SALOMEDS::SObject_ptr else { // GetInPlace failed, try to build from published parts SALOMEDS::SObject_var aNewSubSO; if (!CORBA::is_nil(theNewSO)) + { aNewSubSO = aStudyBuilder->NewObject(theNewSO); - + useCaseBuilder->AppendTo( theNewSO, aNewSubSO ); + } // Restore published sub-shapes of the argument GEOM::ListOfGO_var aSubParts = RestoreGivenSubShapesOneLevel(anOldSubSO, aNewSubSO, @@ -2161,27 +2153,38 @@ GEOM::ListOfGO* GEOM_Gen_i::RestoreGivenSubShapesOneLevel (SALOMEDS::SObject_ptr } //============================================================================ -// function : register() -// purpose : register 'name' in 'name_service' +// function : findOrCreateComponent() +// purpose : Find root study component; create if it does not exist //============================================================================ -void GEOM_Gen_i::register_name(char * name) +SALOMEDS::SComponent_var GEOM_Gen_i::findOrCreateComponent() { - GEOM::GEOM_Gen_var g = _this(); - name_service->Register(g, name); -} + SALOMEDS::SComponent_var aComponent; -//============================================================================ -// function : getStudyServant() -// purpose : Get Study -//============================================================================ -SALOMEDS::Study_var GEOM_Gen_i::getStudyServant() -{ - static SALOMEDS::Study_var aStudy; - if(CORBA::is_nil(aStudy)){ - CORBA::Object_ptr anObject = name_service->Resolve("/Study"); - aStudy = SALOMEDS::Study::_narrow(anObject); + SALOMEDS::Study_var aStudy = getStudyServant(); + if (aStudy->_is_nil()) return aComponent; + + SALOMEDS::GenericAttribute_var anAttr; + SALOMEDS::StudyBuilder_var aStudyBuilder = aStudy->NewBuilder(); + SALOMEDS::UseCaseBuilder_wrap useCaseBuilder = aStudy->GetUseCaseBuilder(); + + aComponent = aStudy->FindComponent(ComponentDataType()); + if (aComponent->_is_nil()) { + aComponent = aStudyBuilder->NewComponent(ComponentDataType()); + anAttr = aStudyBuilder->FindOrCreateAttribute(aComponent.in(), "AttributeName"); + SALOMEDS::AttributeName_var aName = SALOMEDS::AttributeName::_narrow(anAttr); + aName->SetValue("Geometry"); + aName->UnRegister(); + anAttr = aStudyBuilder->FindOrCreateAttribute(aComponent.in(), "AttributePixMap"); + SALOMEDS::AttributePixMap_var aPixMap=SALOMEDS::AttributePixMap::_narrow(anAttr); + aPixMap->SetPixMap("ICON_OBJBROWSER_Geometry"); + aPixMap->UnRegister(); + aStudyBuilder->DefineComponentInstance(aComponent.in(), (GEOM::GEOM_Gen_var)GEOM_Gen::_this()); + // add component to the use case tree + // (to support tree representation customization and drag-n-drop) + useCaseBuilder->SetRootCurrent(); + useCaseBuilder->Append(aComponent.in()); // component object is added as the top level item } - return aStudy; + return aComponent; } //============================================================================ @@ -2207,7 +2210,6 @@ void GEOM_Gen_i::Redo() // purpose : //============================================================================ GEOM::GEOM_IBasicOperations_ptr GEOM_Gen_i::GetIBasicOperations() - throw ( SALOME::SALOME_Exception ) { Unexpect aCatch(SALOME_SalomeException); MESSAGE( "GEOM_Gen_i::GetIBasicOperations" ); @@ -2229,7 +2231,6 @@ GEOM::GEOM_IBasicOperations_ptr GEOM_Gen_i::GetIBasicOperations() // purpose : //============================================================================ GEOM::GEOM_ITransformOperations_ptr GEOM_Gen_i::GetITransformOperations() - throw ( SALOME::SALOME_Exception ) { Unexpect aCatch(SALOME_SalomeException); MESSAGE( "GEOM_Gen_i::GetITransformOperations" ); @@ -2249,7 +2250,7 @@ GEOM::GEOM_ITransformOperations_ptr GEOM_Gen_i::GetITransformOperations() // purpose : //============================================================================ GEOM::GEOM_I3DPrimOperations_ptr GEOM_Gen_i::GetI3DPrimOperations() - throw ( SALOME::SALOME_Exception ) + { Unexpect aCatch(SALOME_SalomeException); MESSAGE( "GEOM_Gen_i::GetI3DPrimOperations" ); @@ -2270,7 +2271,7 @@ GEOM::GEOM_I3DPrimOperations_ptr GEOM_Gen_i::GetI3DPrimOperations() // purpose : //============================================================================ GEOM::GEOM_IShapesOperations_ptr GEOM_Gen_i::GetIShapesOperations() - throw ( SALOME::SALOME_Exception ) + { Unexpect aCatch(SALOME_SalomeException); MESSAGE( "GEOM_Gen_i::GetIShapesOperations" ); @@ -2290,7 +2291,7 @@ GEOM::GEOM_IShapesOperations_ptr GEOM_Gen_i::GetIShapesOperations() // purpose : //============================================================================ GEOM::GEOM_IBlocksOperations_ptr GEOM_Gen_i::GetIBlocksOperations() - throw ( SALOME::SALOME_Exception ) + { Unexpect aCatch(SALOME_SalomeException); MESSAGE( "GEOM_Gen_i::GetIBlocksOperations" ); @@ -2310,7 +2311,7 @@ GEOM::GEOM_IBlocksOperations_ptr GEOM_Gen_i::GetIBlocksOperations() // purpose : //============================================================================ GEOM::GEOM_IBooleanOperations_ptr GEOM_Gen_i::GetIBooleanOperations() - throw ( SALOME::SALOME_Exception ) + { Unexpect aCatch(SALOME_SalomeException); MESSAGE( "GEOM_Gen_i::GetIBooleanOperations" ); @@ -2330,7 +2331,7 @@ GEOM::GEOM_IBooleanOperations_ptr GEOM_Gen_i::GetIBooleanOperations() // purpose : //============================================================================ GEOM::GEOM_ICurvesOperations_ptr GEOM_Gen_i::GetICurvesOperations() - throw ( SALOME::SALOME_Exception ) + { Unexpect aCatch(SALOME_SalomeException); MESSAGE( "GEOM_Gen_i::GetICurvesOperations" ); @@ -2350,7 +2351,7 @@ GEOM::GEOM_ICurvesOperations_ptr GEOM_Gen_i::GetICurvesOperations() // purpose : //============================================================================ GEOM::GEOM_ILocalOperations_ptr GEOM_Gen_i::GetILocalOperations() - throw ( SALOME::SALOME_Exception ) + { Unexpect aCatch(SALOME_SalomeException); MESSAGE( "GEOM_Gen_i::GetILocalOperations" ); @@ -2370,7 +2371,7 @@ GEOM::GEOM_ILocalOperations_ptr GEOM_Gen_i::GetILocalOperations() // purpose : //============================================================================ GEOM::GEOM_IHealingOperations_ptr GEOM_Gen_i::GetIHealingOperations() - throw ( SALOME::SALOME_Exception ) + { Unexpect aCatch(SALOME_SalomeException); MESSAGE( "GEOM_Gen_i::IHealingOperations" ); @@ -2390,7 +2391,7 @@ GEOM::GEOM_IHealingOperations_ptr GEOM_Gen_i::GetIHealingOperations() // purpose : //============================================================================ GEOM::GEOM_IInsertOperations_ptr GEOM_Gen_i::GetIInsertOperations() - throw ( SALOME::SALOME_Exception ) + { Unexpect aCatch(SALOME_SalomeException); MESSAGE( "GEOM_Gen_i::GetIInsertOperations" ); @@ -2410,7 +2411,7 @@ GEOM::GEOM_IInsertOperations_ptr GEOM_Gen_i::GetIInsertOperations() // purpose : //============================================================================ GEOM::GEOM_IMeasureOperations_ptr GEOM_Gen_i::GetIMeasureOperations() - throw ( SALOME::SALOME_Exception ) + { Unexpect aCatch(SALOME_SalomeException); MESSAGE( "GEOM_Gen_i::GetIMeasureOperations" ); @@ -2430,7 +2431,7 @@ GEOM::GEOM_IMeasureOperations_ptr GEOM_Gen_i::GetIMeasureOperations() // purpose : //============================================================================ GEOM::GEOM_IGroupOperations_ptr GEOM_Gen_i::GetIGroupOperations() - throw ( SALOME::SALOME_Exception ) + { Unexpect aCatch(SALOME_SalomeException); MESSAGE( "GEOM_Gen_i::GetIGroupOperations" ); @@ -2450,7 +2451,7 @@ GEOM::GEOM_IGroupOperations_ptr GEOM_Gen_i::GetIGroupOperations() // purpose : //============================================================================ GEOM::GEOM_IFieldOperations_ptr GEOM_Gen_i::GetIFieldOperations() - throw ( SALOME::SALOME_Exception ) + { Unexpect aCatch(SALOME_SalomeException); MESSAGE( "GEOM_Gen_i::GetIFieldOperations" ); @@ -2465,12 +2466,50 @@ GEOM::GEOM_IFieldOperations_ptr GEOM_Gen_i::GetIFieldOperations() return operations._retn(); } +//============================================================================ +// function : GetITestOperations +// purpose : +//============================================================================ +GEOM::GEOM_ITestOperations_ptr GEOM_Gen_i::GetITestOperations() +{ + Unexpect aCatch(SALOME_SalomeException); + MESSAGE( "GEOM_Gen_i::GetITestOperations" ); + + GEOM::GEOM_Gen_ptr engine = _this(); + + GEOM_ITestOperations_i* aServant = + new GEOM_ITestOperations_i(_poa, engine, _impl->GetITestOperations()); + + // activate the CORBA servant + GEOM::GEOM_ITestOperations_var operations = aServant->_this(); + return operations._retn(); +} + +//============================================================================ +// function : GetICanonicalRecognition +// purpose : +//============================================================================ +GEOM::GEOM_ICanonicalRecognition_ptr GEOM_Gen_i::GetICanonicalRecognition() +{ + Unexpect aCatch(SALOME_SalomeException); + MESSAGE("GEOM_Gen_i::GetICanonicalRecognition"); + + GEOM::GEOM_Gen_ptr engine = _this(); + + GEOM_ICanonicalRecognition_i* aServant = + new GEOM_ICanonicalRecognition_i(_poa, engine, _impl->GetICanonicalRecognition()); + + // activate the CORBA servant + GEOM::GEOM_ICanonicalRecognition_var operations = aServant->_this(); + return operations._retn(); +} + //============================================================================ // function : GetPluginOperations // purpose : //============================================================================ GEOM::GEOM_IOperations_ptr GEOM_Gen_i::GetPluginOperations(const char* theLibName) - throw ( SALOME::SALOME_Exception ) + { Unexpect aCatch(SALOME_SalomeException); MESSAGE( "GEOM_Gen_i::GetPluginOperations" ); @@ -2521,10 +2560,20 @@ void GEOM_Gen_i::LoadPlugin(const std::string& theLibName) // check, if corresponding operations are already created if (myOpCreatorMap.find(theLibName) == myOpCreatorMap.end()) { +#if WIN32 + #if UNICODE + std::wstring strL = Kernel_Utils::utf8_decode_s(aPlatformLibName); + const wchar_t* aPath = strL.c_str(); + #else + const char* aPath = aPlatformLibName.c_str(); + #endif // load plugin library - LibHandle libHandle = LoadLib( aPlatformLibName.c_str() ); + LibHandle libHandle = LoadLib(aPath); +#else + LibHandle libHandle = LoadLib(aPlatformLibName.c_str()); +#endif if (!libHandle) { - // report any error, if occured + // report any error, if occurred #ifndef WIN32 throw(SALOME_Exception(dlerror())); #else @@ -2564,14 +2613,14 @@ GEOM::GEOM_Object_ptr GEOM_Gen_i::AddSubShape (GEOM::GEOM_Object_ptr theMainSh if (CORBA::is_nil(theMainShape) || theIndices.length() < 1) return GEOM::GEOM_Object::_nil(); CORBA::String_var entry = theMainShape->GetEntry(); - HANDLE_NAMESPACE(GEOM_Object) aMainShape = HANDLE_NAMESPACE(GEOM_Object)::DownCast + Handle(::GEOM_Object) aMainShape = Handle(::GEOM_Object)::DownCast ( _impl->GetObject( entry )); if (aMainShape.IsNull()) return GEOM::GEOM_Object::_nil(); Handle(TColStd_HArray1OfInteger) anArray = new TColStd_HArray1OfInteger(1, theIndices.length()); - for(Standard_Integer i = 0; iSetValue(i+1, theIndices[i]); + for(CORBA::ULong i = 0; iSetValue(i+1, theIndices[i]); - HANDLE_NAMESPACE(GEOM_Object) anObject = _impl->AddSubShape(aMainShape, anArray, true); + Handle(::GEOM_Object) anObject = _impl->AddSubShape(aMainShape, anArray, true); if(anObject.IsNull()) return GEOM::GEOM_Object::_nil(); TCollection_AsciiString anEntry; @@ -2587,7 +2636,7 @@ GEOM::GEOM_Object_ptr GEOM_Gen_i::AddSubShape (GEOM::GEOM_Object_ptr theMainSh void GEOM_Gen_i::RemoveObject(GEOM::GEOM_BaseObject_ptr theObject) { CORBA::String_var anEntry = theObject->GetEntry(); - HANDLE_NAMESPACE(GEOM_BaseObject) anObject = _impl->GetObject(anEntry, false); + Handle(::GEOM_BaseObject) anObject = _impl->GetObject(anEntry, false); if (!anObject.IsNull()) _impl->RemoveObject(anObject); } @@ -2622,7 +2671,7 @@ GEOM::GEOM_Object_ptr GEOM_Gen_i::GetIORFromString(const char* stringIOR) { GEOM::GEOM_BaseObject_ptr GEOM_Gen_i::GetObject (const char* theEntry) { GEOM::GEOM_BaseObject_var obj; - HANDLE_NAMESPACE(GEOM_BaseObject) handle_object = _impl->GetObject((char*)theEntry); + Handle(::GEOM_BaseObject) handle_object = _impl->GetObject((char*)theEntry); if (handle_object.IsNull()) return obj._retn(); TCollection_AsciiString stringIOR = handle_object->GetIOR(); @@ -2637,12 +2686,12 @@ GEOM::GEOM_BaseObject_ptr GEOM_Gen_i::GetObject (const char* theEntry) GEOM_BaseObject_i* servant = 0; switch( handle_object->GetType() ) { case GEOM_FIELD: { - servant = new GEOM_Field_i (_poa, engine, HANDLE_NAMESPACE(GEOM_Field)::DownCast( handle_object )); + servant = new GEOM_Field_i (_poa, engine, Handle(::GEOM_Field)::DownCast( handle_object )); break; } case GEOM_FIELD_STEP: { - HANDLE_NAMESPACE(GEOM_FieldStep) step = HANDLE_NAMESPACE(GEOM_FieldStep)::DownCast( handle_object ); - HANDLE_NAMESPACE(GEOM_Field) field = step->GetField(); + Handle(::GEOM_FieldStep) step = Handle(::GEOM_FieldStep)::DownCast( handle_object ); + Handle(::GEOM_Field) field = step->GetField(); int type = ( !field.IsNull() ? field->GetDataType() : 0 ); switch( type ) { case GEOM::FDT_Bool: @@ -2660,7 +2709,7 @@ GEOM::GEOM_BaseObject_ptr GEOM_Gen_i::GetObject (const char* theEntry) break; } default: - servant = new GEOM_Object_i (_poa, engine, HANDLE_NAMESPACE(GEOM_Object)::DownCast( handle_object )); + servant = new GEOM_Object_i (_poa, engine, Handle(::GEOM_Object)::DownCast( handle_object )); } PortableServer::ObjectId_var id = _poa->activate_object(servant); @@ -2805,6 +2854,18 @@ char* GEOM_Gen_i::getObjectInfo(const char* entry) case GEOM::GEOM_IKindOfShape::SEGMENT: aTypeInfo = "Segment"; break; + case GEOM::GEOM_IKindOfShape::CRV_BSPLINE: + aTypeInfo = "Crv BSpline"; + break; + case GEOM::GEOM_IKindOfShape::CRV_BEZIER: + aTypeInfo = "Crv Bezier"; + break; + case GEOM::GEOM_IKindOfShape::HYPERBOLA: + aTypeInfo = "Hyperbola"; + break; + case GEOM::GEOM_IKindOfShape::PARABOLA: + aTypeInfo = "Parabola"; + break; case GEOM::GEOM_IKindOfShape::EDGE: aTypeInfo = "Edge"; break; @@ -2845,6 +2906,11 @@ SALOMEDS::SObject_ptr GEOM_Gen_i::CreateFolder(const char* theName, { SALOMEDS::SObject_var aFolderSO; + if ( CORBA::is_nil(theFather) ) { + SALOMEDS::SComponent_var aComponent = findOrCreateComponent(); + if (aComponent->_is_nil()) return aFolderSO._retn(); + theFather = SALOMEDS::SObject::_narrow(aComponent); + } if ( CORBA::is_nil(theFather) ) return aFolderSO._retn(); SALOMEDS::GenericAttribute_var anAttr; @@ -2951,7 +3017,7 @@ void GEOM_Gen_i::Move( const GEOM::object_list& what, } } - for ( int i = 0; i < what.length(); i++ ) { + for ( CORBA::ULong i = 0; i < what.length(); i++ ) { SALOMEDS::SObject_var sobj = what[i]; if ( CORBA::is_nil( sobj ) ) continue; // skip bad object // insert the object to the use case tree @@ -2972,7 +3038,7 @@ SALOMEDS::TMPFile* GEOM_Gen_i::GetDependencyTree( const GEOM::string_array& theO GEOMUtils::TreeModel tree; std::string entry; - for ( int i = 0; i < theObjectEntries.length(); i++ ) { + for ( CORBA::ULong i = 0; i < theObjectEntries.length(); i++ ) { // process objects one-by-one entry = theObjectEntries[i].in(); GEOM::GEOM_BaseObject_var anObj = GetObject(entry.c_str() ); @@ -3015,7 +3081,7 @@ void GEOM_Gen_i::getUpwardDependency( GEOM::GEOM_BaseObject_ptr gbo, GEOMUtils::NodeLinks anEntries; GEOMUtils::LevelInfo aLevelMap; if ( level > 0 ) { - if ( level-1 >= upLevelList.size() ) { + if ( level-1 >= (int)upLevelList.size() ) { // create a new map upLevelList.push_back( aLevelMap ); } else { @@ -3029,7 +3095,7 @@ void GEOM_Gen_i::getUpwardDependency( GEOM::GEOM_BaseObject_ptr gbo, // get objects on that the current one depends GEOM::ListOfGBO_var depList = gbo->GetDependency(); std::string aDepEntry; - for( int j = 0; j < depList->length(); j++ ) { + for( CORBA::ULong j = 0; j < depList->length(); j++ ) { if ( depList[j]->_is_nil() ) continue; aDepEntry = depList[j]->GetEntry(); @@ -3062,7 +3128,7 @@ void GEOM_Gen_i::getDownwardDependency( GEOM::GEOM_BaseObject_ptr gbo, std::string aGboEntry = gbo->GetEntry(); Handle(TDocStd_Document) aDoc = GEOM_Engine::GetEngine()->GetDocument(); Handle(TDataStd_TreeNode) aNode, aRoot; - HANDLE_NAMESPACE(GEOM_Function) aFunction; + Handle(::GEOM_Function) aFunction; if (aDoc->Main().FindAttribute(GEOM_Function::GetFunctionTreeID(), aRoot)) { // go through the whole OCAF tree TDataStd_ChildNodeIterator Itr( aRoot ); @@ -3085,7 +3151,7 @@ void GEOM_Gen_i::getDownwardDependency( GEOM::GEOM_BaseObject_ptr gbo, continue; std::string aGoEntry = geomObj->GetEntry(); // go through dependencies of current object to check whether it depends on the given object - for( int i = 0; i < depList->length(); i++ ) { + for( CORBA::ULong i = 0; i < depList->length(); i++ ) { if ( depList[i]->_is_nil() ) continue; if ( depList[i]->_is_equivalent( gbo ) ) { @@ -3099,7 +3165,7 @@ void GEOM_Gen_i::getDownwardDependency( GEOM::GEOM_BaseObject_ptr gbo, GEOMUtils::NodeLinks anEntries; GEOMUtils::LevelInfo aLevelMap; anEntries.push_back( aGboEntry ); - if ( level >= downLevelList.size() ) { + if ( level >= (int)downLevelList.size() ) { downLevelList.push_back( aLevelMap ); } else { aLevelMap = downLevelList.at(level); @@ -3128,13 +3194,13 @@ void GEOM_Gen_i::GetEntriesToReduceStudy(GEOM::string_array& theSelectedEntries, GEOM::string_array& theOtherEntries) { std::set aSelected, aParents, aChildren, anOthers; - for ( int i = 0; i < theSelectedEntries.length(); i++ ) { + for ( CORBA::ULong i = 0; i < theSelectedEntries.length(); i++ ) { aSelected.insert( CORBA::string_dup( theSelectedEntries[i] ) ); } Handle(TDocStd_Document) aDoc = GEOM_Engine::GetEngine()->GetDocument(); Handle(TDataStd_TreeNode) aNode, aRoot; - HANDLE_NAMESPACE(GEOM_Function) aFunction; + Handle(::GEOM_Function) aFunction; if (aDoc->Main().FindAttribute(GEOM_Function::GetFunctionTreeID(), aRoot)) { // go through the whole OCAF tree TDF_Label aLabel; @@ -3180,12 +3246,12 @@ void GEOM_Gen_i::GetEntriesToReduceStudy(GEOM::string_array& theSelectedEntries, // because they could not be modified anyhow. std::set aToBeInSelected; for ( it = aSelected.begin(); it != aSelected.end(); ++it ) { - HANDLE_NAMESPACE(GEOM_BaseObject) handle_object = _impl->GetObject((*it).c_str(), false); + Handle(::GEOM_BaseObject) handle_object = _impl->GetObject((*it).c_str(), false); if ( handle_object.IsNull() ) continue; stringIOR = handle_object->GetIOR(); - if ( !stringIOR.Length() > 1 ) + if ( stringIOR.Length() < 1 ) continue; geomObj = GetIORFromString( stringIOR.ToCString() ); @@ -3254,7 +3320,7 @@ void GEOM_Gen_i::includeParentDependencies(GEOM::GEOM_BaseObject_ptr geomObj, return; // go through dependencies of current object to check whether it depends on the given object std::string aDepEntry; - for( int i = 0; i < depList->length(); i++ ) { + for( CORBA::ULong i = 0; i < depList->length(); i++ ) { aDepEntry = depList[i]->GetEntry(); if ( depList[i]->_is_nil() || aDepEntry == anEntry || // skip self-depending @@ -3277,11 +3343,11 @@ void GEOM_Gen_i::includeSubObjects(const std::string& aSelectedEntry, std::set& anOthers) { std::set::iterator foundIt; - HANDLE_NAMESPACE(GEOM_BaseObject) handle_object = _impl->GetObject(aSelectedEntry.c_str(), false); + Handle(::GEOM_BaseObject) handle_object = _impl->GetObject(aSelectedEntry.c_str(), false); if ( handle_object.IsNull() ) return; - HANDLE_NAMESPACE(GEOM_Function) aShapeFun = handle_object->GetFunction(1); + Handle(::GEOM_Function) aShapeFun = handle_object->GetFunction(1); if ( aShapeFun.IsNull() || !aShapeFun->HasSubShapeReferences() ) return; @@ -3308,24 +3374,4 @@ void GEOM_Gen_i::includeSubObjects(const std::string& aSelectedEntry, includeSubObjects( aSubEntryStr, aSelected, aParents, aChildren, anOthers ); } } -//===================================================================================== -// EXPORTED METHODS -//===================================================================================== -extern "C" -{ - /* - GEOM_I_EXPORT - PortableServer::ObjectId* GEOMEngine_factory(CORBA::ORB*, PortableServer::POA*, PortableServer::ObjectId*, const char*, const char*); - */ - - GEOM_I_EXPORT - PortableServer::ObjectId* GEOMEngine_factory(CORBA::ORB_ptr orb, - PortableServer::POA_ptr poa, - PortableServer::ObjectId* contId, - const char* instanceName, - const char* interfaceName) - { - GEOM_Gen_i* myGEOM_Gen_i = new GEOM_Gen_i(orb, poa, contId, instanceName, interfaceName); - return myGEOM_Gen_i->getId(); - } -} +