diff --git a/slsDetectorGui/gitInfo.txt b/slsDetectorGui/gitInfo.txt index 78840234d..a2d7a7979 100644 --- a/slsDetectorGui/gitInfo.txt +++ b/slsDetectorGui/gitInfo.txt @@ -1,9 +1,9 @@ Path: slsDetectorsPackage/slsDetectorGui URL: origin git@git.psi.ch:sls_detectors_software/sls_detector_gui.git Repository Root: origin git@git.psi.ch:sls_detectors_software/sls_detector_gui.git -Repsitory UUID: 0feb7f734e1ef261dcc82d13df4a5caaf90917f4 -Revision: 411 -Branch: 3.0-rc +Repsitory UUID: 3d4a8bf5fe9083caedea4cac98ce487cd7608edd +Revision: 412 +Branch: cmakefix Last Changed Author: Dhanya_Maliakal -Last Changed Rev: 411 -Last Changed Date: 2017-07-26 15:07:21.000000002 +0200 ./Makefile +Last Changed Rev: 412 +Last Changed Date: 2017-07-27 10:34:37.000000002 +0200 ./include/qDebugStream.h diff --git a/slsDetectorGui/include/gitInfoGui.h b/slsDetectorGui/include/gitInfoGui.h index 132aeff8f..1e05df165 100644 --- a/slsDetectorGui/include/gitInfoGui.h +++ b/slsDetectorGui/include/gitInfoGui.h @@ -1,11 +1,11 @@ //#define SVNPATH "" #define SVNURL "git@git.psi.ch:sls_detectors_software/sls_detector_gui.git" //#define SVNREPPATH "" -#define SVNREPUUID "0feb7f734e1ef261dcc82d13df4a5caaf90917f4" -//#define SVNREV 0x411 +#define SVNREPUUID "3d4a8bf5fe9083caedea4cac98ce487cd7608edd" +//#define SVNREV 0x412 //#define SVNKIND "" //#define SVNSCHED "" #define SVNAUTH "Dhanya_Maliakal" -#define SVNREV 0x411 -#define SVNDATE 0x20170726 +#define SVNREV 0x412 +#define SVNDATE 0x20170727 // diff --git a/slsDetectorGui/include/qDebugStream.h b/slsDetectorGui/include/qDebugStream.h index 570e3c260..2c728dd25 100644 --- a/slsDetectorGui/include/qDebugStream.h +++ b/slsDetectorGui/include/qDebugStream.h @@ -48,7 +48,7 @@ class qDebugStream : public basic_streambuf { public: qDebugStream(ostream &stream, QWidget* w) : m_stream(stream), log_window(w) { - mutex = PTHREAD_MUTEX_INITIALIZER; + pthread_mutex_init(&mutex, NULL); m_old_buf = stream.rdbuf(); stream.rdbuf(this); } diff --git a/slsDetectorGui/slsDetectorPlotting/src/SlsQt2DPlotLayout.cxx b/slsDetectorGui/slsDetectorPlotting/src/SlsQt2DPlotLayout.cxx index df80824a5..220bf0f2c 100644 --- a/slsDetectorGui/slsDetectorPlotting/src/SlsQt2DPlotLayout.cxx +++ b/slsDetectorGui/slsDetectorPlotting/src/SlsQt2DPlotLayout.cxx @@ -20,7 +20,7 @@ SlsQt2DPlotLayout::SlsQt2DPlotLayout(QWidget *parent):QGroupBox(parent){ the_layout=0; the_plot = new SlsQt2DPlot(this); - z_range_ne = new SlsQtNumberEntry(this,1,"Set the z axis range from",2,"to",2); + z_range_ne = new SlsQtNumberEntry(this,1,(char*)"Set the z axis range from",2,(char*)"to",2); z_range_ne->setFixedWidth(402); #ifndef IAN zRangeChecked = false;