]> Creatis software - creaImageIO.git/commitdiff
fix linux compilation
authorFrederic Cervenansky <Frederic.Cervenansky@creatis.insa-lyon.fr>
Fri, 16 Nov 2012 09:38:23 +0000 (09:38 +0000)
committerFrederic Cervenansky <Frederic.Cervenansky@creatis.insa-lyon.fr>
Fri, 16 Nov 2012 09:38:23 +0000 (09:38 +0000)
src/creaImageIOSimpleView.cpp
src/creaImageIOSimpleView.h

index bf025e840dfc54f6008da5989f1a73d9d2f2a516..cfede76a73abaf065f012effef868d442030a1c3 100644 (file)
@@ -32,7 +32,7 @@
 
 namespace creaImageIO
 {
-/*     bool SimpleView::readFile(std::vector<std::string> i_filenames, std::vector<vtkImageData *> &i_img)
+       bool SimpleView::readFile(std::vector<std::string> i_filenames, std::vector<vtkImageData *> &i_img)
        {
                        bool bresult, bfinal = true;
                        ImageReader *mReader = new ImageReader();
@@ -83,6 +83,6 @@ namespace creaImageIO
                                }                       
                        }
                        return bresult;
-       }*/
+       }
 }
                        
index 5d658c43ac6301c5919b3c96b86ba366468e9591..d1a98861c6ceb75a36c29e040c4ac90b55e88255 100644 (file)
@@ -38,7 +38,7 @@
 
 namespace creaImageIO
 {
-       class __declspec(dllexport) SimpleView
+       class SimpleView
        {
        public:
                /// Ctor
@@ -48,61 +48,10 @@ namespace creaImageIO
                ~SimpleView(){}
                
                /// read file(s) and return a vector of vtkImageData 
-               bool readFile( std::vector<std::string> i_filenames, std::vector< vtkImageData *> &i_img){
-                       bool bresult, bfinal = true;
-                       ImageReader *mReader = new ImageReader();
-                       std::vector<std::string>::iterator it = i_filenames.begin();
-                       for (; it != i_filenames.end(); it++)
-                       {
-                               bresult = mReader->CanRead((*it).c_str());
-                               if(bresult)
-                               {
-                                       i_img.push_back(mReader->ReadImage((*it).c_str()));
-                               }
-                               else
-                               {
-                                       bfinal = false;
-                               }
-                       }
-                       delete mReader;
-                       return bfinal;  
-       }
+               bool readFile( std::vector<std::string> i_filenames, std::vector< vtkImageData *> &i_img);
 
                /// read a directory and return a vector of vtkImageData 
-               bool readDirectory(const std::string i_pathname, std::vector< vtkImageData *> &i_imgs)
-                       {bool bresult = true;
-                       ImageReader *mReader = new ImageReader();
-                        std::vector<std::string> names;
-                       bresult = boost::filesystem::exists( i_pathname );
-                       if (bresult)
-                       {
-                               boost::filesystem::directory_iterator itr(i_pathname);
-                               boost::filesystem::directory_iterator end_itr; 
-                               for(;itr != end_itr; ++itr)
-                               {
-                                       if (!boost::filesystem::is_directory(itr->status()))
-                                       {
-                                               if( mReader->CanRead(itr->string()) )
-                                               {
-                                                       names.push_back(itr->string()); 
-                                               }
-                                       }
-                               }
-                               std::sort (names.begin(), names.end()); // make sure names are in lexicographical order
-                               int lgr = names.size();
-                               
-                               for(int i=0; i<lgr; i++)
-                               {
-                                  std::cout << names[i] << std::endl;
-                                  i_imgs.push_back( mReader->ReadImage(names[i]) );  
-                               }                       
-                       }
-                       return bresult;
-       }
+               bool readDirectory(const std::string i_pathname, std::vector< vtkImageData *> &i_imgs);
 
        };
-
-
-
-} // namespace creaImageIO
-#endif //__creaImageIOSimpleView_h_INCLUDED__
\ No newline at end of file
+}
\ No newline at end of file