detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-13 13:27:14 +02:00
Code Issues Actions Packages Releases Activity

compatible with gcc 5.3.1 amd 6.1.1

Browse Source
This commit is contained in:
Dhanya Maliakal
2016-08-03 17:50:54 +02:00
parent 9139451127
commit 5d3e925ed4
4 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
slsDetectorGui/include/qDrawPlot.h
View File

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

4
slsDetectorGui/slsDetectorPlotting/src/SlsQt2DHist.cxx
View File

@ -6,7 +6,7 @@
#include <iostream> #include <iostream>
#include <cmath>
#include "SlsQt2DHist.h" #include "SlsQt2DHist.h"
using std::cout; using std::cout;
@ -125,7 +125,7 @@ double SlsQt2DHist::GetMean(){
} }
double SlsQt2DHist::SetMinimumToFirstGreaterThanZero(){ double SlsQt2DHist::SetMinimumToFirstGreaterThanZero(){
z_min=abs(z_max)+1; z_min=fabs(z_max)+1;
for(int i=0;i<nb;i++){ for(int i=0;i<nb;i++){
if(data[i]>0 && data[i]<z_min) z_min=data[i]; if(data[i]>0 && data[i]<z_min) z_min=data[i];
} }

2
slsDetectorGui/src/qScanWidget.cpp
View File

@ -138,7 +138,7 @@ void qScanWidget::SetupWidgetWindow(){
btnCustom = new QPushButton("Delete ",widgetCustom); btnCustom = new QPushButton("Delete ",widgetCustom);
btnCustom->setIcon(QIcon( ":/icons/images/close.png" )); btnCustom->setIcon(QIcon( ":/icons/images/close.png" ));
comboCustom->setEditable(true); comboCustom->setEditable(true);
comboCustom->setCompleter(false); comboCustom->setCompleter(NULL);
comboCustom->setValidator(new QDoubleValidator(comboCustom)); comboCustom->setValidator(new QDoubleValidator(comboCustom));
comboCustom->setToolTip(customTip); comboCustom->setToolTip(customTip);
btnCustom->setSizePolicy(QSizePolicy::Fixed,QSizePolicy::Fixed); btnCustom->setSizePolicy(QSizePolicy::Fixed,QSizePolicy::Fixed);

3
slsDetectorGui/src/qTabActions.cpp
View File

@ -257,7 +257,8 @@ void qTabActions::CreatePositionsWidget(){
layout->addWidget(lblPosList,0,4); layout->addWidget(lblPosList,0,4);
comboPos = new QComboBox(this); comboPos = new QComboBox(this);
comboPos->setEditable(true); comboPos->setEditable(true);
comboPos->setCompleter(false); // comboPos->setCompleter(false);
comboPos->setCompleter(NULL);
normal = comboPos->palette(); normal = comboPos->palette();
comboPos->setEnabled(false); comboPos->setEnabled(false);
QDoubleValidator *validate = new QDoubleValidator(comboPos); QDoubleValidator *validate = new QDoubleValidator(comboPos);