-
-
-#ifndef __creaImageIOWxAnySimpleDlg_h_INCLUDED__
-#define __creaImageIOWxAnySimpleDlg_h_INCLUDED__
-
-
-
+/*
+# ---------------------------------------------------------------------
+#
+# 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.
+# ------------------------------------------------------------------------
+*/
+
+
+#ifndef __creaImageWxAnySimpleDlg_h_INCLUDED__
+#define __creaImageWxAnySimpleDlg_h_INCLUDED__
+
+#include <vtkVersionMacros.h>
#include "creaImageIOSimpleView.h"
#include <creaWx.h>
#include <itkImageFileReader.h>
#include <boost/any.hpp>
#include <typeinfo>
+#include "itkImageToVTKImageFilter.h"
+
namespace creaImageIO
{
/**
for(; it != m_AnyImages.end(); it++)
{
imgs.push_back(boost::any_cast<TImage*> (*it));
- }
+ } // for
return imgs;
}
bool AllSameType();
- private:
+ template <class TImage>
+ void split3Din3Dvtk(TImage* i_Img)
+ {
+ typedef itk::ImageToVTKImageFilter< TImage > ConnectorType;
+ typename ConnectorType::Pointer connector = ConnectorType::New();
+ connector->SetInput(i_Img);
+ connector->GetImporter()->SetDataScalarTypeToUnsignedChar();
+ connector->Update();
+ vtkImageData *im = vtkImageData::New();
+ im->ShallowCopy(connector->GetOutput());
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
+ im->Update();
+#else
+ im->Modified();
+#endif
+
+
+ m_Vresults.push_back(im);
+ }
+
+ template <typename TImage>
+ void split4Din3Dvtk(TImage* i_Img);
+ private:
// strange compile error with gcc 4.5.1-4 //JPR
std::vector</*const*/ size_t> m_AnyDims; //comment out const JPR
std::vector</*const*/ std::type_info *> m_AnyType; //comment out const JPR
std::string namedb;
wxString infoimage;
std::string m_dir;
- template <class TImage>
- void split3Din3Dvtk(TImage* i_Img);
- template <typename TImage>
- void split4Din3Dvtk(TImage* i_Img);
-
- bool m_dicom;
+ bool m_dicom;
/// interface to read data
SimpleView m_view;
void readImg(const std::string &i_name);
const std::type_info & getType(const std::string &i_name);
};
-}
-
-
-#endif //__creaImageIOWxAnySimpleDlg_h_INCLUDED__
+}// namespace creaImageIO
+#endif //__creaImageWxAnySimpleDlg_h_INCLUDED__