diff --git a/slsDetectorGui/include/qDrawPlot.h b/slsDetectorGui/include/qDrawPlot.h index 1660eec9a..aaf5814eb 100644 --- a/slsDetectorGui/include/qDrawPlot.h +++ b/slsDetectorGui/include/qDrawPlot.h @@ -481,7 +481,11 @@ double XYRangeValues[4]; bool IsXYRange[4]; /** Default timer between plots*/ +#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 6) +static constexpr double PLOT_TIMER_MS = 200; +#else static const double PLOT_TIMER_MS = 200; +#endif /** Specific timer value between plots */ double timerValue; /** every nth frame when to plot */ diff --git a/slsDetectorGui/slsDetectorPlotting/src/SlsQt2DHist.cxx b/slsDetectorGui/slsDetectorPlotting/src/SlsQt2DHist.cxx index 1bbe9bcaa..fc7e09074 100644 --- a/slsDetectorGui/slsDetectorPlotting/src/SlsQt2DHist.cxx +++ b/slsDetectorGui/slsDetectorPlotting/src/SlsQt2DHist.cxx @@ -6,7 +6,7 @@ #include - +#include #include "SlsQt2DHist.h" using std::cout; @@ -125,7 +125,7 @@ double SlsQt2DHist::GetMean(){ } double SlsQt2DHist::SetMinimumToFirstGreaterThanZero(){ - z_min=abs(z_max)+1; + z_min=fabs(z_max)+1; for(int i=0;i0 && data[i]setIcon(QIcon( ":/icons/images/close.png" )); comboCustom->setEditable(true); - comboCustom->setCompleter(false); + comboCustom->setCompleter(NULL); comboCustom->setValidator(new QDoubleValidator(comboCustom)); comboCustom->setToolTip(customTip); btnCustom->setSizePolicy(QSizePolicy::Fixed,QSizePolicy::Fixed); diff --git a/slsDetectorGui/src/qTabActions.cpp b/slsDetectorGui/src/qTabActions.cpp index c53c93499..bbaf462fa 100644 --- a/slsDetectorGui/src/qTabActions.cpp +++ b/slsDetectorGui/src/qTabActions.cpp @@ -257,7 +257,8 @@ void qTabActions::CreatePositionsWidget(){ layout->addWidget(lblPosList,0,4); comboPos = new QComboBox(this); comboPos->setEditable(true); - comboPos->setCompleter(false); +// comboPos->setCompleter(false); + comboPos->setCompleter(NULL); normal = comboPos->palette(); comboPos->setEnabled(false); QDoubleValidator *validate = new QDoubleValidator(comboPos);