X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=appli%2FTestWxItkView%2Fmain.cxx;h=bba17df56d8fa2210cdb6e7c7de4434a20dafc1f;hb=4df8ce04086b36aa19f2a86ce1c9515b34e4f9dc;hp=60898b99ee1b52dc21d188c50b18820c02b59836;hpb=d1137ad9eed009a0bf934c0b47bf543fc211f2bd;p=creaImageIO.git

diff --git a/appli/TestWxItkView/main.cxx b/appli/TestWxItkView/main.cxx
index 60898b9..bba17df 100644
--- a/appli/TestWxItkView/main.cxx
+++ b/appli/TestWxItkView/main.cxx
@@ -1,11 +1,40 @@
+/*
+	# ---------------------------------------------------------------------
+	#
+	# 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>
-#include <creaImageIOWxISimpleDlg.hpp>
+//#include <creaImageIOWxISimpleDlg.h>
+//#include <creaImageIOWxISimpleDlg.hpp>
 #include <itkImageBase.h>
 #include <creaVtkBasicSlicer.h>
+#include <creaImageIOWxAnySimpleDlg.h>
+#include <creaImageIOItkVtkImport.h>
 
-#define ITK_DIM_TO_TEST 4
+
+#define ITK_DIM_TO_TEST 3
 
 // Just to test the selection of file(s), directory or from creaImageIO database.
 class myApp : public wxApp
@@ -27,48 +56,95 @@ 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();
-  if(ITK_DIM_TO_TEST == 3)
-   {
+ 
+			creaImageIO::WxAnySimpleDlg w(0);
+			w.ShowModal();
+		//	std::vector <boost::any> Wtest = w.getImagesSelected();
    
-	   typedef itk::Image<short, ITK_DIM_TO_TEST >  ImageType;
-	   creaImageIO::WxISimpleDlg<ImageType> x(0);
-	   // files extension to take in count
-       exts.push_back(".hdr");
-       x.setExts(exts);
-       x.ShowModal();
-	   // get itkImage vector
-	   std::vector <ImageType::Pointer> test = x.getImagesSelected();
-	   // convert 3D itk to 3D vtk
-	   x.split3Din3Dvtk();
-	   vtktest = x.getVtkImagesSelected();
-	  if(vtktest.size() >0)
-	  {
-		crea::VtkBasicSlicer(vtktest.front());
-	  }
-  }
-  else if (ITK_DIM_TO_TEST == 4)
-  {
-	  typedef itk::Image<short, ITK_DIM_TO_TEST >  ImageType;
-      creaImageIO::WxISimpleDlg<ImageType> x(0);
-	  x.ShowModal();
-	  // get itkImage vector
-	  std::vector <ImageType::Pointer> test = x.getImagesSelected();
-	  // convert 4D itk to 3D vtk  with a directory to create tempory vtk files.
-      x.split4Din3Dvtk("d:/temp2");
-	  // get vtkImageData* vector
-	  vtktest = x.getVtkImagesSelected();
+ 
+			typedef itk::Image<float, ITK_DIM_TO_TEST >  ImageType;
+			ImageType::Pointer img = ImageType::New();
+	//		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());
 	  }
-	}
    
-  else{}
+   
+   
+ //  if(ITK_DIM_TO_TEST == 3)
+ //  {
+ //  
+	//   typedef itk::Image<short, ITK_DIM_TO_TEST >  ImageType;
+	//   creaImageIO::WxISimpleDlg<ImageType> x(0);
+	//   // files extension to take in count
+ //      exts.push_back(".hdr");
+ //      x.setExts(exts);
+ //      x.ShowModal();
+	//   // get itkImage vector
+	//   std::vector <ImageType::Pointer> test = x.getImagesSelected();
+	//   // convert 3D itk to 3D vtk
+	//   x.split3Din3Dvtk();
+	//   vtktest = x.getVtkImagesSelected();
+	//  if(vtktest.size() >0)
+	//  {
+	//	crea::VtkBasicSlicer(vtktest.front());
+	//  }
+ // }
+ // else if (ITK_DIM_TO_TEST == 4)
+ // {
+	//  typedef itk::Image<short, ITK_DIM_TO_TEST >  ImageType;
+ //     creaImageIO::WxISimpleDlg<ImageType> x(0);
+	//  x.ShowModal();
+	//  // get itkImage vector
+	//  std::vector <ImageType::Pointer> test = x.getImagesSelected();
+	//  // convert 4D itk to 3D vtk  with a directory to create tempory vtk files.
+ //     x.split4Din3Dvtk("d:/temp2");
+	//  // get vtkImageData* vector
+	//  vtktest = x.getVtkImagesSelected();
+	//  if(vtktest.size() >0)
+	//  {
+	//	crea::VtkBasicSlicer(vtktest.front());
+	//  }
+	//}
+ //  
+ // else{}
 
- 
+ //
   
    return false;
 }