X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=inline;f=common%2FvvFromITK.h;h=818705176e5f2d4701af011aed6cef7f5f216669;hb=cb9d2e28489c3531d37c241fe7d8a468451c8e67;hp=b45a2b7aa3b25e09bf33c937c6da3d27f7da2b9b;hpb=931a42358442f4ee4f314613c991c838d4b4e3b7;p=clitk.git
diff --git a/common/vvFromITK.h b/common/vvFromITK.h
index b45a2b7..8187051 100644
--- a/common/vvFromITK.h
+++ b/common/vvFromITK.h
@@ -1,38 +1,31 @@
/*=========================================================================
+ Program: vv http://www.creatis.insa-lyon.fr/rio/vv
- Program: vv
- Module: $RCSfile: vvFromITK.h,v $
- Language: C++
- Date: $Date: 2010/01/06 13:32:01 $
- Version: $Revision: 1.1 $
- Author : Joel Schaerer (joel.schaerer@insa-lyon.fr)
+ 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 .
-
-=========================================================================*/
-
-#ifndef vvImageFromITK_h
-#define vvImageFromITK_h
+ - BSD See included LICENSE.txt file
+ - CeCILL-B http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
+======================================================================-====*/
+#ifndef VVIMAGEFROMITK_H
+#define VVIMAGEFROMITK_H
+// vv
#include "vvImage.h"
-#include
+
+// itk
#include
-#include "itkImageToVTKImageFilter.h"
+#include
+//------------------------------------------------------------------------------
/**Converts the itk image to vv, handling the 4D problem
* The time_sequence boolean specifies that the image is to be interpreted as a time sequence,
* even if its dim is < 4. */
@@ -90,6 +83,8 @@ template vvImage::Pointer vvImageFromITK(type
image->DeepCopy(connector->GetOutput());
vv_image->AddImage(image);
}
+ vv_image->SetTimeSpacing(input->GetSpacing()[Dim-1]);
+ vv_image->SetTimeOrigin(input->GetOrigin()[Dim-1]);
}
else //Dim == 1,2,3 and not time_sequence
{
@@ -112,5 +107,6 @@ template vvImage::Pointer vvImageFromITK(type
}
return vv_image;
}
+//------------------------------------------------------------------------------
#endif //vvImageFromITK