X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=bbtk_creaVtk_PKG%2Fsrc%2FbbcreaVtkReadMHDPlane.h;h=4cc2e469cf03acce35540aef439160d693abe27d;hb=937822256978ed571b7d004ef1a5abe9492a8ada;hp=5b94b9554b7586236ab678af29d5c49b70c81815;hpb=4b79238a4a0c468f952d781f7cf7c3c2bb95029f;p=creaVtk.git

diff --git a/bbtk_creaVtk_PKG/src/bbcreaVtkReadMHDPlane.h b/bbtk_creaVtk_PKG/src/bbcreaVtkReadMHDPlane.h
index 5b94b95..4cc2e46 100644
--- a/bbtk_creaVtk_PKG/src/bbcreaVtkReadMHDPlane.h
+++ b/bbtk_creaVtk_PKG/src/bbcreaVtkReadMHDPlane.h
@@ -5,10 +5,6 @@
 #define __bbcreaVtkReadMHDPlane_h_INCLUDED__
 
 
-
-
-
-
 #include "bbcreaVtk_EXPORT.h"
 #include "bbtkAtomicBlackBox.h"
 #include "iostream"
@@ -27,19 +23,23 @@ class bbcreaVtk_EXPORT ReadMHDPlane
 //===== 
 // Before editing this file, make sure it's a file of your own (i.e.: it wasn't generated from xml description; if so : your modifications will be lost)
 //===== 
+  BBTK_DECLARE_INPUT(Active,bool);
   BBTK_DECLARE_INPUT(FileName,std::string);
   BBTK_DECLARE_INPUT(Slice,int);
   BBTK_DECLARE_INPUT(Width,int);
   BBTK_DECLARE_INPUT(DirectionPlane,std::string);
   BBTK_DECLARE_INPUT(Type,int);
   BBTK_DECLARE_OUTPUT(Out,vtkImageData*); 
+  BBTK_DECLARE_OUTPUT(Out2,vtkImageData*); 
   BBTK_PROCESS(Process);
 	
   vtkImageData* CreateDefaultImage();
-  void ReadNormalMHD();
-  void Read64lseek();
-  void copy_XZ_plane(int fd,vtkImageData *newImage,int slice,int iWidth,int dimX,int dimY,int dimZ,int dataSize);
+// EED Borrame  void ReadNormalMHD();
+// EED Borrame  void Read64lseek();
+  void Read64lseek(std::string,std::string plane);
+  void copy_ZX_plane(int fd,vtkImageData *newImage,int slice,int iWidth,int dimX,int dimY,int dimZ,int dataSize);
   void copy_YZ_plane(int fd,vtkImageData *newImage,int slice,int iWidth,int dimX,int dimY,int dimZ,int dataSize);
+  vtkImageData* ChangeOrientation(vtkImageData* img);
 
 
   void Process();
@@ -53,12 +53,14 @@ BBTK_BEGIN_DESCRIBE_BLACK_BOX(ReadMHDPlane,bbtk::AtomicBlackBox);
  BBTK_AUTHOR("InfoDev");
  BBTK_DESCRIPTION("No Description.");
  BBTK_CATEGORY("empty");
+ BBTK_INPUT(ReadMHDPlane,Active,"true/false (default true)",bool,"");
  BBTK_INPUT(ReadMHDPlane,FileName,"Image file name",std::string,"");
  BBTK_INPUT(ReadMHDPlane,Slice,"Slice number",int,"");
  BBTK_INPUT(ReadMHDPlane,Width,"(1 default) Number of slices to be read",int,"");
- BBTK_INPUT(ReadMHDPlane,DirectionPlane,"Direction plane: XY (default), YZ , XZ",std::string,"");
+ BBTK_INPUT(ReadMHDPlane,DirectionPlane,"Direction plane: XY (default), YZ , ZX",std::string,"");
  BBTK_INPUT(ReadMHDPlane,Type,"(1 default) 0 = Normal mhd,  1 = lseek64",int,"");
  BBTK_OUTPUT(ReadMHDPlane,Out,"Image 2D",vtkImageData*,"");
+ BBTK_OUTPUT(ReadMHDPlane,Out2,"Image 2D in the good orientation",vtkImageData*,"");
 BBTK_END_DESCRIBE_BLACK_BOX(ReadMHDPlane);
 //===== 
 // Before editing this file, make sure it's a file of your own (i.e.: it wasn't generated from xml description; if so : your modifications will be lost)