merged to developer

This commit is contained in:
2016-12-19 12:26:53 +01:00
29 changed files with 1113 additions and 868 deletions

View File

@ -524,14 +524,16 @@ void* postProcessing::processData(int delflag) {
// }
// ifp=kbhit();
// if (ifp!=0){
// c=fgetc(stdin);
// if (c=='q') {
// cout<<"gonna stop"<<endl;
// stopAcquisition();
// }
// }
ifp=kbhit();
if (ifp!=0){
c=fgetc(stdin);
if (c=='q') {
cout<<"Caught the command to stop acquisition"<<endl;
stopAcquisition();
}
}
// //get progress