]> Creatis software - clitk.git/commitdiff
Merge branch 'master' of git.creatis.insa-lyon.fr:clitk
authortbaudier <thomas.baudier@creatis.insa-lyon.fr>
Tue, 6 Jun 2017 06:49:10 +0000 (08:49 +0200)
committertbaudier <thomas.baudier@creatis.insa-lyon.fr>
Tue, 6 Jun 2017 06:49:10 +0000 (08:49 +0200)
CMakeLists.txt
tools/CMakeLists.txt
tools/clitkMaskOfIntegratedIntensity.cxx [new file with mode: 0644]
tools/clitkMaskOfIntegratedIntensity.ggo [new file with mode: 0644]
tools/clitkMaskOfIntegratedIntensityGenericFilter.h [new file with mode: 0644]
tools/clitkMaskOfIntegratedIntensityGenericFilter.txx [new file with mode: 0644]
utilities/CxImage/ximaenc.cpp
utilities/CxImage/ximagif.cpp
utilities/CxImage/ximaint.cpp

index c4fbc59a14fe072247bd46ae6fa5a61637c054ff..6554e49bda4910e3ed6b395fc5a41d6013e06c03 100644 (file)
@@ -6,6 +6,7 @@ cmake_policy(VERSION 2.8)
 if(COMMAND cmake_policy)
     cmake_policy(SET CMP0003 NEW)
     cmake_policy(SET CMP0007 NEW)
+    cmake_policy(SET CMP0053 NEW)
 endif(COMMAND cmake_policy)
 if(NOT DEFINED CLITK_SOURCE_DIR)
   set(CLITK_SOURCE_DIR ${PROJECT_SOURCE_DIR})
index b0751e65f5e8407a7192793075af1a60d818d82d..810341eef8f081d52a74b922d8058dd38aa50014 100644 (file)
@@ -351,6 +351,12 @@ if(CLITK_BUILD_TOOLS)
   target_link_libraries(clitkImageIntensityWindowing clitkCommon )
   set(TOOLS_INSTALL ${TOOLS_INSTALL} clitkImageIntensityWindowing)
 
+  WRAP_GGO(clitkMaskOfIntegratedIntensity_GGO_C clitkMaskOfIntegratedIntensity.ggo)
+  add_executable(clitkMaskOfIntegratedIntensity clitkMaskOfIntegratedIntensity.cxx ${clitkMaskOfIntegratedIntensity_GGO_C})
+  target_link_libraries(clitkMaskOfIntegratedIntensity clitkCommon )
+  set(TOOLS_INSTALL ${TOOLS_INSTALL} clitkMaskOfIntegratedIntensity)
+
+
   WRAP_GGO(clitkBlurImage_GGO_C clitkBlurImage.ggo)
   add_executable(clitkBlurImage clitkBlurImage.cxx ${clitkBlurImage_GGO_C})
   target_link_libraries(clitkBlurImage clitkCommon )
diff --git a/tools/clitkMaskOfIntegratedIntensity.cxx b/tools/clitkMaskOfIntegratedIntensity.cxx
new file mode 100644 (file)
index 0000000..93d53e1
--- /dev/null
@@ -0,0 +1,41 @@
+/*=========================================================================
+  Program:   vv                     http://www.creatis.insa-lyon.fr/rio/vv
+
+  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
+
+  This software is distributed WITHOUT ANY WARRANTY; without even
+  the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+  PURPOSE.  See the copyright notices for more information.
+
+  It is distributed under dual licence
+
+  - BSD        See included LICENSE.txt file
+  - CeCILL-B   http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
+===========================================================================**/
+
+// clitk
+#include "clitkMaskOfIntegratedIntensity_ggo.h"
+#include "clitkMaskOfIntegratedIntensityGenericFilter.h"
+
+//--------------------------------------------------------------------
+int main(int argc, char * argv[])
+{
+
+  // Init command line
+  GGO(clitkMaskOfIntegratedIntensity, args_info);
+  CLITK_INIT;
+
+  // Filter
+  typedef clitk::MaskOfIntegratedIntensityGenericFilter<args_info_clitkMaskOfIntegratedIntensity> FilterType;
+  FilterType::Pointer filter = FilterType::New();
+
+  filter->SetArgsInfo(args_info);
+  filter->Update();
+
+  return EXIT_SUCCESS;
+}// end main
+
+//--------------------------------------------------------------------
diff --git a/tools/clitkMaskOfIntegratedIntensity.ggo b/tools/clitkMaskOfIntegratedIntensity.ggo
new file mode 100644 (file)
index 0000000..c60f92f
--- /dev/null
@@ -0,0 +1,12 @@
+#File clitkMaskOfIntegratedIntensity.ggo
+package "clitkMaskOfIntegratedIntensity"
+version "1.0"
+purpose "Compute a mask that represent X% of the total pixels values"
+
+option "config"                 -      "Config file"           string  optional
+option "verbose"        v  "Verbose"                     flag          off
+option "imagetypes"  -  "Display allowed image types"    flag          off
+
+option "input"         i       "Input image filename"            string  required
+option "output"   o "Output image filename"              string        required
+option "percentage"                p   "Percentage of total pixels values (in %)" double required
diff --git a/tools/clitkMaskOfIntegratedIntensityGenericFilter.h b/tools/clitkMaskOfIntegratedIntensityGenericFilter.h
new file mode 100644 (file)
index 0000000..a2df346
--- /dev/null
@@ -0,0 +1,75 @@
+/*=========================================================================
+  Program:   vv                     http://www.creatis.insa-lyon.fr/rio/vv
+
+  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
+
+  This software is distributed WITHOUT ANY WARRANTY; without even
+  the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+  PURPOSE.  See the copyright notices for more information.
+
+  It is distributed under dual licence
+
+  - BSD        See included LICENSE.txt file
+  - CeCILL-B   http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
+  ===========================================================================**/
+
+#ifndef CLITKMaskOfIntegratedIntensityGENERICFILTER_H
+#define CLITKMaskOfIntegratedIntensityGENERICFILTER_H
+
+#include "clitkIO.h"
+#include "clitkImageToImageGenericFilter.h"
+
+//--------------------------------------------------------------------
+namespace clitk
+{
+
+  template<class args_info_type>
+    class ITK_EXPORT MaskOfIntegratedIntensityGenericFilter:
+    public ImageToImageGenericFilter<MaskOfIntegratedIntensityGenericFilter<args_info_type> >
+    {
+
+    public:
+
+      //--------------------------------------------------------------------
+      MaskOfIntegratedIntensityGenericFilter();
+
+      //--------------------------------------------------------------------
+      typedef MaskOfIntegratedIntensityGenericFilter         Self;
+      typedef itk::SmartPointer<Self>                      Pointer;
+      typedef itk::SmartPointer<const Self>                ConstPointer;
+
+      //--------------------------------------------------------------------
+      // Method for creation through the object factory
+      // and Run-time type information (and related methods)
+      itkNewMacro(Self);
+      itkTypeMacro(MaskOfIntegratedIntensityGenericFilter, LightObject);
+
+      //--------------------------------------------------------------------
+      void SetArgsInfo(const args_info_type & a);
+
+      void SetPercentage(double p) { mPercentage = p; }
+      double GetPercentage() const { return mPercentage; }
+
+      //--------------------------------------------------------------------
+      // Main function called each time the filter is updated
+      template<class InputImageType>
+        void UpdateWithInputImageType();
+
+    protected:
+      template<unsigned int Dim> void InitializeImageType();
+      args_info_type mArgsInfo;
+      double mPercentage;
+
+    }; // end class
+  //--------------------------------------------------------------------
+
+} // end namespace clitk
+
+#ifndef ITK_MANUAL_INSTANTIATION
+#include "clitkMaskOfIntegratedIntensityGenericFilter.txx"
+#endif
+
+#endif // #define clitkMaskOfIntegratedIntensityGenericFilter_h
diff --git a/tools/clitkMaskOfIntegratedIntensityGenericFilter.txx b/tools/clitkMaskOfIntegratedIntensityGenericFilter.txx
new file mode 100644 (file)
index 0000000..3096d87
--- /dev/null
@@ -0,0 +1,169 @@
+/*=========================================================================
+  Program:   vv                     http://www.creatis.insa-lyon.fr/rio/vv
+
+  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
+
+  This software is distributed WITHOUT ANY WARRANTY; without even
+  the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+  PURPOSE.  See the copyright notices for more information.
+
+  It is distributed under dual licence
+
+  - BSD        See included LICENSE.txt file
+  - CeCILL-B   http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
+  ===========================================================================**/
+
+#ifndef clitkMaskOfIntegratedIntensityGenericFilter_txx
+#define clitkMaskOfIntegratedIntensityGenericFilter_txx
+
+// itk include
+#include "itkIntensityWindowingImageFilter.h"
+#include "itkLabelStatisticsImageFilter.h"
+#include "itkMaskImageFilter.h"
+#include "itkMaskNegatedImageFilter.h"
+#include <clitkCommon.h>
+#include <numeric>
+
+namespace clitk
+{
+
+  //--------------------------------------------------------------------
+  template<class args_info_type>
+  MaskOfIntegratedIntensityGenericFilter<args_info_type>::MaskOfIntegratedIntensityGenericFilter():
+    ImageToImageGenericFilter<Self>("MaskOfIntegratedIntensity")
+  {
+    InitializeImageType<2>();
+    InitializeImageType<3>();
+  }
+  //--------------------------------------------------------------------
+
+
+  //--------------------------------------------------------------------
+  template<class args_info_type>
+  template<unsigned int Dim>
+  void MaskOfIntegratedIntensityGenericFilter<args_info_type>::InitializeImageType()
+  {
+    ADD_DEFAULT_IMAGE_TYPES(Dim);
+  }
+  //--------------------------------------------------------------------
+
+
+  //--------------------------------------------------------------------
+  template<class args_info_type>
+  void MaskOfIntegratedIntensityGenericFilter<args_info_type>::SetArgsInfo(const args_info_type & a)
+  {
+    mArgsInfo=a;
+    this->SetIOVerbose(mArgsInfo.verbose_flag);
+    if (mArgsInfo.imagetypes_flag) this->PrintAvailableImageTypes();
+
+    this->SetInputFilename(mArgsInfo.input_arg);
+    this->SetOutputFilename(mArgsInfo.output_arg);
+    this->SetPercentage(mArgsInfo.percentage_arg);
+
+  }
+  //--------------------------------------------------------------------
+
+
+  //--------------------------------------------------------------------
+  //  https://stackoverflow.com/questions/1577475/c-sorting-and-keeping-track-of-indexes
+  template <typename T>
+  std::vector<size_t> sort_indexes(const std::vector<T> &v) {
+
+    // initialize original index locations
+    std::vector<size_t> idx(v.size());
+    iota(idx.begin(), idx.end(), 0);
+
+    // sort indexes based on comparing values in v
+    std::sort(idx.begin(), idx.end(),
+              [&v](size_t i1, size_t i2) {return v[i1] > v[i2];});
+
+    return idx;
+  }
+  //--------------------------------------------------------------------
+
+
+  //--------------------------------------------------------------------
+  // Update with the number of dimensions and the pixeltype
+  //--------------------------------------------------------------------
+  template<class args_info_type>
+  template<class InputImageType>
+  void
+  MaskOfIntegratedIntensityGenericFilter<args_info_type>::UpdateWithInputImageType()
+  {
+    // Main filter
+    typedef typename InputImageType::PixelType InputPixelType;
+    typedef itk::Image<unsigned char, InputImageType::ImageDimension> MaskImageType;
+
+    // Reading input
+    typename InputImageType::Pointer input = this->template GetInput<InputImageType>(0);
+
+    typename MaskImageType::Pointer mask;
+    mask = MaskImageType::New();
+    mask->SetRegions(input->GetLargestPossibleRegion());
+    mask->SetOrigin(input->GetOrigin());
+    mask->SetSpacing(input->GetSpacing());
+    mask->Allocate();
+    mask->FillBuffer(0);
+
+    // Get a vector of all values (will be easier to sort)
+    // And compute total sum of values
+    std::vector<double> values;
+    typedef itk::ImageRegionIterator<InputImageType> IteratorInputType;
+    IteratorInputType iter(input, input->GetLargestPossibleRegion());
+    iter.GoToBegin();
+    double total = 0.0;
+    while (!iter.IsAtEnd()) {
+      values.push_back(iter.Get());
+      total += iter.Get();
+      ++iter;
+    }
+
+    // Sort (reverse)
+    auto indices = sort_indexes(values);
+
+    // Get max index of pixel to reach xx percent
+    double current = 0.0;
+    double max = GetPercentage()/100.0*total;
+    int i=0;
+    auto n = input->GetLargestPossibleRegion().GetNumberOfPixels();
+    std::vector<int> should_keep(values.size());;
+    std::fill(should_keep.begin(), should_keep.end(), 0);
+    while (current<max and i<n) { // loop by decreasing pixel values
+      current += values[indices[i]];
+      should_keep[indices[i]] = 1.0;
+      ++i;
+    }
+    int nb = i;
+
+    // Set mask values
+    typedef itk::ImageRegionIterator<MaskImageType> IteratorMaskType;
+    IteratorMaskType itm(mask, mask->GetLargestPossibleRegion());
+    iter.GoToBegin();
+    itm.GoToBegin();
+    i = 0;
+    while (!iter.IsAtEnd()) {
+      if (should_keep[i]) itm.Set(1);
+      ++iter;
+      ++itm;
+      ++i;
+    }
+
+    // Verbose option
+    if (this->m_IOVerbose)
+      std::cout << "Sum of pixel values : " << total << std::endl
+                << "Percentage          : " << GetPercentage() << "%" << std::endl
+                << "Number of pixels    : " << nb << "/" << n << std::endl
+                << "Number of pixels    : " << nb/n*100.0 << "%" << std::endl;
+
+    // Write/Save results
+    this->template SetNextOutput<MaskImageType>(mask);
+  }
+  //--------------------------------------------------------------------
+
+
+}//end clitk
+
+#endif //#define clitkMaskOfIntegratedIntensityGenericFilter_txx
index 8edfbfcd6d5521a681372eb67203a91b26f9d4a5..4f095feb2a42dac9774287f8c1c10822fa2a2002 100644 (file)
@@ -996,7 +996,7 @@ bool CxImage::CheckFormat(CxFile * hFile, DWORD imagetype)
 ////////////////////////////////////////////////////////////////////////////////
 bool CxImage::CheckFormat(BYTE * buffer, DWORD size, DWORD imagetype)
 {
-       if (buffer==NULL || size==NULL){
+       if (buffer==NULL || size==0){
                strcpy(info.szLastError,"invalid or empty buffer");
                return false;
        }
index 740717c730107874c3cbdebaca305a358e185bb0..0c89759749f6d88f9a7eda18b989a76fcbf69d7c 100644 (file)
@@ -718,8 +718,8 @@ void CxImageGIF::Putword(int w, CxFile *fp )
 ////////////////////////////////////////////////////////////////////////////////
 void CxImageGIF::compressNONE( int init_bits, CxFile* outfile)
 {
-       register long c;
-       register long ent;
+       long c;
+       long ent;
 
        // g_init_bits - initial number of bits
        // g_outfile   - pointer to output file
@@ -766,12 +766,12 @@ void CxImageGIF::compressNONE( int init_bits, CxFile* outfile)
 
 void CxImageGIF::compressLZW( int init_bits, CxFile* outfile)
 {
-       register long fcode;
-       register long c;
-       register long ent;
-       register long hshift;
-       register long disp;
-       register long i;
+       long fcode;
+       long c;
+       long ent;
+       long hshift;
+       long disp;
+       long i;
 
        // g_init_bits - initial number of bits
        // g_outfile   - pointer to output file
@@ -891,10 +891,10 @@ void CxImageGIF::output( code_int  code)
 void CxImageGIF::cl_hash(long hsize)
 
 {
-       register long *htab_p = htab+hsize;
+       long *htab_p = htab+hsize;
 
-       register long i;
-       register long m1 = -1L;
+       long i;
+       long m1 = -1L;
 
        i = hsize - 16;
 
@@ -1061,9 +1061,9 @@ short CxImageGIF::get_next_code(CxFile* file)
  */
 short CxImageGIF::decoder(CxFile* file, CImageIterator* iter, short linewidth, int &bad_code_count)
 {
-       register BYTE *sp, *bufptr;
+       BYTE *sp, *bufptr;
        BYTE *buf;
-       register short code, fc, oc, bufcnt;
+       short code, fc, oc, bufcnt;
        short c, size, ret;
 
        /* Initialize for decoding a new image... */
index 989d76cf71e3d1014cb7b95d2e46706a2995c0dd..c30e882a47e32a34af80d9f5c56d5709128a835c 100644 (file)
@@ -853,7 +853,7 @@ float CxImage::KernelBessel_J1(const float x)
 {
        double p, q;
        
-       register long i;
+       long i;
        
        static const double
        Pone[] =
@@ -895,7 +895,7 @@ float CxImage::KernelBessel_P1(const float x)
 {
        double p, q;
        
-       register long i;
+       long i;
        
        static const double
        Pone[] =
@@ -931,7 +931,7 @@ float CxImage::KernelBessel_Q1(const float x)
 {
        double p, q;
        
-       register long i;
+       long i;
        
        static const double
        Pone[] =