Added HaveSameSize

diff --git a/common/clitkImageCommon.h b/common/clitkImageCommon.h
index 3cd8ae51520d7623bb95e0ccca692e329142684e..fbddb20d3ddabaaba554b0a662c36beba77b0364 100644 (file)
--- a/common/clitkImageCommon.h
+++ b/common/clitkImageCommon.h
@@ -1,7 +1,7 @@
 /*=========================================================================
   Program:   vv                     http://www.creatis.insa-lyon.fr/rio/vv
 
-  Authors belong to: 
+  Authors belong to:
   - University of LYON              http://www.universite-lyon.fr/
   - Léon Bérard cancer center       http://www.centreleonberard.fr
   - CREATIS CNRS laboratory         http://www.creatis.insa-lyon.fr
@@ -27,83 +27,93 @@
 #include "itkImageSeriesReader.h"
 #include "itkImageFileWriter.h"
 
-namespace clitk {
-  
-  //--------------------------------------------------------------------
-  // New Image creation (no allocation)
-  template<class PixelType>
-  typename itk::Image<PixelType,1>::Pointer NewImage1D(int size, double spacing=1.0);
-  template<class PixelType>
-  typename itk::Image<PixelType,2>::Pointer NewImage2D(int sx, int sy, double dx=1.0, double dy=1.0);
-  template<class PixelType>
-  typename itk::Image<PixelType,3>::Pointer NewImage3D(int sx, int sy, int sz, double dx=1.0, double dy=1.0, double dz=1.0);
-  template<class PixelType>
-  typename itk::Image<PixelType,4>::Pointer NewImage4D(int sx, int sy, int sz, int st, double dx=1.0, double dy=1.0, double dz=1.0, double dt=1.0);
-
-  template<class ImageType>
-  typename ImageType::Pointer NewImageLike(const typename ImageType::Pointer input, bool allocate=true);
-
-  template<class ImageType>
-  void CopyValues(const typename ImageType::Pointer input, typename ImageType::Pointer output);
-  //--------------------------------------------------------------------
-  // New Image creation (with allocation)
-
-  //--------------------------------------------------------------------
-  // Read an Write image
-  // template<class ImageType>
-  //   typename ImageType::Pointer ReadImage(const std::string & filename, const bool verbose=false);
-  template<typename ImageType>
-  typename ImageType::Pointer readImage(const std::string & filename, const bool verbose=false);  
-  template<typename ImageType>
-  typename ImageType::Pointer readImage(const std::vector<std::string> & filenames, const bool verbose=false);
-  template<class ImageType>
-  void writeImage(const typename ImageType::Pointer image, const std::string & filename, const bool verbose=false);
-//   template<class ImageType>  
+namespace clitk
+{
+
+//--------------------------------------------------------------------
+// New Image creation (no allocation)
+template<class PixelType>
+typename itk::Image<PixelType,1>::Pointer NewImage1D(int size, double spacing=1.0);
+template<class PixelType>
+typename itk::Image<PixelType,2>::Pointer NewImage2D(int sx, int sy, double dx=1.0, double dy=1.0);
+template<class PixelType>
+typename itk::Image<PixelType,3>::Pointer NewImage3D(int sx, int sy, int sz, double dx=1.0, double dy=1.0, double dz=1.0);
+template<class PixelType>
+typename itk::Image<PixelType,4>::Pointer NewImage4D(int sx, int sy, int sz, int st, double dx=1.0, double dy=1.0, double dz=1.0, double dt=1.0);
+
+template<class ImageType>
+typename ImageType::Pointer NewImageLike(const typename ImageType::Pointer input, bool allocate=true);
+
+template<class ImageType>
+void CopyValues(const typename ImageType::Pointer input, typename ImageType::Pointer output);
+//--------------------------------------------------------------------
+// New Image creation (with allocation)
+
+//--------------------------------------------------------------------
+// Read an Write image
+// template<class ImageType>
+//   typename ImageType::Pointer ReadImage(const std::string & filename, const bool verbose=false);
+template<typename ImageType>
+typename ImageType::Pointer readImage(const std::string & filename, const bool verbose=false);
+template<typename ImageType>
+typename ImageType::Pointer readImage(const std::vector<std::string> & filenames, const bool verbose=false);
+template<class ImageType>
+void writeImage(const typename ImageType::Pointer image, const std::string & filename, const bool verbose=false);
+//   template<class ImageType>
 //   void writeConstImage(const typename ImageType::ConstPointer image, const std::string & filename, const bool verbose=false);
-  template<class ImageType>  
-  void writeImage(const ImageType* image, const std::string & filename, const bool verbose=false);
-
-  //--------------------------------------------------------------------
-  // Read/print image header
-  itk::ImageIOBase::Pointer readImageHeader(const std::string & filename,bool exit_on_error=true);
-  void printImageHeader(itk::ImageIOBase::Pointer header, std::ostream & os, const int level=0);
-
-  //--------------------------------------------------------------------
-  // Determine pixetype and dimension of an image file
-  void ReadImageDimensionAndPixelType(const std::string & filename, int & dimension, std::string & pixeType);
-
-  //--------------------------------------------------------------------
-  // Determine pixetype, dimension and number of pixel components  of an image file
-  void ReadImageDimensionAndPixelType(const std::string & filename, int & dimension, std::string & pixeType, int & components);
-
-  //--------------------------------------------------------------------
-  template<class ImageType>
-  int ComputeHowManyDifferentIntensity(const typename ImageType::Pointer & image, 
-                                      std::vector<typename ImageType::PixelType> & listOfIntensities);
-  template<class InputImageType, class MaskImageType>
-  void ComputeWeightsOfEachClasses(const typename InputImageType::Pointer & input, 
-                                  const typename MaskImageType::Pointer & mask,
-                                  const std::vector<typename MaskImageType::PixelType> & listOfIntensities, 
-                                  std::map<typename MaskImageType::PixelType, 
-                                  std::map<typename InputImageType::PixelType, double> > & mapOfLabelsAndWeights);
-
-  //--------------------------------------------------------------------
-  template<class ImageType1, class ImageType2>
-  bool HaveSameSizeAndSpacing(typename ImageType1::ConstPointer A, 
-                             typename ImageType2::ConstPointer B);
-
-  template<class ImageType1, class ImageType2>
-  bool HaveSameSizeAndSpacing(typename ImageType1::Pointer A, 
-                             typename ImageType2::Pointer B);
-
-  //--------------------------------------------------------------------
-  template<class ImageType1, class ImageType2>
-  bool HaveSameSpacing(typename ImageType1::ConstPointer A, 
-                       typename ImageType2::ConstPointer B);
-
-  template<class ImageType1, class ImageType2>
-  bool HaveSameSpacing(typename ImageType1::Pointer A, 
-                       typename ImageType2::Pointer B);
+template<class ImageType>
+void writeImage(const ImageType* image, const std::string & filename, const bool verbose=false);
+
+//--------------------------------------------------------------------
+// Read/print image header
+itk::ImageIOBase::Pointer readImageHeader(const std::string & filename,bool exit_on_error=true);
+void printImageHeader(itk::ImageIOBase::Pointer header, std::ostream & os, const int level=0);
+
+//--------------------------------------------------------------------
+// Determine pixetype and dimension of an image file
+void ReadImageDimensionAndPixelType(const std::string & filename, int & dimension, std::string & pixeType);
+
+//--------------------------------------------------------------------
+// Determine pixetype, dimension and number of pixel components  of an image file
+void ReadImageDimensionAndPixelType(const std::string & filename, int & dimension, std::string & pixeType, int & components);
+
+//--------------------------------------------------------------------
+template<class ImageType>
+int ComputeHowManyDifferentIntensity(const typename ImageType::Pointer & image,
+                                     std::vector<typename ImageType::PixelType> & listOfIntensities);
+template<class InputImageType, class MaskImageType>
+void ComputeWeightsOfEachClasses(const typename InputImageType::Pointer & input,
+                                 const typename MaskImageType::Pointer & mask,
+                                 const std::vector<typename MaskImageType::PixelType> & listOfIntensities,
+                                 std::map<typename MaskImageType::PixelType,
+                                 std::map<typename InputImageType::PixelType, double> > & mapOfLabelsAndWeights);
+
+//--------------------------------------------------------------------
+template<class ImageType1, class ImageType2>
+bool HaveSameSpacing(typename ImageType1::ConstPointer A,
+                     typename ImageType2::ConstPointer B);
+
+template<class ImageType1, class ImageType2>
+bool HaveSameSpacing(typename ImageType1::Pointer A,
+                     typename ImageType2::Pointer B);
+
+//--------------------------------------------------------------------
+template<class ImageType1, class ImageType2>
+bool HaveSameSize(typename ImageType1::ConstPointer A,
+                  typename ImageType2::ConstPointer B);
+
+template<class ImageType1, class ImageType2>
+bool HaveSameSize(typename ImageType1::Pointer A,
+                  typename ImageType2::Pointer B);
+
+//--------------------------------------------------------------------
+template<class ImageType1, class ImageType2>
+bool HaveSameSizeAndSpacing(typename ImageType1::ConstPointer A,
+                            typename ImageType2::ConstPointer B);
+
+template<class ImageType1, class ImageType2>
+bool HaveSameSizeAndSpacing(typename ImageType1::Pointer A,
+                            typename ImageType2::Pointer B);
 
 #include "clitkImageCommon.txx"
 

diff --git a/common/clitkImageCommon.txx b/common/clitkImageCommon.txx
index 9d8d6e131b62c47bdedd20b599a0b77f8ba56f46..5aa3b2eba55e44db3e973328c370b05935f95cab 100644 (file)
--- a/common/clitkImageCommon.txx
+++ b/common/clitkImageCommon.txx
@@ -21,7 +21,7 @@
 
 //--------------------------------------------------------------------
 template<class PixelType>
-typename itk::Image<PixelType,1>::Pointer 
+typename itk::Image<PixelType,1>::Pointer
 NewImage1D(int vsize, double vspacing)
 {
   typedef itk::Image<PixelType,1> ImageType;
@@ -40,7 +40,7 @@ NewImage1D(int vsize, double vspacing)
 
 //--------------------------------------------------------------------
 template<class PixelType>
-typename itk::Image<PixelType,2>::Pointer 
+typename itk::Image<PixelType,2>::Pointer
 NewImage2D(int sx, int sy, double dx, double dy)
 {
   typedef itk::Image<PixelType,2> ImageType;
@@ -62,7 +62,7 @@ NewImage2D(int sx, int sy, double dx, double dy)
 
 //--------------------------------------------------------------------
 template<class PixelType>
-typename itk::Image<PixelType,3>::Pointer 
+typename itk::Image<PixelType,3>::Pointer
 NewImage3D(int sx, int sy, int sz, double dx, double dy, double dz)
 {
   typedef itk::Image<PixelType,3> ImageType;
@@ -323,13 +323,12 @@ void ComputeWeightsOfEachClasses(const typename InputImageType::Pointer & input,
 
 //--------------------------------------------------------------------
 template<class ImageType1, class ImageType2>
-bool HaveSameSizeAndSpacing(typename ImageType1::ConstPointer A, 
-                           typename ImageType2::ConstPointer B) 
+bool HaveSameSpacing(typename ImageType1::ConstPointer A,
+                     typename ImageType2::ConstPointer B)
 {
   if (A->GetImageDimension() != B->GetImageDimension()) return false;
   for(unsigned int i=0; i<A->GetImageDimension(); i++) {
     if (A->GetSpacing()[i] != B->GetSpacing()[i]) return false;
-    if (A->GetLargestPossibleRegion().GetSize()[i] != B->GetLargestPossibleRegion().GetSize()[i]) return false;
   }
   return true;
 }
@@ -337,13 +336,12 @@ bool HaveSameSizeAndSpacing(typename ImageType1::ConstPointer A,
 
 //--------------------------------------------------------------------
 template<class ImageType1, class ImageType2>
-bool HaveSameSizeAndSpacing(typename ImageType1::Pointer A, 
-                           typename ImageType2::Pointer B) 
+bool HaveSameSpacing(typename ImageType1::Pointer A,
+                     typename ImageType2::Pointer B)
 {
   if (A->GetImageDimension() != B->GetImageDimension()) return false;
   for(unsigned int i=0; i<A->GetImageDimension(); i++) {
     if (A->GetSpacing()[i] != B->GetSpacing()[i]) return false;
-    if (A->GetLargestPossibleRegion().GetSize()[i] != B->GetLargestPossibleRegion().GetSize()[i]) return false;
   }
   return true;
 }
@@ -351,12 +349,12 @@ bool HaveSameSizeAndSpacing(typename ImageType1::Pointer A,
 
 //--------------------------------------------------------------------
 template<class ImageType1, class ImageType2>
-bool HaveSameSpacing(typename ImageType1::ConstPointer A, 
-                     typename ImageType2::ConstPointer B) 
+bool HaveSameSize(typename ImageType1::ConstPointer A,
+                  typename ImageType2::ConstPointer B)
 {
   if (A->GetImageDimension() != B->GetImageDimension()) return false;
   for(unsigned int i=0; i<A->GetImageDimension(); i++) {
-    if (A->GetSpacing()[i] != B->GetSpacing()[i]) return false;
+    if (A->GetLargestPossibleRegion().GetSize()[i] != B->GetLargestPossibleRegion().GetSize()[i]) return false;
   }
   return true;
 }
@@ -364,16 +362,36 @@ bool HaveSameSpacing(typename ImageType1::ConstPointer A,
 
 //--------------------------------------------------------------------
 template<class ImageType1, class ImageType2>
-bool HaveSameSpacing(typename ImageType1::Pointer A, 
-                           typename ImageType2::Pointer B) 
+bool HaveSameSize(typename ImageType1::Pointer A,
+                  typename ImageType2::Pointer B)
 {
   if (A->GetImageDimension() != B->GetImageDimension()) return false;
   for(unsigned int i=0; i<A->GetImageDimension(); i++) {
-    if (A->GetSpacing()[i] != B->GetSpacing()[i]) return false;
+    if (A->GetLargestPossibleRegion().GetSize()[i] != B->GetLargestPossibleRegion().GetSize()[i]) return false;
   }
   return true;
 }
 //--------------------------------------------------------------------
 
+//--------------------------------------------------------------------
+template<class ImageType1, class ImageType2>
+bool HaveSameSizeAndSpacing(typename ImageType1::ConstPointer A,
+                            typename ImageType2::ConstPointer B)
+{
+  return ( HaveSameSize<ImageType1, ImageType2>(A, B) &&
+           HaveSameSpacing<ImageType1, ImageType2>(A, B) );
+}
+//--------------------------------------------------------------------
+
+//--------------------------------------------------------------------
+template<class ImageType1, class ImageType2>
+bool HaveSameSizeAndSpacing(typename ImageType1::Pointer A,
+                            typename ImageType2::Pointer B)
+{
+  return ( HaveSameSize<ImageType1, ImageType2>(A, B) &&
+           HaveSameSpacing<ImageType1, ImageType2>(A, B) );
+}
+//--------------------------------------------------------------------
+
 #endif /* end #define CLITKIMAGECOMMON_TXX */