/*
- # ---------------------------------------------------------------------
- #
- # 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.
- # ------------------------------------------------------------------------
+ # ---------------------------------------------------------------------
+ #
+ # 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.
+ # ------------------------------------------------------------------------
*/
//=====
// Before editing this file, make sure it's a file of your own (i.e.: it wasn't generated from xml description; if so : your modifications will be lost)
#include "bbcreaImageIOItkImagesChooserDialogBox.h"
#include "bbcreaImageIOPackage.h"
+#include "itkImage.h"
+#include "itkImportImageFilter.h"
+
+/*
+// -------------------------------------------------------------------------
+// LFV: avoid itk::Concept check on 4d or superior images
+#define BBCREAIMAGEIO_ChooserDlg_Template( t, ty, di ) \
+ if( t == typeid( itk::Image< ty, di >* ) ) \
+ { \
+ this->Export< itk::Image< ty, di > >( ); \
+ this->ExportVTK< itk::Image< ty, di > >( ); \
+ }
+*/
+
+// -------------------------------------------------------------------------
+// LFV: avoid itk::Concept check on 4d or superior images
+#define BBCREAIMAGEIO_ChooserDlg_Template( t, ty, di ) \
+ if( t == typeid( itk::Image< ty, di >* ) ) \
+ { \
+ this->Export< ty , di >( ); \
+ this->ExportVTK< itk::Image< ty, di > >( ); \
+ }
+
+
+// -------------------------------------------------------------------------
+
namespace bbcreaImageIO
{
dlg->ShowModal();
bbtk::TypeInfo typ = bbitk::GetITKImagePtrTypeInfoFromPixelTypeInfoAndDimension(*dlg->getTypes().front(), dlg->getDims().front());
- BBTK_TEMPLATE_ITK_IMAGE_SWITCH(typ, Export);
- BBTK_TEMPLATE_ITK_IMAGE_SWITCH(typ, ExportVTK);
+
+ BBCREAIMAGEIO_ChooserDlg_Template( typ, char, 1 )
+ else BBCREAIMAGEIO_ChooserDlg_Template( typ, short, 1 )
+ else BBCREAIMAGEIO_ChooserDlg_Template( typ, int, 1 )
+ else BBCREAIMAGEIO_ChooserDlg_Template( typ, long, 1 )
+ else BBCREAIMAGEIO_ChooserDlg_Template( typ, float, 1 )
+ else BBCREAIMAGEIO_ChooserDlg_Template( typ, double, 1 )
+ else BBCREAIMAGEIO_ChooserDlg_Template( typ, unsigned char, 1 )
+ else BBCREAIMAGEIO_ChooserDlg_Template( typ, unsigned short, 1 )
+ else BBCREAIMAGEIO_ChooserDlg_Template( typ, unsigned int, 1 )
+ else BBCREAIMAGEIO_ChooserDlg_Template( typ, unsigned long, 1 )
+ else BBCREAIMAGEIO_ChooserDlg_Template( typ, char, 2 )
+ else BBCREAIMAGEIO_ChooserDlg_Template( typ, short, 2 )
+ else BBCREAIMAGEIO_ChooserDlg_Template( typ, int, 2 )
+ else BBCREAIMAGEIO_ChooserDlg_Template( typ, long, 2 )
+ else BBCREAIMAGEIO_ChooserDlg_Template( typ, float, 2 )
+ else BBCREAIMAGEIO_ChooserDlg_Template( typ, double, 2 )
+ else BBCREAIMAGEIO_ChooserDlg_Template( typ, unsigned char, 2 )
+ else BBCREAIMAGEIO_ChooserDlg_Template( typ, unsigned short, 2 )
+ else BBCREAIMAGEIO_ChooserDlg_Template( typ, unsigned int, 2 )
+ else BBCREAIMAGEIO_ChooserDlg_Template( typ, unsigned long, 2 )
+ else BBCREAIMAGEIO_ChooserDlg_Template( typ, char, 3 )
+ else BBCREAIMAGEIO_ChooserDlg_Template( typ, short, 3 )
+ else BBCREAIMAGEIO_ChooserDlg_Template( typ, int, 3 )
+ else BBCREAIMAGEIO_ChooserDlg_Template( typ, long, 3 )
+ else BBCREAIMAGEIO_ChooserDlg_Template( typ, float, 3 )
+ else BBCREAIMAGEIO_ChooserDlg_Template( typ, double, 3 )
+ else BBCREAIMAGEIO_ChooserDlg_Template( typ, unsigned char, 3 )
+ else BBCREAIMAGEIO_ChooserDlg_Template( typ, unsigned short, 3 )
+ else BBCREAIMAGEIO_ChooserDlg_Template( typ, unsigned int, 3 )
+ else BBCREAIMAGEIO_ChooserDlg_Template( typ, unsigned long, 3 );
+
+
+ /* Deprecated
+ BBTK_TEMPLATE_ITK_IMAGE_SWITCH(typ, Export);
+ BBTK_TEMPLATE_ITK_IMAGE_SWITCH(typ, ExportVTK);
+ */
delete dlg;
}
-template <class TImage>
+
+//template <class TImage>
+template <typename ty, size_t di>
void ItkImagesChooserDialogBox::Export()
{
- if (dlg->getImagesSelected().size() == 1)
- {
+ typedef itk::Image<ty,di> TImage;
+ if (dlg->getImagesSelected().size() == 1)
+ {
bbSetOutputOut( dlg->getTemplatedImagesSelected<TImage>().front().GetPointer() );
- }
- else if (dlg->getImagesSelected().size() > 1)
- {
- OutputImagesITKType outVect;
-
- typename std::vector<typename TImage::Pointer> tempImgs= dlg->getTemplatedImagesSelected<TImage>();
- typename std::vector<typename TImage::Pointer>::iterator it = tempImgs.begin();
- for(;it != tempImgs.end(); ++it)
- {
- outVect.push_back( (*it).GetPointer() );
- }
- bbSetOutputOutIImages( outVect);
- }
- else
- {
+ } else if (dlg->getImagesSelected().size() > 1){
+ OutputImagesITKType outVect;
+ typename std::vector<typename TImage::Pointer> tempImgs= dlg->getTemplatedImagesSelected<TImage>();
+ typename std::vector<typename TImage::Pointer>::iterator it = tempImgs.begin();
+ for(;it != tempImgs.end(); ++it)
+ {
+ outVect.push_back( (*it).GetPointer() );
+ } // for
+ bbSetOutputOutIImages( outVect);
+
+ typedef ty RGBPixelType;
+ typedef itk::ImportImageFilter< ty , di > ImportFilterType;
+ typename ImportFilterType::Pointer importFilter = ImportFilterType::New();
+
+ typename TImage::SizeType imsize;
+ imsize[0] = tempImgs[0].GetPointer()->GetLargestPossibleRegion().GetSize()[0];
+ imsize[1] = tempImgs[0].GetPointer()->GetLargestPossibleRegion().GetSize()[1];
+ imsize[2] = tempImgs.size();
+
+ typename ImportFilterType::IndexType start;
+ start.Fill( 0 );
+ typename ImportFilterType::RegionType region;
+ region.SetIndex( start );
+ region.SetSize( imsize );
+ importFilter->SetRegion( region );
+
+ const itk::SpacePrecisionType origin[ 3 ] = { 0.0, 0.0, 0.0 };
+ importFilter->SetOrigin( origin );
+
+ const itk::SpacePrecisionType spacing[ 3 ] = { 1.0, 1.0, 1.0 };
+ importFilter->SetSpacing( spacing );
+ const unsigned long int numberOfPixels2D = imsize[0]*imsize[1];
+ const unsigned long int numberOfPixels2DInBytes = imsize[0]*imsize[1]*sizeof(ty);
+ const unsigned long int numberOfPixels3D = imsize[0]*imsize[1]*imsize[2]*sizeof(ty);
+
+ RGBPixelType * localBuffer = new RGBPixelType[ numberOfPixels3D ];
+ RGBPixelType * tmpLocalBuffer = localBuffer;
+
+ it = tempImgs.begin();
+ for(;it != tempImgs.end(); ++it)
+ {
+ memcpy(tmpLocalBuffer, (*it).GetPointer()->GetBufferPointer(), numberOfPixels2DInBytes);
+ tmpLocalBuffer = tmpLocalBuffer + numberOfPixels2D;
+ } // for
+
+ const bool importImageFilterWillOwnTheBuffer = true;
+ importFilter->SetImportPointer( localBuffer , numberOfPixels3D , importImageFilterWillOwnTheBuffer );
+ importFilter->Update();
+ importFilter->Register();
+ bbSetOutputOut( importFilter->GetOutput() );
+
+ } else {
// warning: passing NULL to non-pointer
//bbSetOutputOut( NULL);
bbSetOutputOut(0); // JPR
}
- // FCY To test the Output
- //typedef itk::Image <short, 3> ImageType;
- //typedef itk::ImageFileReader< ImageType > itkReaderType;
- // typename itkReaderType::Pointer reader = itkReaderType::New();
- //
- // reader->SetFileName("d:\test.hdr");
- // reader->Update();
- //reader->GetOutput()->Register();
- // this->bbSetOutputOut(reader->GetOutput());
}
+
+
template <class TImage>
void ItkImagesChooserDialogBox::ExportVTK()
{
dlg->split3Din3Dvtk<TImage>( (*it) );
}
bbSetOutputOutVImages( dlg->getVtkImagesSelected() );
- }
- else if (dlg->getDims().front() == 4)
- {
+ } else if (dlg->getDims().front() == 4) {
// To Test
// dlg->split4Din3Dvtk("d:/temp2");
// bbSetOutputOutVImages( dlg->getVtkImagesSelected());
- }
- else
- {
- // NOT IMPLEMENTED YET FOR DIMENSIONS > 4
-
- }
-
+ } else {
+ // NOT IMPLEMENTED YET FOR DIMENSIONS > 4
+ } // if dlg
}
+
//=====
// Before editing this file, make sure it's a file of your own (i.e.: it wasn't generated from xml description; if so : your modifications will be lost)
//=====
void ItkImagesChooserDialogBox::bbUserSetDefaultValues()
-{
-
+{
}
+
//=====
// Before editing this file, make sure it's a file of your own (i.e.: it wasn't generated from xml description; if so : your modifications will be lost)
//=====
void ItkImagesChooserDialogBox::bbUserInitializeProcessing()
{
-
}
+
//=====
// Before editing this file, make sure it's a file of your own (i.e.: it wasn't generated from xml description; if so : your modifications will be lost)
//=====
void ItkImagesChooserDialogBox::bbUserFinalizeProcessing()
{
-
}
-}
-// EO namespace bbcreaImageIO
+
+} // EO namespace bbcreaImageIO
#include "creaImageIOWxAnySimpleDlg.h"
#include "creaImageIOWxGimmickReaderDialog.h"
-#include <itkAnalyzeImageIO.h>
+
+#if ITK_VERSION_MAJOR < 4 // : WARNING: deprecated in ITK 4.0
+# include <itkAnalyzeImageIO.h>
+# include <itkDICOMSeriesFileNames.h>
+#else // ITK_VERSION_MAJOR < 4
+# include <itkGDCMSeriesFileNames.h>
+#endif // ITK_VERSION_MAJOR < 4
+
#include <itkImageFileReader.h>
#include <itkImageSeriesReader.h>
#include <itkImage.h>
#include <itkImageSeriesWriter.h>
#include <itkGDCMImageIO.h>
-#include <itkDICOMSeriesFileNames.h>
#include <itkNumericSeriesFileNames.h>
#include <itkVectorImage.h>
#include <itkMetaImageIO.h>
std::string name = crea::wx2std(wxArray[i]);
// FOR THE MOMENT ONLY short 3D et short 4D
readImg(name);
- }
- }
- else {
+ } // for
+ } else {
// TO DO WARNING MESSAGES
- }
- }
+ } // if
+ } // if
SetReturnCode( resultShowModal );
// Close();
EndModal( resultShowModal );
}
+
+/////////////////////////////////////////////////////////////////////
+// //
+//////////////////////////////////////////////////////////////////////
void WxAnySimpleDlg::setExts(std::vector<std::string> i_exts)
{
m_exts = i_exts;
}
- /////////////////////////////////////////////////////////////////////
+
+/////////////////////////////////////////////////////////////////////
// //
//////////////////////////////////////////////////////////////////////
-
void WxAnySimpleDlg::OnReadDirectory(wxCommandEvent &event)
{
int resultShowModal;
if ( resultShowModal==wxID_OK )
{
std::string path = crea::wx2std(dirDlg->GetPath());
+
+/*
typedef boost::filesystem::directory_iterator dir_it;
dir_it itr(path);
dir_it end_itr;
- /*if (boost::filesystem::exists(path))
- {*/
+// if (boost::filesystem::exists(path))
+// {
for(;itr != end_itr; ++itr)
{
- bvalid = m_exts.size() == 0? true : false;
- std::vector<std::string>::iterator it = m_exts.begin();
- std::string ext = itr->path().filename().string().substr(itr->path().filename().string().find_last_of("."));
- for(; it != m_exts.end(); it++)
- {
- if(ext == (*it) )
- {
- bvalid = true;
- break;
- }
- }
+//EED
+// All files have the same extention
+// bvalid = m_exts.size() == 0? true : false;
+// std::vector<std::string>::iterator it = m_exts.begin();
+// std::string ext = itr->path().filename().string().substr(itr->path().filename().string().find_last_of("."));
+// for(; it != m_exts.end(); it++)
+// {
+// if(ext == (*it) )
+// {
+// bvalid = true;
+// break;
+// }
+// } // for
+bvalid=true;
if (!boost::filesystem::is_directory(itr->status()) && bvalid)
{
- readImg(itr->path().string().c_str());
- }
- }
- }
+printf("EED WxAnySimpleDlg::OnReadDirectory Each file %s \n", itr->path().string().c_str() );
+ readImg( itr->path().string().c_str() );
+ } // if
+ } // for itr
+*/
+
+ typedef vector<boost::filesystem::path> vec; // store paths
+ vec v; // so we can sort them later
+ copy(boost::filesystem::directory_iterator(path), boost::filesystem::directory_iterator(), back_inserter(v));
+ sort(v.begin(), v.end()); // sort, since directory iteration
+ // is not ordered on some file systems
+ for (vec::const_iterator it (v.begin()); it != v.end(); ++it)
+ {
+ readImg( it->string().c_str() );
+ } // for
+
+
+
+
+ } // if OK
SetReturnCode( resultShowModal );
// Close();
EndModal( resultShowModal );
+
}
//////////////////////////////////////////////////////////////////////
return imageIO->GetNumberOfDimensions();
}
+
void WxAnySimpleDlg::readImg(const std::string &i_name)
{
size_t dims = getNumberOfDimensions(i_name);
+
//const std::type_info *type= &getType(i_name);
switch(dims)
{
}
else
{
+ printf("EED WxAnySimpleDlg::readImg Not type found for DIM 3 \n");
//????FCY, so what the type????
}
break;
}
else
{
+ printf("EED WxAnySimpleDlg::readImg Not type found for DIM 4 \n");
//????FCY, so what the type????
}
break;
{
typedef itk::Image<short,3> TImage;
typedef itk::GDCMImageIO GDCMType;
+#if ITK_VERSION_MAJOR < 4
typedef itk::DICOMSeriesFileNames dicnames;
+#else // ITK_VERSION_MAJOR < 4
+ typedef itk::GDCMSeriesFileNames dicnames;
+#endif // ITK_VERSION_MAJOR < 4
GDCMType::Pointer gdcmIO = GDCMType::New();
dicnames::Pointer generator = dicnames::New();
git://git.creatis.insa-lyon.fr / creaImageIO.git / commitdiff