X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src2%2FcreaImageIOUltrasonixImageReader.cpp;h=a8905ccb4f033afe05b4b1ee8f7bd836e11634b2;hb=da80530068246081505e9649523d10e8da8e6acd;hp=2640d9e80ced8aef9fe5cffe6879bef973d1f32e;hpb=ac7123b4f8f69d75b695ac74d228b0c541e69048;p=creaImageIO.git

diff --git a/src2/creaImageIOUltrasonixImageReader.cpp b/src2/creaImageIOUltrasonixImageReader.cpp
index 2640d9e..a8905cc 100644
--- a/src2/creaImageIOUltrasonixImageReader.cpp
+++ b/src2/creaImageIOUltrasonixImageReader.cpp
@@ -1,8 +1,8 @@
 
-#include <creaImageIOSystem.h>
-#include <creaImageIOUltrasonixImageReader.h>
+#include "creaImageIOSystem.h"
+#include "creaImageIOUltrasonixImageReader.h"
 #include <creaVtk.h>
-#include "boost/filesystem/path.hpp"
+#include <boost/filesystem/path.hpp>
 
 namespace creaImageIO
 {
@@ -172,7 +172,7 @@ namespace creaImageIO
 }
   //=====================================================================
   
- 
+
   //=====================================================================
   void UltrasonixImageReader::PushBackExtensions(std::vector<std::string>& v)
   {
@@ -183,7 +183,7 @@ namespace creaImageIO
 
 
   //=====================================================================
- vold UltrasonixImageReader::ReadAttributes(const std::string& filename, 
+ void UltrasonixImageReader::ReadAttributes(const std::string& filename, 
 				      std::map<std::string,std::string>& attr)
  {
     GimmickMessage(2,"Reading attributes from '" << filename << std::endl);
@@ -194,7 +194,7 @@ namespace creaImageIO
     	std::cout << "cannot open RF file [" << filename << "]" << std::endl;
     	return;
     }
-       
+
     Ultrasonix_header h;
     if (!ReadHeader(Ultrasonix_file, h)) 
     {
@@ -202,7 +202,7 @@ namespace creaImageIO
         std::cout << "cannot read Ultrasonix Attributes for RF file [" << filename << "]" << std::endl;  
 	return;
     }
-   
+
     fclose(Ultrasonix_file);  
   
     // Columns
@@ -225,33 +225,33 @@ namespace creaImageIO
     std::map<std::string,std::string>::iterator i;
     if ( (i = attr.find("FullFileName")) != attr.end())
     {
-	i->second = filename;
+	   i->second = filename;
     }
     if ( (i = attr.find("D0004_1500")) != attr.end())
     {
-	boost::filesystem::path full_path(filename);
-	std::string f = full_path.leaf();
-	i->second = f;
+	   boost::filesystem::path full_path(filename);
+	   std::string f = full_path.leaf();
+	   i->second = f;
     }
     if ( (i = attr.find("D0028_0010")) != attr.end())
     {
-	i->second = rows;
+	   i->second = rows;
     }
     if ( (i = attr.find("D0028_0011")) != attr.end())
     {
-	i->second = cols;
+	   i->second = cols;
     }
     if ( (i = attr.find("D0028_0012")) != attr.end())
     {
-	i->second = planes;
+	   i->second = planes;
     }
     if ( (i = attr.find("D003a_001a")) != attr.end())
     {
-    	i->second = samplingFrequency;
+       i->second = samplingFrequency;
     }
     if ( (i = attr.find("D0018_6030")) != attr.end())
     {
-	i->second = transducerFrequency;
+	   i->second = transducerFrequency;
     }
     
     GimmickMessage(2,"Attributes map:"<<std::endl<<attr<<std::endl);