Salome HOME
projects
/
modules
/
smesh.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
PR: merged from V5_1_4rc1
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_GEOMGenUtils.cxx
diff --git
a/src/SMESHGUI/SMESHGUI_GEOMGenUtils.cxx
b/src/SMESHGUI/SMESHGUI_GEOMGenUtils.cxx
index 33907aec03508e625ab08fd38c670a12efbffe8f..d1a77e845df3b0b75552124727a34ea005d458cb 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_GEOMGenUtils.cxx
+++ b/
src/SMESHGUI/SMESHGUI_GEOMGenUtils.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
08
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-20
10
CEA/DEN, EDF R&D, OPEN CASCADE
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@
-19,6
+19,7
@@
//
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
//
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
+
// SMESH SMESHGUI : GUI for SMESH component
// File : SMESHGUI_GEOMGenUtils.cxx
// Author : Open CASCADE S.A.S.
// SMESH SMESHGUI : GUI for SMESH component
// File : SMESHGUI_GEOMGenUtils.cxx
// Author : Open CASCADE S.A.S.
@@
-64,7
+65,7
@@
namespace SMESH
SMESH::SMESH_subMesh_var aSubmesh =
SObjectToInterface<SMESH::SMESH_subMesh>( theMeshOrSubmesh );
if ( !aSubmesh->_is_nil() )
SMESH::SMESH_subMesh_var aSubmesh =
SObjectToInterface<SMESH::SMESH_subMesh>( theMeshOrSubmesh );
if ( !aSubmesh->_is_nil() )
- return aSubmesh->GetSubShape();
+
return aSubmesh->GetSubShape();
}
}
return GEOM::GEOM_Object::_nil();
}
}
return GEOM::GEOM_Object::_nil();
@@
-89,7
+90,7
@@
namespace SMESH
SALOMEDS_SObject* aRefSO = _CAST(SObject,aRefSOClient);
aMeshShape = GEOM::GEOM_Object::_narrow(aRefSO->GetObject());
} else {
SALOMEDS_SObject* aRefSO = _CAST(SObject,aRefSOClient);
aMeshShape = GEOM::GEOM_Object::_narrow(aRefSO->GetObject());
} else {
- SALOMEDS_SObject* aSO = _CAST(SObject,aSObject);
+
SALOMEDS_SObject* aSO = _CAST(SObject,aSObject);
aMeshShape = GEOM::GEOM_Object::_narrow(aSO->GetObject());
}
aMeshShape = GEOM::GEOM_Object::_narrow(aSO->GetObject());
}