Rename clitkImage2DicomSeries to clitkSpect2Dicom

diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index 9af9f16bc0e3741c44198c3f421c99b291c5fe7c..e616c358fa6b156fbf976032f894afb3e58db9b1 100644 (file)
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -100,10 +100,10 @@ if(CLITK_BUILD_TOOLS)
   target_link_libraries(clitkWriteDicomSeries clitkCommon )
   set(TOOLS_INSTALL ${TOOLS_INSTALL} clitkWriteDicomSeries)
   
-  WRAP_GGO(clitkImage2DicomSeries_GGO_C clitkImage2DicomSeries.ggo)
-  add_executable(clitkImage2DicomSeries clitkImage2DicomSeries.cxx ${clitkImage2DicomSeries_GGO_C})
-  target_link_libraries(clitkImage2DicomSeries clitkCommon )
-  set(TOOLS_INSTALL ${TOOLS_INSTALL} clitkImage2DicomSeries)
+  WRAP_GGO(clitkSpect2Dicom_GGO_C clitkSpect2Dicom.ggo)
+  add_executable(clitkSpect2Dicom clitkSpect2Dicom.cxx ${clitkSpect2Dicom_GGO_C})
+  target_link_libraries(clitkSpect2Dicom clitkCommon )
+  set(TOOLS_INSTALL ${TOOLS_INSTALL} clitkSpect2Dicom)
 
   WRAP_GGO(clitkChangeDicomTag_GGO_C clitkChangeDicomTag.ggo)
   add_executable(clitkChangeDicomTag clitkChangeDicomTag.cxx ${clitkChangeDicomTag_GGO_C})

diff --git a/tools/clitkImage2DicomSeries.cxx b/tools/clitkSpect2Dicom.cxx
similarity index 81%
rename from tools/clitkImage2DicomSeries.cxx
rename to tools/clitkSpect2Dicom.cxx
index 10a964c0182fb6c6f32bae6b79ec82a257c5291d..cf372a21e1793ff7a4f8e192f95aff2c5abc862b 100644 (file)
--- a/tools/clitkImage2DicomSeries.cxx
+++ b/tools/clitkSpect2Dicom.cxx
@@ -17,9 +17,9 @@
 ===========================================================================**/
 
 /* =================================================
- * @file   clitkImage2DicomSeries.cxx
- * @author Jef Vandemeulebroucke
- * @date   4th of August
+ * @file   clitkSpect2Dicom.cxx
+ * @author Thomas B
+ * @date   2018
  *
  * @brief Write a volume into a series with the header of another series
  *
@@ -27,9 +27,9 @@
 
 
 // clitk
-#include "clitkImage2DicomSeries_ggo.h"
+#include "clitkSpect2Dicom_ggo.h"
 #include "clitkIO.h"
-#include "clitkImage2DicomSeriesGenericFilter.h"
+#include "clitkSpect2DicomGenericFilter.h"
 #include "clitkCommon.h"
 
 //--------------------------------------------------------------------
@@ -37,11 +37,11 @@ int main(int argc, char * argv[])
 {
 
   // Init command line
-  GGO(clitkImage2DicomSeries, args_info);
+  GGO(clitkSpect2Dicom, args_info);
   CLITK_INIT;
 
   // Filter
-  typedef clitk::Image2DicomSeriesGenericFilter<args_info_clitkImage2DicomSeries> FilterType;
+  typedef clitk::Spect2DicomGenericFilter<args_info_clitkSpect2Dicom> FilterType;
   FilterType::Pointer genericFilter = FilterType::New();
 
   genericFilter->SetArgsInfo(args_info);

diff --git a/tools/clitkImage2DicomSeries.ggo b/tools/clitkSpect2Dicom.ggo
similarity index 61%
rename from tools/clitkImage2DicomSeries.ggo
rename to tools/clitkSpect2Dicom.ggo
index 3067e34dadebbb748d351a363c11608d0260ef66..617e2c05b60165581bffbb9588aa00d10796a783 100644 (file)
--- a/tools/clitkImage2DicomSeries.ggo
+++ b/tools/clitkSpect2Dicom.ggo
@@ -1,7 +1,7 @@
-#File clitkImage2DicomSeries.ggo
-package "clitkImage2DicomSeries"
+#File clitkSpect2Dicom.ggo
+package "clitkSpect2Dicom"
 version "1.0"
-purpose "Convert the mhd input image (int image) into a dicom serie in outputDir base on the dictionary of the dicoms in inputDir."
+purpose "Convert the 3D mhd input SPECT image (int image) into a 3D dicom in outputDir based on the dictionary of the dicoms in inputDir."
 
 option "config"     - "Config file"             string  no
 option "verbose"    v "Verbose"                 flag    off

diff --git a/tools/clitkImage2DicomSeriesGenericFilter.cxx b/tools/clitkSpect2DicomGenericFilter.cxx
similarity index 79%
rename from tools/clitkImage2DicomSeriesGenericFilter.cxx
rename to tools/clitkSpect2DicomGenericFilter.cxx
index 26e4f0e8162b188cfe083837c4ed4bf6699d06e1..50d15ee90d454c05477c121c678cafc396527f67 100644 (file)
--- a/tools/clitkImage2DicomSeriesGenericFilter.cxx
+++ b/tools/clitkSpect2DicomGenericFilter.cxx
@@ -15,11 +15,11 @@
   - BSD        See included LICENSE.txt file
   - CeCILL-B   http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
 ===========================================================================**/
-#ifndef clitkImage2DicomSeriesGenericFilter_cxx
-#define clitkImage2DicomSeriesGenericFilter_cxx
+#ifndef clitkSpect2DicomGenericFilter_cxx
+#define clitkSpect2DicomGenericFilter_cxx
 
 /* =================================================
- * @file   clitkImage2DicomSeriesGenericFilter.cxx
+ * @file   clitkSpect2DicomGenericFilter.cxx
  * @author
  * @date
  *
@@ -27,7 +27,7 @@
  *
  ===================================================*/
 
-#include "clitkImage2DicomSeriesGenericFilter.h"
+#include "clitkSpect2DicomGenericFilter.h"
 
 
 namespace clitk
@@ -36,4 +36,4 @@ namespace clitk
 
 } //end clitk
 
-#endif  //#define clitkImage2DicomSeriesGenericFilter_cxx
+#endif  //#define clitkSpect2DicomGenericFilter_cxx

diff --git a/tools/clitkImage2DicomSeriesGenericFilter.h b/tools/clitkSpect2DicomGenericFilter.h
similarity index 86%
rename from tools/clitkImage2DicomSeriesGenericFilter.h
rename to tools/clitkSpect2DicomGenericFilter.h
index b77d05a540eba0cc5d6532818390f55b1186731b..7f65d16b34b0229c6eadfe2c728a4748d87ef159 100644 (file)
--- a/tools/clitkImage2DicomSeriesGenericFilter.h
+++ b/tools/clitkSpect2DicomGenericFilter.h
@@ -15,11 +15,11 @@
   - BSD        See included LICENSE.txt file
   - CeCILL-B   http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
 ===========================================================================**/
-#ifndef clitkImage2DicomSeriesGenericFilter_h
-#define clitkImage2DicomSeriesGenericFilter_h
+#ifndef clitkSpect2DicomGenericFilter_h
+#define clitkSpect2DicomGenericFilter_h
 
 /* =================================================
- * @file   clitkImage2DicomSeriesGenericFilter.h
+ * @file   clitkSpect2DicomGenericFilter.h
  * @author 
  * @date   
  * 
@@ -31,7 +31,7 @@
 // clitk include
 #include "clitkIO.h"
 #include "clitkImageCommon.h"
-#include "clitkImage2DicomSeries_ggo.h"
+#include "clitkSpect2Dicom_ggo.h"
 
 //itk include
 #include "itkLightObject.h"
@@ -77,13 +77,13 @@
 namespace clitk 
 {
   template<class args_info_type>
-  class ITK_EXPORT Image2DicomSeriesGenericFilter : public itk::LightObject
+  class ITK_EXPORT Spect2DicomGenericFilter : public itk::LightObject
   {
   public:
     //----------------------------------------
     // ITK
     //----------------------------------------
-    typedef Image2DicomSeriesGenericFilter                   Self;
+    typedef Spect2DicomGenericFilter                   Self;
     typedef itk::LightObject                   Superclass;
     typedef itk::SmartPointer<Self>            Pointer;
     typedef itk::SmartPointer<const Self>      ConstPointer;
@@ -92,7 +92,7 @@ namespace clitk
     itkNewMacro(Self);  
 
     // Run-time type information (and related methods)
-    itkTypeMacro( Image2DicomSeriesGenericFilter, LightObject );
+    itkTypeMacro( Spect2DicomGenericFilter, LightObject );
 
 
     //----------------------------------------
@@ -121,8 +121,8 @@ namespace clitk
     //----------------------------------------  
     // Constructor & Destructor
     //----------------------------------------  
-    Image2DicomSeriesGenericFilter();
-    ~Image2DicomSeriesGenericFilter() {};
+    Spect2DicomGenericFilter();
+    ~Spect2DicomGenericFilter() {};
 
     
     //void CopyDictionary (itk::MetaDataDictionary &fromDict, itk::MetaDataDictionary &toDict);
@@ -146,7 +146,7 @@ namespace clitk
 } // end namespace clitk
 
 #ifndef ITK_MANUAL_INSTANTIATION
-#include "clitkImage2DicomSeriesGenericFilter.txx"
+#include "clitkSpect2DicomGenericFilter.txx"
 #endif
 
-#endif // #define clitkImage2DicomSeriesGenericFilter_h
+#endif // #define clitkSpect2DicomGenericFilter_h

diff --git a/tools/clitkImage2DicomSeriesGenericFilter.txx b/tools/clitkSpect2DicomGenericFilter.txx
similarity index 98%
rename from tools/clitkImage2DicomSeriesGenericFilter.txx
rename to tools/clitkSpect2DicomGenericFilter.txx
index 6fe5093435fba61c5f16da79be8dcd7cf32ad02a..03e2b055e04e4df3c1734b2f14ca48f86c874423 100644 (file)
--- a/tools/clitkImage2DicomSeriesGenericFilter.txx
+++ b/tools/clitkSpect2DicomGenericFilter.txx
@@ -15,11 +15,11 @@
   - BSD        See included LICENSE.txt file
   - CeCILL-B   http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
 ===========================================================================**/
-#ifndef clitkImage2DicomSeriesGenericFilter_txx
-#define clitkImage2DicomSeriesGenericFilter_txx
+#ifndef clitkSpect2DicomGenericFilter_txx
+#define clitkSpect2DicomGenericFilter_txx
 
 /* =================================================
- * @file   clitkImage2DicomSeriesGenericFilter.txx
+ * @file   clitkSpect2DicomGenericFilter.txx
  * @author
  * @date
  *
@@ -87,7 +87,7 @@ namespace clitk
 // Constructor
 //-----------------------------------------------------------
 template<class args_info_type>
-Image2DicomSeriesGenericFilter<args_info_type>::Image2DicomSeriesGenericFilter()
+Spect2DicomGenericFilter<args_info_type>::Spect2DicomGenericFilter()
 {
   m_Verbose=false;
   m_InputFileName="";
@@ -98,7 +98,7 @@ Image2DicomSeriesGenericFilter<args_info_type>::Image2DicomSeriesGenericFilter()
 // Update
 //-----------------------------------------------------------
 template<class args_info_type>
-void Image2DicomSeriesGenericFilter<args_info_type>::Update()
+void Spect2DicomGenericFilter<args_info_type>::Update()
 {
   // Read the Dimension and PixelType
   int Dimension;
@@ -122,7 +122,7 @@ void Image2DicomSeriesGenericFilter<args_info_type>::Update()
 template<class args_info_type>
 template<unsigned int Dimension>
 void
-Image2DicomSeriesGenericFilter<args_info_type>::UpdateWithDim(std::string PixelType)
+Spect2DicomGenericFilter<args_info_type>::UpdateWithDim(std::string PixelType)
 {
   if (m_Verbose) std::cout << "Image was detected to be "<<Dimension<<"D and "<< PixelType<<"..."<<std::endl;
 
@@ -164,7 +164,7 @@ Image2DicomSeriesGenericFilter<args_info_type>::UpdateWithDim(std::string PixelT
 template<class args_info_type>
 template <unsigned int Dimension, class  PixelType>
 void
-Image2DicomSeriesGenericFilter<args_info_type>::UpdateWithDimAndPixelType()
+Spect2DicomGenericFilter<args_info_type>::UpdateWithDimAndPixelType()
 {
 
 
@@ -795,4 +795,4 @@ Image2DicomSeriesGenericFilter<args_info_type>::UpdateWithDimAndPixelType()
 
 }//end clitk
 
-#endif //#define clitkImage2DicomSeriesGenericFilter_txx
+#endif //#define clitkSpect2DicomGenericFilter_txx