mirror of
https://github.com/slsdetectorgroup/slsDetectorPackage.git
synced 2025-04-26 16:20:03 +02:00
solving warnings from latest linux
This commit is contained in:
parent
d6a4f83a99
commit
bb3e5351b4
@ -228,7 +228,7 @@ void qDrawPlot::SetupWidgetWindow(){
|
|||||||
layout = new QGridLayout;
|
layout = new QGridLayout;
|
||||||
this->setLayout(layout);
|
this->setLayout(layout);
|
||||||
|
|
||||||
histFrameIndexTitle= histFrameIndexTitle = new QLabel("");
|
histFrameIndexTitle = new QLabel("");
|
||||||
|
|
||||||
boxPlot = new QGroupBox("");
|
boxPlot = new QGroupBox("");
|
||||||
layout->addWidget(boxPlot,1,0);
|
layout->addWidget(boxPlot,1,0);
|
||||||
|
@ -3839,7 +3839,7 @@ slsDetectorDefs::detectorSettings slsDetector::setSettings( detectorSettings ise
|
|||||||
if(gainval) delete [] gainval;
|
if(gainval) delete [] gainval;
|
||||||
if(offsetval) delete [] offsetval;
|
if(offsetval) delete [] offsetval;
|
||||||
|
|
||||||
switch(thisDetector->myDetectorType==MYTHEN){
|
if (thisDetector->myDetectorType==MYTHEN){
|
||||||
if (thisDetector->correctionMask&(1<<RATE_CORRECTION)) {
|
if (thisDetector->correctionMask&(1<<RATE_CORRECTION)) {
|
||||||
int isett=getSettings(imod);
|
int isett=getSettings(imod);
|
||||||
double t[]=defaultTDead;
|
double t[]=defaultTDead;
|
||||||
|
@ -674,8 +674,8 @@ void UDPStandardImplementation::ResetParametersforNewMeasurement() {
|
|||||||
(*it)->ResetParametersforNewMeasurement();
|
(*it)->ResetParametersforNewMeasurement();
|
||||||
|
|
||||||
if (dataStreamEnable) {
|
if (dataStreamEnable) {
|
||||||
char fnametostream[1000];
|
char fnametostream[MAX_STR_LENGTH];
|
||||||
sprintf(fnametostream, "%s/%s", filePath, fileName);
|
snprintf(fnametostream, MAX_STR_LENGTH, "%s/%s", filePath, fileName);
|
||||||
for (vector<DataStreamer*>::const_iterator it = dataStreamer.begin(); it != dataStreamer.end(); ++it)
|
for (vector<DataStreamer*>::const_iterator it = dataStreamer.begin(); it != dataStreamer.end(); ++it)
|
||||||
(*it)->ResetParametersforNewMeasurement(fnametostream);
|
(*it)->ResetParametersforNewMeasurement(fnametostream);
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user