added check for correct file type, remove all logs

src/main.cpp

@@ -11,8 +11,8 @@ int main(int argc, char* argv[])
   // path of filename provided ?
   assert( argc > 2 && "please provide a filename and path for input and output" );
 
-  std::cout<<"number of CLI-arguments: "<<argc<<"\n";
+//  std::cout<<"number of CLI-arguments: "<<argc<<"\n";
-  for ( int i = 0; i < argc; i++ ) std::cout<<std::setw(5)<<i<<":   "<<argv[i]<<"\n";
+//  for ( int i = 0; i < argc; i++ ) std::cout<<std::setw(5)<<i<<":   "<<argv[i]<<"\n";
 
   // check number of CLI arguments
   assert( argc == 3 );
@@ -31,30 +31,30 @@ int main(int argc, char* argv[])
   // split data segments into elements
   eatraw.split_segments();
 
-  std::cout<<"\n";
+//  std::cout<<"\n";
-  std::map<std::string,std::vector<unsigned char>> marks = eatraw.get_markers();
+//  std::map<std::string,std::vector<unsigned char>> marks = eatraw.get_markers();
-  for ( auto mrk: marks )
+//  for ( auto mrk: marks )
-  {
+//  {
-    // get data
+//    // get data
-    std::vector<unsigned char> dat = eatraw.get_marker_data(mrk.first);
+//    std::vector<unsigned char> dat = eatraw.get_marker_data(mrk.first);
-
+//
-    // print marker name, length and data
+//    // print marker name, length and data
-    std::cout<<mrk.first<<" : "<<dat.size()<<'\n';
+//    std::cout<<mrk.first<<" : "<<dat.size()<<'\n';
-    std::cout<<std::setfill('-')<<std::setw(96)<<'\n'<<std::setfill(' ');
+//    std::cout<<std::setfill('-')<<std::setw(96)<<'\n'<<std::setfill(' ');
-    eatraw.show_hex(dat,32,512);
+//    eatraw.show_hex(dat,32,512);
-    std::cout<<"\n";
+//    std::cout<<"\n";
-
+//
-    std::vector<std::string> segvec = eatraw.get_segment(mrk.first);
+//    std::vector<std::string> segvec = eatraw.get_segment(mrk.first);
-    std::cout<<"number of elements in segment: "<<segvec.size()<<"\n\n";
+//    std::cout<<"number of elements in segment: "<<segvec.size()<<"\n\n";
-//    for ( auto el: segvec ) std::cout<<el<<"\n";
+//    //for ( auto el: segvec ) std::cout<<el<<"\n";
-  }
+//  }
 
   // convert unsigned char data in buffer to desired data type
   eatraw.convert_data();
 
   // get array of encoded data 
-  std::vector<double> maindata = eatraw.get_data();
+//  std::vector<double> maindata = eatraw.get_data();
-  std::cout<<"\nsize of data array: "<<maindata.size()<<"\n\n";
+//  std::cout<<"\nsize of data array: "<<maindata.size()<<"\n\n";
 //  for ( unsigned long int i = 0; i < 10; i++ ) std::cout<<mydata[i]<<"\n";
 
   // write data in csv-file

src/raweat.hpp

@@ -170,6 +170,15 @@ public:
       } 
     }
 
+    // check length of all markers, i.e. check if we actually have a valid .raw file
+    unsigned long int totalmarksize = 0;
+    for (std::pair<std::string,std::vector<unsigned char>> mrk : markers_ )
+    {
+      //assert ( datasec_[mrk.first].size() > 0 && "marker segment of length zero" );
+      totalmarksize += datasec_[mrk.first].size();
+    }
+    assert ( totalmarksize > 0 && "didn't find any predefined marker => probably not a valid .raw-file" );
+
   }
 
   // get all predefined markers
@@ -251,7 +260,7 @@ public:
 
     // if traf = 0, make sure that factor and offset don't affect result
     assert ( ( trafo == 0 && factor == 1.0 && offset == 0.0 )
-          || ( trafo == 1 && factor != 1.0 && offset != 0.0 ) ); 
+          || ( trafo == 1 ) ); 
 
     // just don't support weird datatypes
     assert ( dattype > 2 && dattype < 9 );
@@ -322,21 +331,10 @@ public:
     std::stringstream hex, enc;
 
     for ( unsigned long int i = 0; i < datavec.size() && i < maxchars; i++ )
-    {
-      if ( (int)(i+1)%width == 0 )
-      {
-        // print both strings
-        std::cout<<std::setw(3*width)<<std::left<<hex.str()<<"    "<<enc.str()<<"\n";
-        std::cout<<std::right;
-        
-        // clear stringstreams
-        hex.str(std::string());
-        enc.str(std::string());
-      }
-      else
     {
       // accumulate in stringstreams
       hex<<std::nouppercase<<std::setfill('0')<<std::setw(2)<<std::hex<<(int)datavec[i]<<" ";
+      
       // check if byte corresponds to some control character and if it's printable
       int ic = (int)datavec[i];
       if ( ic > 0x20 && ic < 0x7f )
@@ -347,8 +345,20 @@ public:
       {
         enc<<".";
       }
+
+      // every 'width' number of chars constitute a row
+      if ( (int)(i+1)%width == 0 )
+      {
+        // print both strings
+        std::cout<<std::setw(3*width)<<std::left<<hex.str()<<"    "<<enc.str()<<"\n";
+        std::cout<<std::right;
+        
+        // clear stringstreams
+        hex.str(std::string());
+        enc.str(std::string());
       }
     }
+
     // print final remaining part
     std::cout<<std::setw(3*width)<<std::left<<hex.str()<<"    "<<enc.str()<<"\n";
     std::cout<<std::right;