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 bc086953b28a56926ceb5172e9c138f84331a8cc..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
@@
-11,7
+13,7
@@
namespace ModelAPI_Tools {
std::shared_ptr<GeomAPI_Shape> shape(const ResultPtr& theResult)
{
std::shared_ptr<GeomAPI_Shape> shape(const ResultPtr& theResult)
{
-
+/*
ResultBodyPtr aBody = std::dynamic_pointer_cast<ModelAPI_ResultBody>(theResult);
if (aBody)
return aBody->shape();
ResultBodyPtr aBody = std::dynamic_pointer_cast<ModelAPI_ResultBody>(theResult);
if (aBody)
return aBody->shape();
@@
-25,5
+27,7
@@
namespace ModelAPI_Tools {
if (aGroup)
return aGroup->shape();
return std::shared_ptr<GeomAPI_Shape>();
if (aGroup)
return aGroup->shape();
return std::shared_ptr<GeomAPI_Shape>();
+ */
+ return theResult->shape();
}
}
}
}