mirror of
https://git.salome-platform.org/gitpub/modules/smesh.git
synced 2024-12-31 03:40:34 +05:00
fix PAL8469. Set "Warning" icon to just published mesh or submesh
This commit is contained in:
parent
aef60913e5
commit
19e44ed37c
@ -471,7 +471,7 @@ SALOMEDS::SObject_ptr SMESH_Gen_i::PublishMesh (SALOMEDS::Study_ptr theStudy,
|
|||||||
else
|
else
|
||||||
aTag++;
|
aTag++;
|
||||||
|
|
||||||
aMeshSO = publish (theStudy, theMesh, father, aTag, "ICON_SMESH_TREE_MESH" );
|
aMeshSO = publish (theStudy, theMesh, father, aTag, "ICON_SMESH_TREE_MESH_WARN" );
|
||||||
if ( aMeshSO->_is_nil() )
|
if ( aMeshSO->_is_nil() )
|
||||||
return aMeshSO._retn();
|
return aMeshSO._retn();
|
||||||
}
|
}
|
||||||
@ -593,7 +593,7 @@ SALOMEDS::SObject_ptr SMESH_Gen_i::PublishSubMesh (SALOMEDS::Study_ptr theS
|
|||||||
SetName( aRootSO, aRootName );
|
SetName( aRootSO, aRootName );
|
||||||
|
|
||||||
// Add new submesh to corresponding sub-tree
|
// Add new submesh to corresponding sub-tree
|
||||||
aSubMeshSO = publish (theStudy, theSubMesh, aRootSO, 0, "ICON_SMESH_TREE_MESH");
|
aSubMeshSO = publish (theStudy, theSubMesh, aRootSO, 0, "ICON_SMESH_TREE_MESH_WARN");
|
||||||
if ( aSubMeshSO->_is_nil() )
|
if ( aSubMeshSO->_is_nil() )
|
||||||
return aSubMeshSO._retn();
|
return aSubMeshSO._retn();
|
||||||
}
|
}
|
||||||
@ -773,7 +773,19 @@ bool SMESH_Gen_i::AddHypothesisToShape(SALOMEDS::Study_ptr theStudy,
|
|||||||
SALOMEDS::SObject_var aMeshOrSubMesh =
|
SALOMEDS::SObject_var aMeshOrSubMesh =
|
||||||
GetMeshOrSubmeshByShape( theStudy, theMesh, theShape );
|
GetMeshOrSubmeshByShape( theStudy, theMesh, theShape );
|
||||||
if ( aMeshOrSubMesh->_is_nil() )
|
if ( aMeshOrSubMesh->_is_nil() )
|
||||||
return false;
|
{
|
||||||
|
// publish submesh
|
||||||
|
TopoDS_Shape aShape = GeomObjectToShape( theShape );
|
||||||
|
SMESH_Mesh_i* mesh_i = objectToServant<SMESH_Mesh_i>( theMesh );
|
||||||
|
if ( !aShape.IsNull() && mesh_i && mesh_i->GetImpl().GetMeshDS() ) {
|
||||||
|
SMESHDS_Mesh* meshDS = mesh_i->GetImpl().GetMeshDS();
|
||||||
|
int shapeID = meshDS->ShapeToIndex( aShape );
|
||||||
|
SMESH::SMESH_subMesh_var aSubMesh = mesh_i->getSubMesh(shapeID);
|
||||||
|
aMeshOrSubMesh = PublishSubMesh( theStudy, theMesh, aSubMesh, theShape );
|
||||||
|
}
|
||||||
|
if ( aMeshOrSubMesh->_is_nil() )
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
//Find or Create Applied Hypothesis root
|
//Find or Create Applied Hypothesis root
|
||||||
bool aIsAlgo = !SMESH::SMESH_Algo::_narrow( theHyp )->_is_nil();
|
bool aIsAlgo = !SMESH::SMESH_Algo::_narrow( theHyp )->_is_nil();
|
||||||
|
Loading…
Reference in New Issue
Block a user