Cleanage.

[GPU.git] / WCudaMSE / BilatTools_Cuda_Image / src / core / cudaImageTools / fonctionel / cpp / ImageFonctionel.cpp

diff --git a/WCudaMSE/BilatTools_Cuda_Image/src/core/cudaImageTools/fonctionel/cpp/ImageFonctionel.cpp b/WCudaMSE/BilatTools_Cuda_Image/src/core/cudaImageTools/fonctionel/cpp/ImageFonctionel.cpp
index b002904..899519f 100755 (executable)
--- a/WCudaMSE/BilatTools_Cuda_Image/src/core/cudaImageTools/fonctionel/cpp/ImageFonctionel.cpp
+++ b/WCudaMSE/BilatTools_Cuda_Image/src/core/cudaImageTools/fonctionel/cpp/ImageFonctionel.cpp
@@ -34,17 +34,24 @@ using std::endl;
  \*-------------------------------------*/\r
 \r
 ImageFonctionel::ImageFonctionel(AnimableFonctionel_I* ptrAnimable, ColorRGB_01* ptrColorTitreRGB) :\r
-       ImageFonctionelMOOs_A(ptrAnimable->getW(), ptrAnimable->getH(), *ptrAnimable->getDomaineMathInit())\r
+       ImageFonctionelMOOs_A(\r
+           ptrAnimable->getW(),\r
+           ptrAnimable->getH(),\r
+           *ptrAnimable->getDomaineMathInit()\r
+       )\r
     {\r
     this->ptrAnimable = ptrAnimable;\r
     this->ptrColorTitreRGB = ptrColorTitreRGB;\r
+    this->valueNames = ptrAnimable->getNames();\r
+    this->values = new float[this->valueNames.size()];\r
 \r
     setEnableDomaineOverlay(true);\r
     }\r
 \r
 ImageFonctionel::~ImageFonctionel(void)\r
     {\r
-    delete ptrAnimable;\r
+    delete this->ptrAnimable;\r
+    delete[] this->values;\r
     }\r
 \r
 /**\r
@@ -82,9 +89,16 @@ void ImageFonctionel::paintPrimitives(Graphic2Ds& graphic2D) // redefinition
 \r
     // top\r
        {\r
-       float t = ptrAnimable->getT();\r
-       string message = "t = " + StringTools::toString(t);\r
-       graphic2D.drawTitleTop(message, ptrfont);\r
+        string title;\r
+        this->ptrAnimable->getValues(this->values);\r
+        for (int i = 0; i < this->valueNames.size(); i++)\r
+            {\r
+            if (i != 0)\r
+                title += ", ";\r
+            title += this->valueNames[i];\r
+            title += StringTools::toString(this->values[i]);\r
+            }\r
+       graphic2D.drawTitleTop(title, ptrfont);\r
        }\r
 \r
     // bottom\r