std::string vs wxString

[creaImageIO.git] / src / creaImageIOOutputModel.cpp

diff --git a/src/creaImageIOOutputModel.cpp b/src/creaImageIOOutputModel.cpp
index e072ea271110f1304e752f5446af62d35e3ca58c..5db5fd790a08af9a2615eb9651202f1290a738c2 100644 (file)
--- a/src/creaImageIOOutputModel.cpp
+++ b/src/creaImageIOOutputModel.cpp
@@ -6,6 +6,7 @@
 #if defined(USE_GDCM)
 #include <gdcmGlobal.h>
 #include <gdcmSerieHelper.h>
+#include <gdcmFile.h>
 #endif
 
 #if defined(USE_GDCM2)
@@ -14,7 +15,6 @@
 #include <gdcmGlobal.h>
 #endif
 
-
 #if defined(USE_XERCES)
 #include <xercesc/dom/DOM.hpp>
 #include <xercesc/dom/DOMDocument.hpp>
@@ -27,12 +27,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 +54,7 @@ namespace creaImageIO
                                lstAux.push_back(*it);
                        }
                } // for
-                       
-               
+
                if ((fileVector.size()>1) && (sh->IsCoherent( &fileVector )))
                {
                                sh->OrderFileList(&fileVector);
@@ -78,7 +76,7 @@ namespace creaImageIO
           return spacing;
        }
 
-       #endif
+#endif
 
 #if defined(USE_GDCM2)
        // TO DO
@@ -88,8 +86,6 @@ namespace creaImageIO
        }
 #endif
 
-
-
 #if defined(USE_XERCES)
 
        OutputModel::OutputModel(OutputModelParser *i_outparser) : m_outparser(i_outparser)
@@ -116,7 +112,6 @@ namespace creaImageIO
                }
 
                return bres;
-
        }
 
        OutputModel::~OutputModel()
@@ -240,8 +235,7 @@ namespace creaImageIO
                                        o_val[(*it)] = "";
                                }
                        }
-               }
-                
+               } 
        }
 
        //const gdcm::VR::VRType OutputModel::getType(const std::string i_tag)
@@ -257,7 +251,6 @@ namespace creaImageIO
 #endif
 
 
-
 #if defined(USE_GDCM)
        double OutputModel::orderFiles(std::vector<std::string> im, std::vector<std::string> &out)
 {
@@ -304,7 +297,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 +311,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 +388,6 @@ namespace creaImageIO
                }
 #endif
        }
-
 #endif
 
-
-}
\ No newline at end of file
+}