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

fixed eriks bug, must initialize const double values inside cpp not in h from gccc 4.4.6 onwards

Browse Source
This commit is contained in:
Dhanya Maliakal 2016-11-10 16:13:22 +01:00
parent cec2e5c6b4
commit 7d860cc7cd
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
slsDetectorGui/include/qDrawPlot.h
View File

@ -479,11 +479,8 @@ 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) static const double PLOT_TIMER_MS;
//static constexpr double PLOT_TIMER_MS = 200;
//#else
static const double PLOT_TIMER_MS = 200;
//#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 */

1
slsDetectorGui/src/qDrawPlot.cpp
View File

@ -30,6 +30,7 @@ using namespace std;
//------------------------------------------------------------------------------------------------------------------------------------------------- //-------------------------------------------------------------------------------------------------------------------------------------------------
const double qDrawPlot::PLOT_TIMER_MS = 200;
qDrawPlot::qDrawPlot(QWidget *parent,multiSlsDetector*& detector): qDrawPlot::qDrawPlot(QWidget *parent,multiSlsDetector*& detector):
QWidget(parent),myDet(detector),plot1D_hists(0){ QWidget(parent),myDet(detector),plot1D_hists(0){