X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=vv%2FvvImageReader.h;h=b50d66b3be748c51208c537cfc4d001d4957402e;hb=ff1d5b8af965e75ecdbc1b0cbff0dad6f3b3c511;hp=e13d2e49ff57e5acf1a77e433d1cb2fdcea3a4ea;hpb=934a64f5b51382ad6bbc78d9c8734691e599cf09;p=clitk.git

diff --git a/vv/vvImageReader.h b/vv/vvImageReader.h
index e13d2e4..b50d66b 100644
--- a/vv/vvImageReader.h
+++ b/vv/vvImageReader.h
@@ -1,29 +1,22 @@
 /*=========================================================================
+  Program:   vv                     http://www.creatis.insa-lyon.fr/rio/vv
 
- Program:   vv
- Language:  C++
- Author :   Pierre Seroul (pierre.seroul@gmail.com)
+  Authors belong to: 
+  - University of LYON              http://www.universite-lyon.fr/
+  - Léon Bérard cancer center       http://oncora1.lyon.fnclcc.fr
+  - CREATIS CNRS laboratory         http://www.creatis.insa-lyon.fr
 
-Copyright (C) 2008
-Léon Bérard cancer center http://oncora1.lyon.fnclcc.fr
-CREATIS-LRMN http://www.creatis.insa-lyon.fr
+  This software is distributed WITHOUT ANY WARRANTY; without even
+  the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+  PURPOSE.  See the copyright notices for more information.
 
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, version 3 of the License.
+  It is distributed under dual licence
 
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-=========================================================================*/
+  - BSD        See included LICENSE.txt file
+  - CeCILL-B   http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
+======================================================================-====*/
 #ifndef vvImageReader_H
 #define vvImageReader_H
-
 #include <string>
 #include <vector>
 #include <QThread>
@@ -49,12 +42,13 @@ public:
         return mLastError;
     }
 
+    void SetSlice(unsigned int i) { mSlice = i; }
+
     //====================================================================
     // Main function
     void Update();
     void Update(LoadedImageType type);
     void Update(int dim, std::string InputPixelType, LoadedImageType type);
-    //void Extract(int dim, std::string InputPixelType, int slice);
 
 protected:
     void run();
@@ -62,6 +56,7 @@ protected:
     std::vector<std::string> mInputFilenames;
     ///Method used to load the image, see vvConstants.h for definition
     LoadedImageType mType;
+    unsigned int mSlice;
     itk::Command::Pointer mObserver;
 
     std::string mLastError;
@@ -81,6 +76,9 @@ protected:
     int mDim;
     std::string mInputPixelType;
 
+    //====================================================================
+    void ReadNkiImageTransform();
+    void ReadMatImageTransform();
 private:
     vvImage::Pointer mImage;