ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2025-01-18 15:50:33 +05:00
Code Issues Packages Projects Releases Wiki Activity

0020082: EDF 869 GEOM : Edges Orientation indicator/reverse

Browse Source
This commit is contained in:
dmv 2009-09-15 14:16:35 +00:00
parent 3e09f90deb
commit 067947492f
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/SMESHGUI/SMESHGUI_MeshOp.cxx
View File

@ -1085,6 +1085,7 @@ void SMESHGUI_MeshOp::createHypothesis(const int theDim,
if ( aMeshEntry == "" && aGeomEntry == "" ) { if ( aMeshEntry == "" && aGeomEntry == "" ) {
_PTR(SObject) pObj = studyDS()->FindObjectID( anObjEntry.toLatin1().data() ); _PTR(SObject) pObj = studyDS()->FindObjectID( anObjEntry.toLatin1().data() );
GEOM::GEOM_Object_var aGeomVar = SMESH::GetShapeOnMeshOrSubMesh( pObj ); GEOM::GEOM_Object_var aGeomVar = SMESH::GetShapeOnMeshOrSubMesh( pObj );
if ( !aGeomVar->_is_nil() )
aGeomEntry = aGeomVar->GetStudyEntry(); aGeomEntry = aGeomVar->GetStudyEntry();
} }
@ -1099,6 +1100,7 @@ void SMESHGUI_MeshOp::createHypothesis(const int theDim,
if ( !aMeshVar->_is_nil() ) { if ( !aMeshVar->_is_nil() ) {
_PTR(SObject) aMeshSO = SMESH::FindSObject( aMeshVar ); _PTR(SObject) aMeshSO = SMESH::FindSObject( aMeshVar );
GEOM::GEOM_Object_var aGeomVar = SMESH::GetShapeOnMeshOrSubMesh( aMeshSO ); GEOM::GEOM_Object_var aGeomVar = SMESH::GetShapeOnMeshOrSubMesh( aMeshSO );
if ( !aGeomVar->_is_nil() )
aMeshEntry = aGeomVar->GetStudyEntry(); aMeshEntry = aGeomVar->GetStudyEntry();
} }
} }
@ -1206,6 +1208,7 @@ void SMESHGUI_MeshOp::onEditHyp( const int theHypType, const int theIndex )
if ( aMeshEntry == "" && aGeomEntry == "" ) { if ( aMeshEntry == "" && aGeomEntry == "" ) {
_PTR(SObject) pObj = studyDS()->FindObjectID( anObjEntry.toLatin1().data() ); _PTR(SObject) pObj = studyDS()->FindObjectID( anObjEntry.toLatin1().data() );
GEOM::GEOM_Object_var aGeomVar = SMESH::GetShapeOnMeshOrSubMesh( pObj ); GEOM::GEOM_Object_var aGeomVar = SMESH::GetShapeOnMeshOrSubMesh( pObj );
if ( !aGeomVar->_is_nil() )
aGeomEntry = aGeomVar->GetStudyEntry(); aGeomEntry = aGeomVar->GetStudyEntry();
} }
@ -1220,6 +1223,7 @@ void SMESHGUI_MeshOp::onEditHyp( const int theHypType, const int theIndex )
if ( !aMeshVar->_is_nil() ) { if ( !aMeshVar->_is_nil() ) {
_PTR(SObject) aMeshSO = SMESH::FindSObject( aMeshVar ); _PTR(SObject) aMeshSO = SMESH::FindSObject( aMeshVar );
GEOM::GEOM_Object_var aGeomVar = SMESH::GetShapeOnMeshOrSubMesh( aMeshSO ); GEOM::GEOM_Object_var aGeomVar = SMESH::GetShapeOnMeshOrSubMesh( aMeshSO );
if ( !aGeomVar->_is_nil() )
aMeshEntry = aGeomVar->GetStudyEntry(); aMeshEntry = aGeomVar->GetStudyEntry();
} }
} }

4
src/StdMeshersGUI/StdMeshersGUI_SubShapeSelectorWdg.cxx
View File

@ -475,8 +475,10 @@ const char* StdMeshersGUI_SubShapeSelectorWdg::GetMainShapeEntry()
//================================================================================= //=================================================================================
QList<int> StdMeshersGUI_SubShapeSelectorWdg::GetCorrectedListOfIDs( bool fromSubshapeToMainshape ) QList<int> StdMeshersGUI_SubShapeSelectorWdg::GetCorrectedListOfIDs( bool fromSubshapeToMainshape )
{ {
if ( myMainShape.IsNull() || myGeomShape.IsNull() ) if ( ( myMainShape.IsNull() || myGeomShape.IsNull() ) && fromSubshapeToMainshape )
return myListOfIDs; return myListOfIDs;
else if ( ( myMainShape.IsNull() || myGeomShape.IsNull() ) && !fromSubshapeToMainshape )
return mySelectedIDs;
QList<int> aList; QList<int> aList;
TopTools_IndexedMapOfShape aGeomMap; TopTools_IndexedMapOfShape aGeomMap;