detectors/slsDetectorPackage
24
1
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-01-17 11:31:30 +01:00
Code Issues Actions Packages Releases Activity

some changes for qwt7 and for higher gcc

Browse Source
This commit is contained in:
Dhanya Maliakal
2016-11-10 14:56:52 +01:00
parent b55414cd38
commit fd666605aa
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
slsDetectorGui/include/qDrawPlot.h
View File

@@ -479,11 +479,11 @@ double XYRangeValues[4];
bool IsXYRange[4]; bool IsXYRange[4];
/** Default timer between plots*/ /** Default timer between plots*/
#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 6) //#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 6)
static constexpr double PLOT_TIMER_MS = 200; //static constexpr double PLOT_TIMER_MS = 200;
#else //#else
static const double PLOT_TIMER_MS = 200; static const double PLOT_TIMER_MS = 200;
#endif //#endif
/** Specific timer value between plots */ /** Specific timer value between plots */
double timerValue; double timerValue;
/** every nth frame when to plot */ /** every nth frame when to plot */

2
slsDetectorGui/slsDetectorGui.pro
View File

@@ -23,7 +23,7 @@ QMAKE_LIBS = -L$(QTDIR)/lib
DEFINES += VERBOSE DACS_INT PRINT_LOG #VERYVERBOSE CHECKINFERROR DEFINES += VERBOSE DACS_INT PRINT_LOG #VERYVERBOSE CHECKINFERROR
LIBS = -L$(QWTDIR)/lib -lqwt -L$(QWT3D)/lib LIBS = -L$(QWTDIR)/lib -lqwt -L$(QWT3D)/lib
CXXFLAGS += -g CXXFLAGS += -std=c++11 -g
QMAKE_CXXFLAGS_WARN_ON = -w QMAKE_CXXFLAGS_WARN_ON = -w