ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2025-01-13 18:20:34 +05:00
Code Issues Packages Projects Releases Wiki Activity

simplify createHypothesis()

Browse Source
This commit is contained in:
eap 2013-08-07 11:10:59 +00:00
parent 6db4726fc4
commit eb3f817bc6
1 changed files with 12 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/SMESH_I/SMESH_Gen_i.cxx
View File

@ -93,7 +93,7 @@
#include "SMESH_Mesh_i.hxx" #include "SMESH_Mesh_i.hxx"
#include "SMESH_PreMeshInfo.hxx" #include "SMESH_PreMeshInfo.hxx"
#include "SMESH_PythonDump.hxx" #include "SMESH_PythonDump.hxx"
#include "memoire.h" //#include "memoire.h"
#include CORBA_SERVER_HEADER(SMESH_Group) #include CORBA_SERVER_HEADER(SMESH_Group)
#include CORBA_SERVER_HEADER(SMESH_Filter) #include CORBA_SERVER_HEADER(SMESH_Filter)
@ -360,10 +360,10 @@ SMESH_Gen_i::~SMESH_Gen_i()
//============================================================================= //=============================================================================
SMESH::SMESH_Hypothesis_ptr SMESH_Gen_i::createHypothesis(const char* theHypName, SMESH::SMESH_Hypothesis_ptr SMESH_Gen_i::createHypothesis(const char* theHypName,
const char* theLibName) const char* theLibName)
throw (SALOME::SALOME_Exception) throw (SALOME::SALOME_Exception)
{ {
/* It's Need to tranlate lib name for WIN32 or X platform */ /* It's Need to tranlate lib name for WIN32 or X platform */
char* aPlatformLibName = 0; std::string aPlatformLibName;
if ( theLibName && theLibName[0] != '\0' ) if ( theLibName && theLibName[0] != '\0' )
{ {
int libNameLen = strlen(theLibName); int libNameLen = strlen(theLibName);
@ -374,39 +374,24 @@ SMESH::SMESH_Hypothesis_ptr SMESH_Gen_i::createHypothesis(const char* theHypName
{ {
//the old format //the old format
#ifdef WNT #ifdef WNT
aPlatformLibName = new char[libNameLen - 1]; aPlatformLibName = std::string( theLibName+3, libNameLen-6 ) + ".dll";
aPlatformLibName[0] = '\0';
aPlatformLibName = strncat( aPlatformLibName, theLibName+3, libNameLen-6 );
aPlatformLibName = strcat( aPlatformLibName, ".dll" );
aPlatformLibName[libNameLen - 2] = '\0';
#else #else
aPlatformLibName = new char[ libNameLen + 1]; aPlatformLibName = theLibName;
aPlatformLibName[0] = '\0';
aPlatformLibName = strcat( aPlatformLibName, theLibName );
aPlatformLibName[libNameLen] = '\0';
#endif #endif
} }
else else
{ {
//try to use new format //try to use new format
#ifdef WNT #ifdef WNT
aPlatformLibName = new char[ libNameLen + 5 ]; aPlatformLibName = theLibName + ".dll";
aPlatformLibName[0] = '\0';
aPlatformLibName = strcat( aPlatformLibName, theLibName );
aPlatformLibName = strcat( aPlatformLibName, ".dll" );
#else #else
aPlatformLibName = new char[ libNameLen + 7 ]; aPlatformLibName = "lib" + std::string( theLibName ) + ".so";
aPlatformLibName[0] = '\0';
aPlatformLibName = strcat( aPlatformLibName, "lib" );
aPlatformLibName = strcat( aPlatformLibName, theLibName );
aPlatformLibName = strcat( aPlatformLibName, ".so" );
#endif #endif
} }
} }
Unexpect aCatch(SALOME_SalomeException); Unexpect aCatch(SALOME_SalomeException);
if(MYDEBUG) MESSAGE( "Create Hypothesis <" << theHypName << "> from " << aPlatformLibName/*theLibName*/); if(MYDEBUG) MESSAGE( "Create Hypothesis <" << theHypName << "> from " << aPlatformLibName);
// create a new hypothesis object servant // create a new hypothesis object servant
SMESH_Hypothesis_i* myHypothesis_i = 0; SMESH_Hypothesis_i* myHypothesis_i = 0;
@ -419,7 +404,7 @@ SMESH::SMESH_Hypothesis_ptr SMESH_Gen_i::createHypothesis(const char* theHypName
{ {
// load plugin library // load plugin library
if(MYDEBUG) MESSAGE("Loading server meshers plugin library ..."); if(MYDEBUG) MESSAGE("Loading server meshers plugin library ...");
LibHandle libHandle = LoadLib( aPlatformLibName/*theLibName*/ ); LibHandle libHandle = LoadLib( aPlatformLibName.c_str() );
if (!libHandle) if (!libHandle)
{ {
// report any error, if occured // report any error, if occured
@ -458,21 +443,18 @@ SMESH::SMESH_Hypothesis_ptr SMESH_Gen_i::createHypothesis(const char* theHypName
if(MYDEBUG) MESSAGE("Create Hypothesis " << theHypName); if(MYDEBUG) MESSAGE("Create Hypothesis " << theHypName);
myHypothesis_i = myHypothesis_i =
myHypCreatorMap[string(theHypName)]->Create(myPoa, GetCurrentStudyID(), &myGen); myHypCreatorMap[string(theHypName)]->Create(myPoa, GetCurrentStudyID(), &myGen);
myHypothesis_i->SetLibName(aPlatformLibName/*theLibName*/); // for persistency assurance myHypothesis_i->SetLibName(aPlatformLibName.c_str()); // for persistency assurance
} }
catch (SALOME_Exception& S_ex) catch (SALOME_Exception& S_ex)
{ {
THROW_SALOME_CORBA_EXCEPTION(S_ex.what(), SALOME::BAD_PARAM); THROW_SALOME_CORBA_EXCEPTION(S_ex.what(), SALOME::BAD_PARAM);
} }
if ( aPlatformLibName )
delete[] aPlatformLibName;
if (!myHypothesis_i) if (!myHypothesis_i)
return hypothesis_i._retn(); return hypothesis_i._retn();
// activate the CORBA servant of hypothesis // activate the CORBA servant of hypothesis
hypothesis_i = SMESH::SMESH_Hypothesis::_narrow( myHypothesis_i->_this() ); hypothesis_i = myHypothesis_i->_this();
int nextId = RegisterObject( hypothesis_i ); int nextId = RegisterObject( hypothesis_i );
if(MYDEBUG) { MESSAGE( "Add hypo to map with id = "<< nextId ); } if(MYDEBUG) { MESSAGE( "Add hypo to map with id = "<< nextId ); }
else { nextId = 0; } // avoid "unused variable" warning in release mode else { nextId = 0; } // avoid "unused variable" warning in release mode
@ -1712,7 +1694,7 @@ CORBA::Boolean SMESH_Gen_i::Compute( SMESH::SMESH_Mesh_ptr theMesh,
GEOM::GEOM_Object_ptr theShapeObject ) GEOM::GEOM_Object_ptr theShapeObject )
throw ( SALOME::SALOME_Exception ) throw ( SALOME::SALOME_Exception )
{ {
MEMOSTAT; //MEMOSTAT;
Unexpect aCatch(SALOME_SalomeException); Unexpect aCatch(SALOME_SalomeException);
if(MYDEBUG) MESSAGE( "SMESH_Gen_i::Compute" ); if(MYDEBUG) MESSAGE( "SMESH_Gen_i::Compute" );