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

fix bugs in lib/rawmerge.hpp: merge_channels(...) and improve example.py

Browse Source 
- raweat.hpp: find_markers(): properly (re)adjust valid_ flag when doing multiple conversion
- rawmerge.hpp: improve logging, merge_channels(): add condition to avoid range error in vector
- example.py: obtain return flag from add_channel(), write csv output from parquet table
- main.cpp: return to pure raw_eater test version
This commit is contained in:
Mario Fink
2020-08-12 11:55:38 +02:00
parent 8d92bce9f0
commit 0bd96a1426
4 changed files with 76 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/main.cpp
View File

@@ -30,14 +30,14 @@ int main(int argc, char* argv[])
std::string rawfile(argv[1]);
// declare instance of "raw_eater"
// raw_eater eatraw(rawfile,true);
raw_eater eatraw(rawfile,true);
// declare instance of "raw_merger"
raw_merger eatmea;
eatmea.add_channel(rawfile,true);
eatmea.add_channel("smp/VehicleSpeed_HS.raw",true);
eatmea.add_channel("smp/VehicleSpeed_HS.raw",true);
eatmea.add_channel("smp/Rangerover_Evoque_F-RR534_2019-05-07/Temp_Disc_FR.raw",true);
// raw_merger eatmea;
// eatmea.add_channel(rawfile,true);
// eatmea.add_channel("smp/VehicleSpeed_HS.raw",true);
// eatmea.add_channel("smp/VehicleSpeed_HS.raw",true);
// eatmea.add_channel("smp/Rangerover_Evoque_F-RR534_2019-05-07/Temp_Disc_FR.raw",true);
//eatraw.show_markers();
@@ -65,10 +65,13 @@ int main(int argc, char* argv[])
// for ( unsigned long int i = 0; i < 10; i++ ) std::cout<<mydata[i]<<"\n";
// write data in csv-file
// eatraw.write_table(std::string(argv[2]));
// eatraw.write_table(std::string(argv[2]),' ');
// eatmea.write_table(std::string(argv[2]));
eatmea.write_table(std::string(argv[2]),' ');
if ( eatraw.get_valid() )
{
// eatraw.write_table(std::string(argv[2]));
eatraw.write_table(std::string(argv[2]),' ');
// eatmea.write_table(std::string(argv[2]));
// eatmea.write_table(std::string(argv[2]),' ');
}
return 0;
}