X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=common%2FvvFromITK.h;h=4add8912c43c09e75e452f63ef18d0bd2d1f60d5;hb=f7b421ee98a5fcec0f7072c339792c5534b1504c;hp=4d43c61d22d386e7b79792981ac233c5fab98aac;hpb=758de1c14c7f16d924e1a2a575d52cd3e48ec503;p=clitk.git
diff --git a/common/vvFromITK.h b/common/vvFromITK.h
index 4d43c61..4add891 100644
--- a/common/vvFromITK.h
+++ b/common/vvFromITK.h
@@ -1,34 +1,26 @@
/*=========================================================================
+ Program: vv http://www.creatis.insa-lyon.fr/rio/vv
- Program: vv
- Language: C++
- 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.
-
-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
+ It is distributed under dual licence
+ - 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
#include "vvImage.h"
-#include
+//#include
#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,
@@ -87,6 +79,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
{