DescriptionServices added for GeomEntity instances

Author: lelandaisb

src/Core/CMakeLists.txt

@@ -7,10 +7,10 @@ find_package (GUIToolkitsVariables REQUIRED)
 include (${GUIToolkitsVariables_CMAKE_DIR}/python_binding.cmake)
 
 file (GLOB HEADERS protected/*/*.h)
-file (GLOB CPP_SOURCES Internal/*.cpp Geom/*.cpp Topo/*.cpp Mesh/*.cpp Structured/*.cpp Group/*.cpp SysCoord/*.cpp Smoothing/*.cpp )
+file (GLOB CPP_SOURCES Internal/*.cpp Geom/*.cpp Topo/*.cpp Mesh/*.cpp Services/*.cpp Structured/*.cpp Group/*.cpp SysCoord/*.cpp Smoothing/*.cpp )
 
 # Répertoire d'en-têtes installés. Certains sont optionnels et ajoutés plus loin.
-set (HEADERS_DIRECTORIES protected/Geom protected/Group protected/Internal protected/Mesh protected/Smoothing protected/Structured protected/SysCoord protected/Topo)
+set (HEADERS_DIRECTORIES protected/Geom protected/Group protected/Internal protected/Mesh protected/Services protected/Smoothing protected/Structured protected/SysCoord protected/Topo)
 
 # On ajoute les en-têtes aux sources. C'est utile pour cmake dans certains cas,
 # par exemple lorsqu'ils doivent être pré-processés (moc, ...).

src/Core/Geom/GeomManager.cpp

@@ -90,6 +90,7 @@
 #include "Topo/CommandExtrudeTopo.h"
 #include "Topo/TopoHelper.h"
 #include "SysCoord/SysCoord.h"
+#include "Services/DescriptionService.h"
 #ifdef USE_MDLPARSER
 #include "Internal/CommandChangeLengthUnit.h"
 #endif
@@ -200,6 +201,42 @@ Geom::GeomInfo GeomManager::getInfos(const GeomEntity* e)
     return infos;
 }
 /*----------------------------------------------------------------------------*/
+std::string GeomManager::getTextualDescription(std::string name, int dim, bool useService)
+{
+    GeomEntity* e = 0;
+    switch(dim){
+    case(0):{
+        e =getVertex(name);
+    }
+    break;
+    case(1):{
+        e =getCurve(name);
+    }
+    break;
+    case(2):{
+        e =getSurface(name);
+    }
+    break;
+    case(3):{
+        e =getVolume(name);
+    }
+    break;
+    default:{
+        throw TkUtil::Exception (TkUtil::UTF8String ("Dimension erronée", TkUtil::Charset::UTF_8));
+    }
+    break;
+    }
+    return getTextualDescription(e, useService);
+}
+/*----------------------------------------------------------------------------*/
+std::string GeomManager::getTextualDescription(const GeomEntity* e, bool useService)
+{
+    if (useService)
+        return Services::DescriptionService::describe(e, true)->toString();
+    else
+        return e->getDescription(true)->toString();
+}
+/*----------------------------------------------------------------------------*/
 Utils::Math::Point GeomManager::getCoord(const std::string& name) const
 {
 	Vertex* vtx = GeomManager::getVertex (name);