From: vsr Date: Fri, 11 Oct 2013 12:58:32 +0000 (+0000) Subject: Merge from V7_siman 11/10/2013 X-Git-Tag: V7_3_0a1~127 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=5651bafb1c68eeddb0f9cc9f77fb3cd97aa6e1eb;p=modules%2Fsmesh.git Merge from V7_siman 11/10/2013 --- diff --git a/src/SMESH_I/SMESH_Gen_i.cxx b/src/SMESH_I/SMESH_Gen_i.cxx index 2ddeaa863..a5b429431 100644 --- a/src/SMESH_I/SMESH_Gen_i.cxx +++ b/src/SMESH_I/SMESH_Gen_i.cxx @@ -103,10 +103,12 @@ #include #include +#include #include #include #include #include +#include #include #include #include @@ -294,6 +296,9 @@ SMESH_Gen_i::SMESH_Gen_i( CORBA::ORB_ptr orb, myIsHistoricalPythonDump = true; myToForgetMeshDataOnHypModif = false; + myImportedStudyChanged = true; + myImportedStudyId = 0; + // set it in standalone mode only //OSD::SetSignal( true ); @@ -4941,6 +4946,8 @@ int SMESH_Gen_i::RegisterObject(CORBA::Object_ptr theObject) { StudyContext* myStudyContext = GetCurrentStudyContext(); if ( myStudyContext && !CORBA::is_nil( theObject )) { + if (GetCurrentStudyID() == myImportedStudyId) + myImportedStudyChanged = true; CORBA::String_var iorString = GetORB()->object_to_string( theObject ); return myStudyContext->addObject( string( iorString.in() ) ); } @@ -5039,6 +5046,140 @@ void SMESH_Gen_i::Move( const SMESH::sobject_list& what, } } +//================================================================================= +// function : importData +// purpose : imports mesh data file (the med one) into the SMESH internal data structure +//================================================================================= +Engines::ListOfIdentifiers* SMESH_Gen_i::importData( + CORBA::Long studyId, Engines::DataContainer_ptr data, const Engines::ListOfOptions& options) +{ + Engines::ListOfIdentifiers_var aResultIds = new Engines::ListOfIdentifiers; + list aResultList; + + CORBA::Object_var aSMObject = myNS->Resolve( "/myStudyManager" ); + SALOMEDS::StudyManager_var aStudyManager = SALOMEDS::StudyManager::_narrow( aSMObject ); + SALOMEDS::Study_var aStudy = aStudyManager->GetStudyByID( studyId ); + SetCurrentStudy(aStudy); + + // load and store temporary imported file + string aFileName = Kernel_Utils::GetTmpFileName(); + aFileName += string(".") + data->extension(); + Engines::TMPFile* aFileStream = data->get(); + const char *aBuffer = (const char*)aFileStream->NP_data(); +#ifdef WIN32 + std::ofstream aFile(aFileName.c_str(), std::ios::binary); +#else + std::ofstream aFile(aFileName.c_str()); +#endif + aFile.write(aBuffer, aFileStream->length()); + aFile.close(); + + // Retrieve mesh names from the file + DriverMED_R_SMESHDS_Mesh aReader; + aReader.SetFile( aFileName ); + aReader.SetMeshId(-1); + Driver_Mesh::Status aStatus; + list aNames = aReader.GetMeshNames(aStatus); + SMESH::mesh_array_var aResult = new SMESH::mesh_array(); + SMESH::DriverMED_ReadStatus aStatus2 = (SMESH::DriverMED_ReadStatus)aStatus; + if (aStatus2 == SMESH::DRS_OK) { + // Iterate through all meshes and create mesh objects + for ( list::iterator it = aNames.begin(); it != aNames.end(); it++ ) { + // create mesh + SMESH::SMESH_Mesh_var mesh = createMesh(); + + // publish mesh in the study + SALOMEDS::SObject_var aSO; + if (CanPublishInStudy(mesh)) { + aSO = PublishMesh(aStudy, mesh.in(), (*it).c_str()); + aResultList.push_back(aSO->GetID()); + } + // Read mesh data (groups are published automatically by ImportMEDFile()) + SMESH_Mesh_i* meshServant = dynamic_cast( GetServant( mesh ).in() ); + ASSERT( meshServant ); + meshServant->ImportMEDFile( aFileName.c_str(), (*it).c_str() ); + //meshServant->GetImpl().GetMeshDS()->Modified(); + } + } else { + MESSAGE("Opening MED file problems "<length(aResultList.size()); + list::iterator aListIter = aResultList.begin(); + for(int a = 0; aListIter != aResultList.end(); aListIter++, a++) + aResultIds[a] = aListIter->c_str(); + } + + myImportedStudyId = studyId; + myImportedStudyChanged = false; + + return aResultIds._retn(); +} + +//================================================================================= +// function : getModifiedData +// purpose : exports all geometry of this GEOM module into one BRep file +//================================================================================= +Engines::ListOfData* SMESH_Gen_i::getModifiedData(CORBA::Long studyId) +{ + Engines::ListOfData_var aResult = new Engines::ListOfData; + + if (!myImportedStudyChanged) { + INFOS("SMESH module data was not changed") + return aResult._retn(); + } + + CORBA::Object_var aSMObject = myNS->Resolve("/myStudyManager"); + SALOMEDS::StudyManager_var aStudyManager = SALOMEDS::StudyManager::_narrow(aSMObject); + SALOMEDS::Study_var aStudy = aStudyManager->GetStudyByID(studyId); + SetCurrentStudy(aStudy); + SALOMEDS::SComponent_var aComponent = aStudy->FindComponent("SMESH"); + + if (CORBA::is_nil(aComponent)) + return aResult._retn(); + + std::string aFullPath(Kernel_Utils::GetTmpFileName()); + aFullPath += ".med"; + StudyContext* myStudyContext = GetCurrentStudyContext(); + + SALOMEDS::ChildIterator_var anIter = aStudy->NewChildIterator(aComponent); // check only published meshes + int aNumMeshes = 0; // number of meshes in result + for(; anIter->More(); anIter->Next()) { + SALOMEDS::SObject_var aSO = anIter->Value(); + CORBA::Object_var anObj = aSO->GetObject(); + if (!CORBA::is_nil(anObj)) { + SMESH::SMESH_Mesh_var aCORBAMesh = SMESH::SMESH_Mesh::_narrow(anObj); + if(!aCORBAMesh->_is_nil()) { + SMESH_Mesh_i* myImpl = dynamic_cast(GetServant(aCORBAMesh).in()); + if (myImpl) { + myImpl->Load(); + SMESH_Mesh& aMesh = myImpl->GetImpl(); + CORBA::String_var objName = aSO->GetName(); + aMesh.ExportMED(aFullPath.c_str(), objName.in(), false, MED::eV2_2, 0); + aNumMeshes++; + } + } + } + } + if (aNumMeshes > 0) { // prepare a container to store files + INFOS("Write "<length(1); + Engines::DataContainer_var aData = (new Engines_DataContainer_i( + aFullPath.c_str(), "", "", true))->_this(); + aResult[0] = aData; + } + return aResult._retn(); +} + //============================================================================= /*! * SMESHEngine_factory diff --git a/src/SMESH_I/SMESH_Gen_i.hxx b/src/SMESH_I/SMESH_Gen_i.hxx index f3e20f304..4e2b9b754 100644 --- a/src/SMESH_I/SMESH_Gen_i.hxx +++ b/src/SMESH_I/SMESH_Gen_i.hxx @@ -484,6 +484,12 @@ public: void CleanPythonTrace (int theStudyID); + // SIMAN-related functions (check out/check in) : import data to study + virtual Engines::ListOfIdentifiers* importData(CORBA::Long studyId, + Engines::DataContainer_ptr data, + const Engines::ListOfOptions& options); + // SIMAN-related functions (check out/check in) : get modified data + virtual Engines::ListOfData* getModifiedData(CORBA::Long studyId); // ***************************************** // Internal methods @@ -637,6 +643,8 @@ private: std::vector< int > myLastParamIndex; std::vector< std::string > myLastParameters; std::string myLastObj; + int myImportedStudyId; // SIMAN: identifier of the imported in importData study to keep no-modifiection flag for getModifiedData method + int myImportedStudyChanged; // SIMAN: flag that indicates that the imported study has been changed (by creation of the additional mesh) };