X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FGUI%2FBase%2FVolumeRenderer%2Fvolumerendererdata.h;h=4fe94865b1b2d25ea9bfb4374e766e4a0a684f24;hb=543dfcbe8f5ff78bbed90ef1e20c722bfa0ef248;hp=95a7eb8ebcb7da4e3f4446926bf49c49362a9ba6;hpb=afeeee6e8ef4a7b29e33db89bf6fc03542201ed1;p=creaMaracasVisu.git

diff --git a/lib/GUI/Base/VolumeRenderer/volumerendererdata.h b/lib/GUI/Base/VolumeRenderer/volumerendererdata.h
index 95a7eb8..4fe9486 100644
--- a/lib/GUI/Base/VolumeRenderer/volumerendererdata.h
+++ b/lib/GUI/Base/VolumeRenderer/volumerendererdata.h
@@ -2,7 +2,7 @@
 #define VOLUMERENDERERDATA_H
 
 
-#include "volumerenderermanagerdata.h"
+#include "volumerenderermanager.h"
 #include "vtkRenderWindowInteractor.h"
 #include "vtkObject.h"
 
@@ -15,24 +15,44 @@ public:
     vtkTypeRevisionMacro(VolumeRendererData,vtkObject);
     //
 
-    vtkSetObjectMacro(ImageData, vtkImageData)
-    vtkSetObjectMacro(Renderer, vtkRenderer)
-    vtkSetObjectMacro(LookUpTable, vtkLookupTable)
-    vtkSetObjectMacro(Interactor, vtkRenderWindowInteractor)
+    vtkSetObjectMacro(ImageData, vtkImageData);
+    //vtkSetMacro(ImageDataSeparateComponents, bool);
+
+    vtkSetObjectMacro(Renderer, vtkRenderer);
+    vtkSetObjectMacro(LookUpTable, vtkLookupTable);
+    vtkSetObjectMacro(Interactor, vtkRenderWindowInteractor);
+
+
+
     void BoundingBoxChanged(bool checked);
      void ShowVolume(bool enable);
      void OpacityChanged(vector<double> greyvalues, vector<double> values);
 
+     /**
+       chages the ray cast function type
+       function = 0 composite
+       function = 1 MIP (maximum intensity pixel)
+       */
     void changeCompositeMIPFunction(int function);
 
+    /**
+      changes the interoplation type of the volume
+      type = 0 linear
+      type = 1 nearest
+       */
+    void changeInterpolationType(int type);
+
 
 protected:
     VolumeRendererData();
-    VolumeRendererManagerData* VolRendData;
-    vtkImageData* ImageData;
-    vtkRenderer* Renderer;
-    vtkLookupTable* LookUpTable;
-    vtkRenderWindowInteractor* Interactor;
+    VolumeRendererManager		*VolRendManager;
+    vtkImageData				*ImageData;
+    vtkRenderer					*Renderer;
+    vtkLookupTable				*LookUpTable;
+    vtkRenderWindowInteractor	*Interactor;
+
+//    bool ImageDataSeparateComponents;
+
 
 private: