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

solved some warnings

Browse Source
This commit is contained in:
Dhanya Maliakal 2017-07-27 12:08:12 +02:00
parent 915fd41bf6
commit 77dc4d3d77
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
slsDetectorGui/gitInfo.txt
View File

@ -1,9 +1,9 @@
Path: slsDetectorsPackage/slsDetectorGui Path: slsDetectorsPackage/slsDetectorGui
URL: origin git@git.psi.ch:sls_detectors_software/sls_detector_gui.git 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 Repository Root: origin git@git.psi.ch:sls_detectors_software/sls_detector_gui.git
Repsitory UUID: 0feb7f734e1ef261dcc82d13df4a5caaf90917f4 Repsitory UUID: 3d4a8bf5fe9083caedea4cac98ce487cd7608edd
Revision: 411 Revision: 412
Branch: 3.0-rc Branch: cmakefix
Last Changed Author: Dhanya_Maliakal Last Changed Author: Dhanya_Maliakal
Last Changed Rev: 411 Last Changed Rev: 412
Last Changed Date: 2017-07-26 15:07:21.000000002 +0200 ./Makefile Last Changed Date: 2017-07-27 10:34:37.000000002 +0200 ./include/qDebugStream.h

8
slsDetectorGui/include/gitInfoGui.h
View File

@ -1,11 +1,11 @@
//#define SVNPATH "" //#define SVNPATH ""
#define SVNURL "git@git.psi.ch:sls_detectors_software/sls_detector_gui.git" #define SVNURL "git@git.psi.ch:sls_detectors_software/sls_detector_gui.git"
//#define SVNREPPATH "" //#define SVNREPPATH ""
#define SVNREPUUID "0feb7f734e1ef261dcc82d13df4a5caaf90917f4" #define SVNREPUUID "3d4a8bf5fe9083caedea4cac98ce487cd7608edd"
//#define SVNREV 0x411 //#define SVNREV 0x412
//#define SVNKIND "" //#define SVNKIND ""
//#define SVNSCHED "" //#define SVNSCHED ""
#define SVNAUTH "Dhanya_Maliakal" #define SVNAUTH "Dhanya_Maliakal"
#define SVNREV 0x411 #define SVNREV 0x412
#define SVNDATE 0x20170726 #define SVNDATE 0x20170727
// //

2
slsDetectorGui/include/qDebugStream.h
View File

@ -48,7 +48,7 @@ class qDebugStream : public basic_streambuf<char> {
public: public:
qDebugStream(ostream &stream, QWidget* w) : m_stream(stream), log_window(w) { 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(); m_old_buf = stream.rdbuf();
stream.rdbuf(this); stream.rdbuf(this);
} }

2
slsDetectorGui/slsDetectorPlotting/src/SlsQt2DPlotLayout.cxx
View File

@ -20,7 +20,7 @@ SlsQt2DPlotLayout::SlsQt2DPlotLayout(QWidget *parent):QGroupBox(parent){
the_layout=0; the_layout=0;
the_plot = new SlsQt2DPlot(this); 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); z_range_ne->setFixedWidth(402);
#ifndef IAN #ifndef IAN
zRangeChecked = false; zRangeChecked = false;