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
IPAL53091: 'Scale of Marker' lists are different in Preferences and Properties dialogs
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_GEOMGenUtils.cxx
diff --git
a/src/SMESHGUI/SMESHGUI_GEOMGenUtils.cxx
b/src/SMESHGUI/SMESHGUI_GEOMGenUtils.cxx
index 88b1819445cb5ace027fd75faba4cb4bead9bcc2..974b54ff88e1b17e6cae96b89332c9a59d62bcaa 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_GEOMGenUtils.cxx
+++ b/
src/SMESHGUI/SMESHGUI_GEOMGenUtils.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
4
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
6
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
@@
-82,20
+82,25
@@
namespace SMESH
return GEOM::GEOM_Object::_nil();
}
return GEOM::GEOM_Object::_nil();
}
- GEOM::GEOM_Object_
pt
r GetGeom (_PTR(SObject) theSO)
+ GEOM::GEOM_Object_
va
r GetGeom (_PTR(SObject) theSO)
{
{
+ GEOM::GEOM_Object_var aMeshShape;
if (!theSO)
if (!theSO)
- return GEOM::GEOM_Object::_nil();
+ return aMeshShape;
+
+ CORBA::Object_var obj = _CAST( SObject,theSO )->GetObject();
+ aMeshShape = GEOM::GEOM_Object::_narrow( obj );
+ if ( !aMeshShape->_is_nil() )
+ return aMeshShape;
_PTR(Study) aStudy = SMESH::GetActiveStudyDocument();
if (!aStudy)
_PTR(Study) aStudy = SMESH::GetActiveStudyDocument();
if (!aStudy)
- return
GEOM::GEOM_Object::_nil()
;
+ return
aMeshShape
;
_PTR(ChildIterator) anIter (aStudy->NewChildIterator(theSO));
for ( ; anIter->More(); anIter->Next()) {
_PTR(SObject) aSObject = anIter->Value();
_PTR(SObject) aRefSOClient;
_PTR(ChildIterator) anIter (aStudy->NewChildIterator(theSO));
for ( ; anIter->More(); anIter->Next()) {
_PTR(SObject) aSObject = anIter->Value();
_PTR(SObject) aRefSOClient;
- GEOM::GEOM_Object_var aMeshShape;
if (aSObject->ReferencedObject(aRefSOClient)) {
SALOMEDS_SObject* aRefSO = _CAST(SObject,aRefSOClient);
if (aSObject->ReferencedObject(aRefSOClient)) {
SALOMEDS_SObject* aRefSO = _CAST(SObject,aRefSOClient);
@@
-104,11
+109,10
@@
namespace SMESH
SALOMEDS_SObject* aSO = _CAST(SObject,aSObject);
aMeshShape = GEOM::GEOM_Object::_narrow(aSO->GetObject());
}
SALOMEDS_SObject* aSO = _CAST(SObject,aSObject);
aMeshShape = GEOM::GEOM_Object::_narrow(aSO->GetObject());
}
-
- if (!aMeshShape->_is_nil())
- return aMeshShape._retn();
+ if ( !aMeshShape->_is_nil() )
+ return aMeshShape;
}
}
- return
GEOM::GEOM_Object::_nil()
;
+ return
aMeshShape
;
}
SMESHGUI_EXPORT char* GetGeomName( _PTR(SObject) smeshSO )
}
SMESHGUI_EXPORT char* GetGeomName( _PTR(SObject) smeshSO )