mario/IMCtermite
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

added check for correct file type, remove all logs

Browse Source
This commit is contained in:
Mario Fink 2020-02-13 10:15:38 +00:00
parent 4a64f3a0e5
commit 438f96d17b
3 changed files with 49 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
eatit
View File

Binary file not shown.

46
src/main.cpp
View File

@ -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";
for ( int i = 0; i < argc; i++ ) std::cout<<std::setw(5)<<i<<": "<<argv[i]<<"\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";
// check number of CLI arguments
assert( argc == 3 );
@ -31,31 +31,31 @@ int main(int argc, char* argv[])
// split data segments into elements
eatraw.split_segments();
std::cout<<"\n";
std::map<std::string,std::vector<unsigned char>> marks = eatraw.get_markers();
for ( auto mrk: marks )
{
// get data
std::vector<unsigned char> dat = eatraw.get_marker_data(mrk.first);
// print marker name, length and data
std::cout<<mrk.first<<" : "<<dat.size()<<'\n';
std::cout<<std::setfill('-')<<std::setw(96)<<'\n'<<std::setfill(' ');
eatraw.show_hex(dat,32,512);
std::cout<<"\n";
std::vector<std::string> segvec = eatraw.get_segment(mrk.first);
std::cout<<"number of elements in segment: "<<segvec.size()<<"\n\n";
// for ( auto el: segvec ) std::cout<<el<<"\n";
}
// std::cout<<"\n";
// std::map<std::string,std::vector<unsigned char>> marks = eatraw.get_markers();
// for ( auto mrk: marks )
// {
// // get data
// std::vector<unsigned char> dat = eatraw.get_marker_data(mrk.first);
//
// // print marker name, length and data
// std::cout<<mrk.first<<" : "<<dat.size()<<'\n';
// std::cout<<std::setfill('-')<<std::setw(96)<<'\n'<<std::setfill(' ');
// eatraw.show_hex(dat,32,512);
// std::cout<<"\n";
//
// std::vector<std::string> segvec = eatraw.get_segment(mrk.first);
// std::cout<<"number of elements in segment: "<<segvec.size()<<"\n\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::cout<<"\nsize of data array: "<<maindata.size()<<"\n\n";
//for ( unsigned long int i = 0; i < 10; i++ ) std::cout<<mydata[i]<<"\n";
// get array of encoded data
// std::vector<double> maindata = eatraw.get_data();
// 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
eatraw.write_data(std::string(argv[2]));

42
src/raweat.hpp
View File

@ -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 );
@ -323,6 +332,21 @@ public:
for ( unsigned long int i = 0; i < datavec.size() && i < maxchars; i++ )
{
// 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 )
{
enc<<(char)(datavec[i]);
}
else
{
enc<<".";
}
// every 'width' number of chars constitute a row
if ( (int)(i+1)%width == 0 )
{
// print both strings
@ -333,22 +357,8 @@ public:
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 )
{
enc<<(char)(datavec[i]);
}
else
{
enc<<".";
}
}
}
// print final remaining part
std::cout<<std::setw(3*width)<<std::left<<hex.str()<<" "<<enc.str()<<"\n";
std::cout<<std::right;