Salome HOME
projects
/
modules
/
shaper.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'Dev_1.1.0' of newgeom:newgeom into Dev_1.1.0
[modules/shaper.git]
/
src
/
ModelAPI
/
ModelAPI_Tools.cpp
diff --git
a/src/ModelAPI/ModelAPI_Tools.cpp
b/src/ModelAPI/ModelAPI_Tools.cpp
index 8656f2fd7545adda30c425bc11eeeee263e04519..27a5fdde28540730509b7955d790908bbdfc4342 100644
(file)
--- a/
src/ModelAPI/ModelAPI_Tools.cpp
+++ b/
src/ModelAPI/ModelAPI_Tools.cpp
@@
-1,3
+1,5
@@
+// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
+
// File: ModelAPI_Tools.cpp
// Created: 06 Aug 2014
// Author: Vitaly Smetannikov
// File: ModelAPI_Tools.cpp
// Created: 06 Aug 2014
// Author: Vitaly Smetannikov
@@
-9,21
+11,23
@@
namespace ModelAPI_Tools {
namespace ModelAPI_Tools {
-
boost
::shared_ptr<GeomAPI_Shape> shape(const ResultPtr& theResult)
+
std
::shared_ptr<GeomAPI_Shape> shape(const ResultPtr& theResult)
{
{
-
- ResultBodyPtr aBody =
boost
::dynamic_pointer_cast<ModelAPI_ResultBody>(theResult);
+/*
+ ResultBodyPtr aBody =
std
::dynamic_pointer_cast<ModelAPI_ResultBody>(theResult);
if (aBody)
return aBody->shape();
if (aBody)
return aBody->shape();
- ResultConstructionPtr aConstruct =
boost
::dynamic_pointer_cast<ModelAPI_ResultConstruction>(
+ ResultConstructionPtr aConstruct =
std
::dynamic_pointer_cast<ModelAPI_ResultConstruction>(
theResult);
if (aConstruct)
return aConstruct->shape();
theResult);
if (aConstruct)
return aConstruct->shape();
- ResultGroupPtr aGroup =
boost
::dynamic_pointer_cast<ModelAPI_ResultGroup>(theResult);
+ ResultGroupPtr aGroup =
std
::dynamic_pointer_cast<ModelAPI_ResultGroup>(theResult);
if (aGroup)
return aGroup->shape();
if (aGroup)
return aGroup->shape();
- return boost::shared_ptr<GeomAPI_Shape>();
+ return std::shared_ptr<GeomAPI_Shape>();
+ */
+ return theResult->shape();
}
}
}
}