ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2024-12-27 09:50:34 +05:00
Code Issues Packages Projects Releases Wiki Activity

COTECH: Update names of DISTENE products

Browse Source 
BLSURF -> MG-CADSurf
GHS3D -> MG-Tetra
Hexotic -> MG-Hexa

and

GHS3DPRL -> MG-Tetra Parallel
This commit is contained in:
eap 2014-09-09 14:19:51 +04:00
parent d0cb9e8d04
commit b5bc313d9b
2 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/SMESHGUI/SMESHGUI_XmlHandler.cxx
View File

@ -161,7 +161,7 @@ bool SMESHGUI_XmlHandler::startElement (const QString&, const QString&,
for ( int i = 0; i < NB_ATTRIBUTES; ++i ) { for ( int i = 0; i < NB_ATTRIBUTES; ++i ) {
QString aStr = atts.value( name[i] ); QString aStr = atts.value( name[i] );
if ( !aStr.isEmpty() ) { if ( !aStr.isEmpty() ) {
aStr.remove( ' ' ); aStr = aStr.trimmed();
attr[ i ] = aStr.split( ',', QString::SkipEmptyParts ); attr[ i ] = aStr.split( ',', QString::SkipEmptyParts );
} }
} }

19
src/SMESH_I/SMESH_Gen_i.cxx
View File

@ -467,23 +467,22 @@ SMESH::SMESH_Hypothesis_ptr SMESH_Gen_i::createHypothesis(const char* theHypName
SMESH_Hypothesis_i* myHypothesis_i = 0; SMESH_Hypothesis_i* myHypothesis_i = 0;
SMESH::SMESH_Hypothesis_var hypothesis_i; SMESH::SMESH_Hypothesis_var hypothesis_i;
std::string aPlatformLibName; std::string aPlatformLibName;
typedef GenericHypothesisCreator_i* (*GetHypothesisCreator)(const char* ); GenericHypothesisCreator_i* aCreator =
GenericHypothesisCreator_i* aCreator = getHypothesisCreator(theHypName, theLibName, aPlatformLibName); getHypothesisCreator(theHypName, theLibName, aPlatformLibName);
// create a new hypothesis object, store its ref. in studyContext
if(MYDEBUG) MESSAGE("Create Hypothesis " << theHypName);
myHypothesis_i =
myHypCreatorMap[string(theHypName)]->Create(myPoa, GetCurrentStudyID(), &myGen);
myHypothesis_i->SetLibName(aPlatformLibName.c_str()); // for persistency assurance
if (!myHypothesis_i) // create a new hypothesis object, store its ref. in studyContext
return hypothesis_i._retn(); myHypothesis_i = aCreator->Create(myPoa, GetCurrentStudyID(), &myGen);
if (myHypothesis_i)
{
myHypothesis_i->SetLibName(aPlatformLibName.c_str()); // for persistency assurance
myHypCreatorMap[ myHypothesis_i->GetName() ] = aCreator;
// activate the CORBA servant of hypothesis // activate the CORBA servant of hypothesis
hypothesis_i = 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
}
return hypothesis_i._retn(); return hypothesis_i._retn();
} }