#2854 creaImageIO Feature New Normal - creaImageIOWxSimpleDlg add infoImageSource...

[creaImageIO.git] / src / creaImageIOOutputModel.cpp

diff --git a/src/creaImageIOOutputModel.cpp b/src/creaImageIOOutputModel.cpp
index e072ea271110f1304e752f5446af62d35e3ca58c..dfa234b7129ebfa3cbf78f64cf54cec81c5d6ec1 100644 (file)
--- a/src/creaImageIOOutputModel.cpp
+++ b/src/creaImageIOOutputModel.cpp
@@ -1,11 +1,40 @@
-#include <creaImageIOOutputModel.h>
+/*
+# ---------------------------------------------------------------------
+#
+# 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.
+# ------------------------------------------------------------------------
+*/
+
 
+#include <creaImageIOOutputModel.h>
 #include <boost/filesystem.hpp>
 #include "boost/algorithm/string.hpp"
 
 #if defined(USE_GDCM)
 #include <gdcmGlobal.h>
+#include <gdcmFile.h>
 #include <gdcmSerieHelper.h>
+#include <gdcmFile.h>
 #endif
 
 #if defined(USE_GDCM2)
@@ -14,7 +43,6 @@
 #include <gdcmGlobal.h>
 #endif
 
-
 #if defined(USE_XERCES)
 #include <xercesc/dom/DOM.hpp>
 #include <xercesc/dom/DOMDocument.hpp>
@@ -27,12 +55,11 @@ using namespace xercesc;
 namespace creaImageIO
 {
 
-
        OutputModel::~OutputModel()
        {
        }
 
-                #if defined(USE_GDCM)
+#if defined(USE_GDCM)
         double OutputModel::orderFilesWithZspacing(std::vector<std::string> &im)
        {
                double spacing=1;
@@ -55,8 +82,7 @@ namespace creaImageIO
                                lstAux.push_back(*it);
                        }
                } // for
-                       
-               
+
                if ((fileVector.size()>1) && (sh->IsCoherent( &fileVector )))
                {
                                sh->OrderFileList(&fileVector);
@@ -74,11 +100,11 @@ namespace creaImageIO
                }else {
                        std::sort( im.begin(), im.end() );
                }
-                               
+               
           return spacing;
        }
 
-       #endif
+#endif
 
 #if defined(USE_GDCM2)
        // TO DO
@@ -88,8 +114,6 @@ namespace creaImageIO
        }
 #endif
 
-
-
 #if defined(USE_XERCES)
 
        OutputModel::OutputModel(OutputModelParser *i_outparser) : m_outparser(i_outparser)
@@ -116,7 +140,6 @@ namespace creaImageIO
                }
 
                return bres;
-
        }
 
        OutputModel::~OutputModel()
@@ -240,8 +263,7 @@ namespace creaImageIO
                                        o_val[(*it)] = "";
                                }
                        }
-               }
-                
+               } 
        }
 
        //const gdcm::VR::VRType OutputModel::getType(const std::string i_tag)
@@ -257,7 +279,6 @@ namespace creaImageIO
 #endif
 
 
-
 #if defined(USE_GDCM)
        double OutputModel::orderFiles(std::vector<std::string> im, std::vector<std::string> &out)
 {
@@ -304,7 +325,7 @@ namespace creaImageIO
 #endif 
 
 
-        void OutputModel::sort(const std::vector<std::string> i_filenames, std::vector<std::string> &o_sort, int level)
+       void OutputModel::sort(const std::vector<std::string> i_filenames, std::vector<std::string> &o_sort, int level)
        {
 #if defined(USE_XERCES)
                int tags[3];
@@ -318,7 +339,7 @@ namespace creaImageIO
                if( checkModel(model, OUTPUTMODEL_TAG(3)) && !b_db)
                {
 #if defined (USE_GDCM2)
-                       
+       
                        //OutputSort< getType(model[OUTPUTMODEL_TAG(3)] > osort;
                        
                        getValues<std::string>(i_filenames, model[OUTPUTMODEL_TAG(3)], values);
@@ -395,8 +416,6 @@ namespace creaImageIO
                }
 #endif
        }
-
 #endif
 
-
-}
\ No newline at end of file
+}