detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-22 17:47:59 +02:00
Code Issues Actions Packages Releases Activity

fixed segmentation fault issue of xputsn the right way, fixed warnings

Browse Source
This commit is contained in:
Dhanya Maliakal
2017-11-17 09:26:05 +01:00
parent 2569ffbf10
commit d7137e0c75
7 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
slsDetectorGui/include/qDebugStream.h
View File

@ -59,7 +59,8 @@ public:
// output anything that is left
if (!m_string.empty()) {
pthread_mutex_lock(&mutex);
QApplication::postEvent(log_window, new qStreamEvent(m_string.c_str()));
const char* c_string = m_string.c_str();
QApplication::postEvent(log_window, new qStreamEvent(c_string));
pthread_mutex_unlock(&mutex);
}
m_stream.rdbuf(m_old_buf);
@ -71,7 +72,8 @@ protected:
virtual int_type overflow(int_type v){
if (v == '\n'){
pthread_mutex_lock(&mutex);
QApplication::postEvent(log_window, new qStreamEvent(m_string.c_str()));
const char* c_string = m_string.c_str();
QApplication::postEvent(log_window, new qStreamEvent(c_string));
m_string.erase(m_string.begin(), m_string.end());
pthread_mutex_unlock(&mutex);
}
@ -87,13 +89,14 @@ protected:
m_string.append(p, p + n);
//changed from uint because of 64 bit
int pos = 0;
size_t pos = 0;
while (pos != string::npos){
pos = m_string.find('\n');
if (pos != string::npos){
string tmp(m_string.begin(), m_string.begin() + pos);
QApplication::postEvent(log_window, new qStreamEvent(tmp.c_str()));
const char* c_tmp = tmp.c_str();
QApplication::postEvent(log_window, new qStreamEvent(c_tmp));
m_string.erase(m_string.begin(), m_string.begin() + pos + 1);
}
}