X-Git-Url: http://git.euphorik.ch/?p=GPU.git;a=blobdiff_plain;f=WCudaMSE%2FBilatTools_Cuda_Image%2Fsrc%2Fcore%2FcudaImageTools%2Ffonctionel%2Fcpp%2FImageFonctionel.cpp;fp=WCudaMSE%2FBilatTools_Cuda_Image%2Fsrc%2Fcore%2FcudaImageTools%2Ffonctionel%2Fcpp%2FImageFonctionel.cpp;h=899519f7926d1f645fce1f02b358af12a1cc4ae4;hp=af78e9e378df8bbe6d421ead6b807d279eab4d32;hb=2fd5d915e8a9de4d957d6031d2d68088784eac3c;hpb=f2c6a4fc79746e2d5c6678699bd2ca93ffc49bcc

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 af78e9e..899519f 100755
--- a/WCudaMSE/BilatTools_Cuda_Image/src/core/cudaImageTools/fonctionel/cpp/ImageFonctionel.cpp
+++ b/WCudaMSE/BilatTools_Cuda_Image/src/core/cudaImageTools/fonctionel/cpp/ImageFonctionel.cpp
@@ -42,14 +42,16 @@ ImageFonctionel::ImageFonctionel(AnimableFonctionel_I* ptrAnimable, ColorRGB_01*
     {
     this->ptrAnimable = ptrAnimable;
     this->ptrColorTitreRGB = ptrColorTitreRGB;
-    this->tName = ptrAnimable->getTName();
+    this->valueNames = ptrAnimable->getNames();
+    this->values = new float[this->valueNames.size()];
 
     setEnableDomaineOverlay(true);
     }
 
 ImageFonctionel::~ImageFonctionel(void)
     {
-    delete ptrAnimable;
+    delete this->ptrAnimable;
+    delete[] this->values;
     }
 
 /**
@@ -87,9 +89,16 @@ void ImageFonctionel::paintPrimitives(Graphic2Ds& graphic2D) // redefinition
 
     // top
 	{
-	float t = ptrAnimable->getT();
-	string message = this->tName + StringTools::toString(t);
-	graphic2D.drawTitleTop(message, ptrfont);
+        string title;
+        this->ptrAnimable->getValues(this->values);
+        for (int i = 0; i < this->valueNames.size(); i++)
+            {
+            if (i != 0)
+                title += ", ";
+            title += this->valueNames[i];
+            title += StringTools::toString(this->values[i]);
+            }
+	graphic2D.drawTitleTop(title, ptrfont);
 	}
 
     // bottom