diff --git a/slsDetectorGui/src/qDetectorMain.cpp b/slsDetectorGui/src/qDetectorMain.cpp index 1252fbca0..7f3fba1d0 100755 --- a/slsDetectorGui/src/qDetectorMain.cpp +++ b/slsDetectorGui/src/qDetectorMain.cpp @@ -229,16 +229,17 @@ void qDetectorMain::SetUpDetector(const std::string fName, int multiID) { case slsDetectorDefs::MOENCH: break; default: - std::string errorMess = - sls::ToString(det->getHostname(), ',') + " has " + - slsDetectorDefs::detectorTypeToString(det->getDetectorType().squash()) + " detector type (" + - std::to_string(detType) + "). Exiting GUI."; + std::ostringstream os; + os << det->getHostname() << " has " << + slsDetectorDefs::detectorTypeToString(det->getDetectorType().squash()) << " detector type (" << + std::to_string(detType) << "). Exiting GUI."; + std::string errorMess = os.str(); throw sls::RuntimeError(errorMess.c_str()); } - - std::string title = - "SLS Detector GUI : " + slsDetectorDefs::detectorTypeToString(det->getDetectorType().squash()) + " - " + - sls::ToString(det->getHostname(), ','); + std::ostringstream os; + os << "SLS Detector GUI : " << slsDetectorDefs::detectorTypeToString(det->getDetectorType().squash()) + << " - " << det->getHostname(); + std::string title = os.str(); FILE_LOG(logINFO) << title; setWindowTitle(QString(title.c_str())); } diff --git a/slsDetectorGui/src/qTabMeasurement.cpp b/slsDetectorGui/src/qTabMeasurement.cpp index b6ea70fef..08a6b5484 100755 --- a/slsDetectorGui/src/qTabMeasurement.cpp +++ b/slsDetectorGui/src/qTabMeasurement.cpp @@ -435,7 +435,7 @@ void qTabMeasurement::GetRunIndex() { FILE_LOG(logDEBUG) << "Getting Acquisition File index"; disconnect(spinIndex, SIGNAL(valueChanged(int)), this, SLOT(SetRunIndex(int))); 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); } CATCH_DISPLAY ("Could not get acquisition file index.", "qTabMeasurement::GetRunIndex") connect(spinIndex, SIGNAL(valueChanged(int)), this, SLOT(SetRunIndex(int)));