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

0022172: [CEA 790] create the groups corresponding to domains

Browse Source 
Fix dump of AddHypothesis() in the case w/o geometry
This commit is contained in:
eap 2013-05-24 11:57:38 +00:00
parent 0f7414545b
commit 401090842f
1 changed files with 23 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/SMESH_I/SMESH_Mesh_i.cxx
View File

@ -583,13 +583,13 @@ SMESH::Hypothesis_Status SMESH_Mesh_i::AddHypothesis(GEOM::GEOM_Object_ptr
if(MYDEBUG) MESSAGE( " AddHypothesis(): status = " << status ); if(MYDEBUG) MESSAGE( " AddHypothesis(): status = " << status );
// Update Python script // Update Python script
if(_impl->HasShapeToMesh()) { //if(_impl->HasShapeToMesh()) {
TPythonDump() << "status = " << _this() << ".AddHypothesis( " TPythonDump() << "status = " << _this() << ".AddHypothesis( "
<< aSubShapeObject << ", " << anHyp << " )"; << aSubShapeObject << ", " << anHyp << " )";
} // }
else { // else {
TPythonDump() << "status = " << _this() << ".AddHypothesis( "<< anHyp << " )"; // TPythonDump() << "status = " << _this() << ".AddHypothesis( "<< anHyp << " )";
} // }
return ConvertHypothesisStatus(status); return ConvertHypothesisStatus(status);
} }
@ -1109,30 +1109,27 @@ SMESH::ListOfGroups * SMESH_Mesh_i::GetGroups() throw(SALOME::SALOME_Exception)
// Python Dump // Python Dump
TPythonDump aPythonDump; TPythonDump aPythonDump;
if ( !_mapGroups.empty() ) // (IMP13463) avoid "SyntaxError: can't assign to []" if ( !_mapGroups.empty() )
{
aPythonDump << "[ "; aPythonDump << "[ ";
try {
try { aList->length( _mapGroups.size() );
aList->length( _mapGroups.size() ); int i = 0;
int i = 0; map<int, SMESH::SMESH_GroupBase_ptr>::iterator it = _mapGroups.begin();
map<int, SMESH::SMESH_GroupBase_ptr>::iterator it = _mapGroups.begin(); for ( ; it != _mapGroups.end(); it++ ) {
for ( ; it != _mapGroups.end(); it++ ) { if ( CORBA::is_nil( it->second )) continue;
if ( CORBA::is_nil( it->second )) continue; aList[i++] = SMESH::SMESH_GroupBase::_duplicate( it->second );
aList[i++] = SMESH::SMESH_GroupBase::_duplicate( it->second ); // Python Dump
// Python Dump if (i > 1) aPythonDump << ", ";
if (i > 1) aPythonDump << ", "; aPythonDump << it->second;
aPythonDump << it->second; }
aList->length( i );
}
catch(SALOME_Exception & S_ex) {
THROW_SALOME_CORBA_EXCEPTION(S_ex.what(), SALOME::BAD_PARAM);
} }
aList->length( i );
}
catch(SALOME_Exception & S_ex) {
THROW_SALOME_CORBA_EXCEPTION(S_ex.what(), SALOME::BAD_PARAM);
}
// Update Python script
if ( !_mapGroups.empty() ) // (IMP13463) avoid "SyntaxError: can't assign to []"
aPythonDump << " ] = " << _this() << ".GetGroups()"; aPythonDump << " ] = " << _this() << ".GetGroups()";
}
return aList._retn(); return aList._retn();
} }