Cleanage.

[GPU.git] / WCudaMSE / BilatTools_Cuda_Image / src / core / cudaImageTools / fonctionel / header / AnimableFonctionel_I.h

diff --git a/WCudaMSE/BilatTools_Cuda_Image/src/core/cudaImageTools/fonctionel/header/AnimableFonctionel_I.h b/WCudaMSE/BilatTools_Cuda_Image/src/core/cudaImageTools/fonctionel/header/AnimableFonctionel_I.h
index 6fb67ce..d562b05 100755 (executable)
--- a/WCudaMSE/BilatTools_Cuda_Image/src/core/cudaImageTools/fonctionel/header/AnimableFonctionel_I.h
+++ b/WCudaMSE/BilatTools_Cuda_Image/src/core/cudaImageTools/fonctionel/header/AnimableFonctionel_I.h
@@ -2,14 +2,12 @@
 #define ANIMABLE_FONCTIONEL_I_H_\r
 \r
 #include <iostream>\r
+#include <vector>\r
+#include <string>\r
 \r
 #include "cudaTools.h"\r
 #include "DomaineMath.h"\r
 \r
-using std::string;\r
-\r
-\r
-\r
 /*----------------------------------------------------------------------*\\r
  |*                    Declaration                                     *|\r
  \*---------------------------------------------------------------------*/\r
@@ -21,8 +19,7 @@ using std::string;
 class AnimableFonctionel_I\r
     {\r
     public:\r
-\r
-       //virtual ~Animable_I(void)=0;\r
+        virtual ~AnimableFonctionel_I() {}\r
 \r
        virtual void runGPU(uchar4* ptrDevPixels,const DomaineMath& domaineMath)=0;\r
        virtual void animationStep(void)=0;\r
@@ -32,12 +29,14 @@ class AnimableFonctionel_I
        virtual DomaineMath* getDomaineMathInit(void)=0;\r
 \r
        /**\r
-        * getParaAnimation\r
+        * Ancienne version de l'interface.\r
         */\r
-       virtual float getT(void)=0;\r
+       virtual float getT(void) { return 0.0; };\r
 \r
-       virtual string getTitle(void)=0;\r
+       virtual std::vector<std::string> getNames() { std::vector<std::string> def; def.push_back("t = "); return def; }\r
+       virtual void getValues(float* values) { values[0] = this->getT(); }\r
 \r
+       virtual std::string getTitle(void)=0;\r
     };\r
 \r
 #endif\r