std::string vs wxString

[creaImageIO.git] / src / creaImageIOOutputModel.h

diff --git a/src/creaImageIOOutputModel.h b/src/creaImageIOOutputModel.h
index ada72a358d9bf49c0fceecdba9dcbdff08d308fc..8b5b8240e13733c7640e637d7835f6b43225aeab 100644 (file)
--- a/src/creaImageIOOutputModel.h
+++ b/src/creaImageIOOutputModel.h
@@ -7,6 +7,8 @@
 #include <gdcmScanner.h>
 #endif
 
+#include <vector>
+#include <string>
 
 #define OUTPUTMODEL_TAG_i      ""
 #define OUTPUTMODEL_TAG_0      "TAG_BEGIN"
@@ -16,11 +18,9 @@
 #define OUTPUTMODEL_TAG_4      "ANCHOR"
 #define OUTPUTMODEL_TAG(i)     OUTPUTMODEL_TAG_ ## i
 
-
-
-
 namespace creaImageIO
 {
+
        class  OutputModel 
        {
        public:
@@ -30,15 +30,11 @@ namespace creaImageIO
 
 #if defined(USE_XERCES)
                OutputModel(OutputModelParser *i_outparser);
-
-               
-
        
                // Test if we need to check the "dicom" tag if it exists on database
                void setDB(const std::string i_db, const std::string i_table);
 
                const std::string getTag();
-
        
        private:
 
@@ -106,7 +102,9 @@ namespace creaImageIO
                bool checkModel(std::map<std::string, std::string> i_model, const std::string i_val);
 #endif
        };
-                template <class T>
+       
+/*
+        template <class T>
         class OutputSort
         {
         public :
@@ -120,10 +118,11 @@ namespace creaImageIO
 
                 void sort (const std::map<std::string, T> i_values, std::vector<std::string> &o_sort)
                 {
-                        for(T index = tags[OUTPUTMODEL_TAG(0)]; index <= tags[OUTPUTMODEL_TAG(1)]; index += tags[OUTPUTMODEL_TAG(2)])
+                       std::map<std::string, T>::const_iterator it_val; 
+                       for(T index = tags[OUTPUTMODEL_TAG(0)]; index <= tags[OUTPUTMODEL_TAG(1)]; index += tags[OUTPUTMODEL_TAG(2)])
                        {
-                               std::map<std::string, T>::const_iterator it_val = i_values.begin();
-                               for(;it_val != values.end(); it_val++)
+                               //std::map<std::string, T>::const_iterator it_val; 
+                               for(it_val = i_values.begin();it_val != i_values.end(); it_val++)
                                {
                                        if(it_val->second.c_str()  == index)
                                        {
@@ -134,5 +133,7 @@ namespace creaImageIO
                         }
                 }
         };
+*/
+       
 } // namespace creaImageIO
-#endif //__creaImageIOoutputModel_h_INCLUDED__
\ No newline at end of file
+#endif //__creaImageIOoutputModel_h_INCLUDED__