mirror of
https://git.salome-platform.org/gitpub/modules/smesh.git
synced 2024-11-11 16:19:16 +05:00
parent
095b97dbbd
commit
e8af688e3b
@ -376,7 +376,7 @@ bool SMESH_Gen::Compute(SMESH_Mesh & aMesh,
|
||||
|
||||
const TopoDS_Shape& aSubShape = smToCompute->GetSubShape();
|
||||
const int aShapeDim = GetShapeDim( aSubShape );
|
||||
if ( aShapeDim < 1 || aSubShape.ShapeType() == shapeType )
|
||||
if ( aShapeDim < 1 || aSubShape.ShapeType() <= shapeType )
|
||||
continue;
|
||||
|
||||
// check for preview dimension limitations
|
||||
|
@ -2209,7 +2209,7 @@ TopoDS_Shape SMESH_subMesh::getCollection(SMESH_Gen * /*theGen*/,
|
||||
}
|
||||
}
|
||||
|
||||
return aCompound;
|
||||
return theSubs.size() == 1 ? theSubs[0]->GetSubShape() : aCompound;
|
||||
}
|
||||
|
||||
//=======================================================================
|
||||
|
@ -189,22 +189,22 @@ PortableServer::ServantBase_var SMESH_Gen_i::GetServant( CORBA::Object_ptr theOb
|
||||
}
|
||||
catch (PortableServer::POA::ObjectNotActive &ex)
|
||||
{
|
||||
INFOS("GetServant: ObjectNotActive");
|
||||
MESSAGE("GetServant: ObjectNotActive");
|
||||
return NULL;
|
||||
}
|
||||
catch (PortableServer::POA::WrongAdapter &ex)
|
||||
{
|
||||
INFOS("GetServant: WrongAdapter: OK when several servants used to build several mesh in parallel...");
|
||||
MESSAGE("GetServant: WrongAdapter: OK when several servants used to build several mesh in parallel...");
|
||||
return NULL;
|
||||
}
|
||||
catch (PortableServer::POA::WrongPolicy &ex)
|
||||
{
|
||||
INFOS("GetServant: WrongPolicy");
|
||||
MESSAGE("GetServant: WrongPolicy");
|
||||
return NULL;
|
||||
}
|
||||
catch (...)
|
||||
{
|
||||
INFOS( "GetServant - Unknown exception was caught!!!" );
|
||||
MESSAGE( "GetServant - Unknown exception was caught!!!" );
|
||||
return NULL;
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user