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

22455: Error "No mesh elements assigned to a face" is raised instead of a simple warning

Browse Source 
1) Fix finding a shape in a study
2) Append study entry to a name of published failed sub-shape
This commit is contained in:
eap 2014-01-10 08:01:57 +00:00
parent dda95cb5b7
commit b117205bfd
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/SMESHGUI/SMESHGUI_ComputeDlg.cxx
View File

@ -382,10 +382,14 @@ namespace SMESH
if ( !geom->_is_nil() ) { if ( !geom->_is_nil() ) {
GEOM::ListOfLong_var list = geom->GetSubShapeIndices(); GEOM::ListOfLong_var list = geom->GetSubShapeIndices();
if ( list->length() == 1 && list[0] == subShapeID ) if ( list->length() == 1 && list[0] == subShapeID )
{
GEOM::GEOM_Object_var mainGO = geom->GetMainShape();
if ( aMainShape->IsSame( mainGO ))
subSO = it->Value(); subSO = it->Value();
} }
} }
} }
}
return subSO; return subSO;
} }
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
@ -1193,7 +1197,8 @@ void SMESHGUI_BaseComputeOp::onPublishShape()
if ( so->_is_nil() ) { if ( so->_is_nil() ) {
CORBA::String_var name = so->GetName(); CORBA::String_var name = so->GetName();
CORBA::String_var entry = so->GetID(); CORBA::String_var entry = so->GetID();
table()->item( r, COL_SHAPE )->setText( name.in() ); QString shapeText = QString("%1 (%2)").arg( name.in() ).arg( entry.in() );
table()->item( r, COL_SHAPE )->setText( shapeText );
table()->item( r, COL_PUBLISHED )->setText( entry.in() ); table()->item( r, COL_PUBLISHED )->setText( entry.in() );
} }
break; break;
@ -1206,7 +1211,8 @@ void SMESHGUI_BaseComputeOp::onPublishShape()
if ( !so->_is_nil() ) { if ( !so->_is_nil() ) {
CORBA::String_var name = so->GetName(); CORBA::String_var name = so->GetName();
CORBA::String_var entry = so->GetID(); CORBA::String_var entry = so->GetID();
table()->item( row, COL_SHAPE )->setText( name.in() ); QString shapeText = QString("%1 (%2)").arg( name.in() ).arg( entry.in() );
table()->item( row, COL_SHAPE )->setText( shapeText );
table()->item( row, COL_PUBLISHED )->setText( entry.in() ); table()->item( row, COL_PUBLISHED )->setText( entry.in() );
} }
} }