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

Merge branch '3.0.1' into developer

Browse Source
This commit is contained in:
Dhanya Maliakal 2017-12-11 13:51:20 +01:00
commit d6bdbf8524
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
slsDetectorGui/src/qDrawPlot.cpp
View File

@ -245,7 +245,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);

2
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@ -3929,7 +3929,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;

4
slsReceiverSoftware/src/UDPStandardImplementation.cpp
View File

@ -703,8 +703,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);
} }