From 754a4f8bdc8d5cf2bc11387f39983b67bffa375f Mon Sep 17 00:00:00 2001
From: Dhanya Maliakal <dhanya.maliakal@psi.ch>
Date: Wed, 2 Nov 2016 16:37:37 +0100
Subject: [PATCH] q for quit

---
 .../slsDetectorAnalysis/postProcessing.cpp    | 28 +++++++++++++++----
 .../slsDetectorAnalysis/postProcessing.h      |  2 ++
 2 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/slsDetectorSoftware/slsDetectorAnalysis/postProcessing.cpp b/slsDetectorSoftware/slsDetectorAnalysis/postProcessing.cpp
index 7d98171ff..6ab1b07c3 100644
--- a/slsDetectorSoftware/slsDetectorAnalysis/postProcessing.cpp
+++ b/slsDetectorSoftware/slsDetectorAnalysis/postProcessing.cpp
@@ -6,6 +6,7 @@
 #elif EXTPP
 #include "usersFunctions.h"
 #endif
+#include <time.h>
 
 
 //#define VERBOSE
@@ -25,6 +26,17 @@ static void* startProcessDataNoDelete(void *n){
 };
 
 
+int postProcessing::kbhit(){
+  struct timeval tv;
+  fd_set fds;
+  tv.tv_sec = 0;
+  tv.tv_usec = 0;
+  FD_ZERO(&fds);
+  FD_SET(STDIN_FILENO, &fds); //STDIN_FILENO is 0
+  select(STDIN_FILENO+1, &fds, NULL, NULL, &tv);
+  return FD_ISSET(STDIN_FILENO, &fds);
+}
+
 
 postProcessing::postProcessing(): expTime(NULL), ang(NULL), val(NULL), err(NULL), numberOfChannels(0), badChannelMask(NULL){
   pthread_mutex_t mp1 = PTHREAD_MUTEX_INITIALIZER;
@@ -496,10 +508,11 @@ void* postProcessing::processData(int delflag) {
 		else{
 			int caught = -1;
 			char c;
+			int ifp;
 			while(true){
 
-				cout.flush();
-				cout<<flush;
+				//cout.flush();
+				//cout<<flush;
 				usleep(100 * 1000); //20ms need this else connecting error to receiver (too fast)
 
 				if (checkJoinThread()){
@@ -507,10 +520,13 @@ void* postProcessing::processData(int delflag) {
 				}
 
 
-				c=fgetc(stdin);
-				if (c=='q') {
-				 	cout<<"gonna stop"<<endl;
-				 	stopAcquisition();
+				ifp=kbhit();
+				if (ifp!=0){
+					c=fgetc(stdin);
+					if (c=='q') {
+						cout<<"gonna stop"<<endl;
+						stopAcquisition();
+					}
 				}
 
 
diff --git a/slsDetectorSoftware/slsDetectorAnalysis/postProcessing.h b/slsDetectorSoftware/slsDetectorAnalysis/postProcessing.h
index d7e6ff13b..4010685f0 100644
--- a/slsDetectorSoftware/slsDetectorAnalysis/postProcessing.h
+++ b/slsDetectorSoftware/slsDetectorAnalysis/postProcessing.h
@@ -335,6 +335,8 @@ s
   detectorData *thisData;
 
  private:
+  int kbhit(void);
+
  // double *fdata;
  // int (*dataReady)(detectorData*,int, int,void*);
  // void *pCallbackArg;