ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2024-11-11 16:19:16 +05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'V8_3_BR' into V8_4_BR

Browse Source
This commit is contained in:
vsr 2018-03-30 17:20:40 +03:00
commit 204a3246f4
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/SMESHGUI/SMESHGUI.cxx
View File

@ -1850,20 +1850,24 @@ void SMESHGUI::OnEditDelete()
int objectCount = 0;
QString aNameList;
QString aParentComponent = QString::null;
Handle(SALOME_InteractiveObject) anIO;
for( SALOME_ListIteratorOfListIO anIt( selected ); anIt.More(); anIt.Next() )
{
anIO = anIt.Value();
QString cur = anIO->getComponentDataType();
_PTR(SObject) aSO = aStudy->FindObjectID(anIO->getEntry());
Handle(SALOME_InteractiveObject) anIO = anIt.Value();
if ( anIO.IsNull() ) continue;
QString father = "unknown";
_PTR(SObject) aSO = aStudy->FindObjectID( anIO->getEntry() );
if (aSO) {
father = QString::fromStdString( aSO->GetFatherComponent()->ComponentDataType() );
// check if object is reference
_PTR(SObject) aRefSObj;
aNameList.append("\n - ");
if ( aSO->ReferencedObject( aRefSObj ) ) {
QString aRefName = QString::fromStdString ( aRefSObj->GetName() );
aNameList.append( aRefName );
cur = QString::fromStdString ( aRefSObj->GetFatherComponent()->ComponentDataType() );
father = QString::fromStdString ( aRefSObj->GetFatherComponent()->ComponentDataType() );
}
else
aNameList.append(anIO->getName());
@ -1871,8 +1875,8 @@ void SMESHGUI::OnEditDelete()
}
if( aParentComponent.isNull() )
aParentComponent = cur;
else if( !aParentComponent.isEmpty() && aParentComponent!=cur )
aParentComponent = father;
else if( !aParentComponent.isEmpty() && aParentComponent!=father )
aParentComponent = "";
}