X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FcreaImageIOWxAnySimpleDlg.h;h=17656da3f6a15e3fe6da8b486475176bff18f442;hb=3213e0d7adb70f52d723a5b7065f4780b6c9e451;hp=eb10d1e2fb0084a259fa7331ec07f1c536c81110;hpb=e0a559861dcfa6732d80b3158eb2906ca650d5d4;p=creaImageIO.git

diff --git a/src/creaImageIOWxAnySimpleDlg.h b/src/creaImageIOWxAnySimpleDlg.h
index eb10d1e..17656da 100644
--- a/src/creaImageIOWxAnySimpleDlg.h
+++ b/src/creaImageIOWxAnySimpleDlg.h
@@ -1,13 +1,20 @@
 
+
+#ifndef __creaImageIOWxAnySimpleDlg_h_INCLUDED__
+#define __creaImageIOWxAnySimpleDlg_h_INCLUDED__
+
+
+
 #include "creaImageIOSimpleView.h"
 #include <creaWx.h>
 #include <itkImageFileReader.h>
 #include <boost/any.hpp>
+#include <typeinfo>
 namespace creaImageIO
 {
  /**
-   * \ingroup View
-   */
+ * \ingroup View
+ */
 
     /// Simple Wxwidgets interface to select file(s) or directory or from creaImageIO database to display
 //EED    class  __declspec(dllexport) WxAnySimpleDlg : public wxDialog
@@ -18,8 +25,8 @@ namespace creaImageIO
            WxAnySimpleDlg( wxWindow *parent,  
                wxString i_title =_T(""),
                const std::string i_namedescp = "localdatabase_Descriptor.dscp",   
-               const std::string i_namedb   = "Local Database"     
-            );
+               const std::string i_namedb    = "Local Database"
+           );
 
            ~WxAnySimpleDlg(){};
 
@@ -42,13 +49,14 @@ namespace creaImageIO
            std::vector <boost::any>& getImagesSelected(){ return m_AnyImages;}
         
            // return the size of readed images
-           //strange compile error // JPR
-           std::vector<const size_t> getDims(){ return m_AnyDims;}
+           std::vector</*const*/ size_t> getDims(){ return m_AnyDims;} // comment out const // JPR
 
            // return the type of readed images
-           std::vector<const std::type_info *> getTypes(){ return m_AnyType;}
+           std::vector</*const */std::type_info *> getTypes(){ return m_AnyType;} // comment out const // JPR
 
            // get an Image on wanted type
+	   /*
+	   // strange compile error, commented out on Fred's advice // JPR
            template <typename TImage> 
            typename TImage::Pointer getImage(boost::any i_AnyImage)
            {
@@ -57,6 +65,7 @@ namespace creaImageIO
               img = boost::any_cast< ImageOut::Pointer>(i_AnyImage);
               return img;
            }
+           */
 
          // get the images on itk type defined by user
           template <typename TImage> 
@@ -74,9 +83,9 @@ namespace creaImageIO
     private:
 
         // strange compile error with gcc 4.5.1-4 //JPR        
-        std::vector<const size_t> m_AnyDims;
-        std::vector<const std::type_info *> m_AnyType;
-        std::vector<boost::any> m_AnyImages;
+        std::vector</*const*/ size_t>           m_AnyDims;   //comment out const JPR
+        std::vector</*const*/ std::type_info *> m_AnyType;   //comment out const JPR
+        std::vector<boost::any>                 m_AnyImages; //comment out const JPR
         std::vector<std::string> m_exts;
         std::string namedescp; 
         std::string namedb;
@@ -100,3 +109,6 @@ namespace creaImageIO
     };
 
 }
+
+
+#endif //__creaImageIOWxAnySimpleDlg_h_INCLUDED__