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

gui bug fix: hostname print out and acquisition index

Browse Source
This commit is contained in:
maliakal_d 2019-08-27 09:25:10 +02:00
parent aafe049a9b
commit fc0b25cfa7
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
slsDetectorGui/src/qDetectorMain.cpp
View File

@ -229,16 +229,17 @@ void qDetectorMain::SetUpDetector(const std::string fName, int multiID) {
case slsDetectorDefs::MOENCH: case slsDetectorDefs::MOENCH:
break; break;
default: default:
std::string errorMess = std::ostringstream os;
sls::ToString(det->getHostname(), ',') + " has " + os << det->getHostname() << " has " <<
slsDetectorDefs::detectorTypeToString(det->getDetectorType().squash()) + " detector type (" + slsDetectorDefs::detectorTypeToString(det->getDetectorType().squash()) << " detector type (" <<
std::to_string(detType) + "). Exiting GUI."; std::to_string(detType) << "). Exiting GUI.";
std::string errorMess = os.str();
throw sls::RuntimeError(errorMess.c_str()); throw sls::RuntimeError(errorMess.c_str());
} }
std::ostringstream os;
std::string title = os << "SLS Detector GUI : " << slsDetectorDefs::detectorTypeToString(det->getDetectorType().squash())
"SLS Detector GUI : " + slsDetectorDefs::detectorTypeToString(det->getDetectorType().squash()) + " - " + << " - " << det->getHostname();
sls::ToString(det->getHostname(), ','); std::string title = os.str();
FILE_LOG(logINFO) << title; FILE_LOG(logINFO) << title;
setWindowTitle(QString(title.c_str())); setWindowTitle(QString(title.c_str()));
} }

2
slsDetectorGui/src/qTabMeasurement.cpp
View File

@ -435,7 +435,7 @@ void qTabMeasurement::GetRunIndex() {
FILE_LOG(logDEBUG) << "Getting Acquisition File index"; FILE_LOG(logDEBUG) << "Getting Acquisition File index";
disconnect(spinIndex, SIGNAL(valueChanged(int)), this, SLOT(SetRunIndex(int))); disconnect(spinIndex, SIGNAL(valueChanged(int)), this, SLOT(SetRunIndex(int)));
try { try {
auto retval = det->getAcquisitonIndex().tsquash("Inconsistent file index for all detectors."); auto retval = det->getAcquisitionIndex().tsquash("Inconsistent file index for all detectors.");
spinIndex->setValue(retval); spinIndex->setValue(retval);
} CATCH_DISPLAY ("Could not get acquisition file index.", "qTabMeasurement::GetRunIndex") } CATCH_DISPLAY ("Could not get acquisition file index.", "qTabMeasurement::GetRunIndex")
connect(spinIndex, SIGNAL(valueChanged(int)), this, SLOT(SetRunIndex(int))); connect(spinIndex, SIGNAL(valueChanged(int)), this, SLOT(SetRunIndex(int)));