X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=appli%2FTestWxItkView%2Fmain.cxx;h=bba17df56d8fa2210cdb6e7c7de4434a20dafc1f;hb=c7482ec7d04a5e5987841932a6856ebd471cebdb;hp=fb21ace51602a07fb57540011b0716afa625106c;hpb=702369fa1f89a638331e43543d83eb5db4c180ab;p=creaImageIO.git

diff --git a/appli/TestWxItkView/main.cxx b/appli/TestWxItkView/main.cxx
index fb21ace..bba17df 100644
--- a/appli/TestWxItkView/main.cxx
+++ b/appli/TestWxItkView/main.cxx
@@ -1,3 +1,29 @@
+/*
+	# ---------------------------------------------------------------------
+	#
+	# Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image 
+	#                        pour la Santé)
+	# Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+	# Previous Authors : Laurent Guigues, Jean-Pierre Roux
+	# CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil
+	#
+	#  This software is governed by the CeCILL-B license under French law and 
+	#  abiding by the rules of distribution of free software. You can  use, 
+	#  modify and/ or redistribute the software under the terms of the CeCILL-B 
+	#  license as circulated by CEA, CNRS and INRIA at the following URL 
+	#  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html 
+	#  or in the file LICENSE.txt.
+	#
+	#  As a counterpart to the access to the source code and  rights to copy,
+	#  modify and redistribute granted by the license, users are provided only
+	#  with a limited warranty  and the software's author,  the holder of the
+	#  economic rights,  and the successive licensors  have only  limited
+	#  liability. 
+	#
+	#  The fact that you are presently reading this means that you have had
+	#  knowledge of the CeCILL-B license and that you accept its terms.
+	# ------------------------------------------------------------------------
+*/
 #include <creaImageIOSystem.h>
 #include <creaWx.h>
 //#include <creaImageIOWxISimpleDlg.h>
@@ -5,6 +31,8 @@
 #include <itkImageBase.h>
 #include <creaVtkBasicSlicer.h>
 #include <creaImageIOWxAnySimpleDlg.h>
+#include <creaImageIOItkVtkImport.h>
+
 
 #define ITK_DIM_TO_TEST 3
 
@@ -28,25 +56,53 @@ bool myApp::OnInit( )
   setlocale(LC_NUMERIC, "C");
 #endif
    wxInitAllImageHandlers();
+
+	typedef itk::Image<short, ITK_DIM_TO_TEST >  ImageType2;
+   // Test for Juan Carlos
+	creaImageIO::SimpleReaderItkVtk<ImageType2> y;
+	
+	std::vector <vtkImageData*> vtest = y.readDirectoryinVTK("D:\\data-images\\Analyze7.5\\1_15_ep2d_diff_30dir_20061218");
+y.getFilesinITK();
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
    std::vector <vtkImageData*> vtktest;
    std::vector<std::string> exts;
    vtkImageData* im = vtkImageData::New();
  
 			creaImageIO::WxAnySimpleDlg w(0);
 			w.ShowModal();
-			std::vector <boost::any> Wtest = w.getImagesSelected();
+		//	std::vector <boost::any> Wtest = w.getImagesSelected();
    
  
-			typedef itk::Image<short, ITK_DIM_TO_TEST >  ImageType;
+			typedef itk::Image<float, ITK_DIM_TO_TEST >  ImageType;
 			ImageType::Pointer img = ImageType::New();
-			img = boost::any_cast<ImageType*>(Wtest[0]);
+	//		img = boost::any_cast<ImageType*>(Wtest[0]);
 			//int count = boost::unsafe_any_cast<ImageType*>(Wtest[0]).GetReferenceCount();
 			std::vector <ImageType::Pointer> test;
 			//test.push_back( (ImageType::Pointer)(
 				
 			//	w.getImage<ImageType>(Wtest.front());
 		test = w.getTemplatedImagesSelected<ImageType>();
-  
+		w.split3Din3Dvtk<ImageType>(test.front());
+		w.split3Din3Dvtk<ImageType>(test.back());
+		  vtktest = w.getVtkImagesSelected();
+	  if(vtktest.size() >0)
+	  {
+		crea::VtkBasicSlicer(vtktest.front());
+	  }