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

converting to Qstring

Browse Source
This commit is contained in:
Erik Frojdh
2018-05-25 10:19:09 +02:00
parent 228d624d8f
commit abdf4b1ada
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
slsDetectorGui/src/qDetectorMain.cpp
View File

@ -521,7 +521,7 @@ void qDetectorMain::ExecuteUtilities(QAction *action){
} }
} }
else if(action==actionLoadTrimbits){ else if(action==actionLoadTrimbits){
QString fName = QString(myDet->getSettingsDir()); QString fName = QString( (myDet->getSettingsDir()).c_str());
qDefs::checkErrorMessage(myDet,"qDetectorMain::ExecuteUtilities"); qDefs::checkErrorMessage(myDet,"qDetectorMain::ExecuteUtilities");
//gotthard //gotthard
if(actionLoadTrimbits->text().contains("Settings")){ if(actionLoadTrimbits->text().contains("Settings")){
@ -568,7 +568,7 @@ void qDetectorMain::ExecuteUtilities(QAction *action){
cout << "Saving Settings" << endl; cout << "Saving Settings" << endl;
#endif #endif
//different output directory so as not to overwrite //different output directory so as not to overwrite
QString fName = QString(myDet->getSettingsDir()); QString fName = QString( (myDet->getSettingsDir()).c_str() );
qDefs::checkErrorMessage(myDet,"qDetectorMain::ExecuteUtilities"); qDefs::checkErrorMessage(myDet,"qDetectorMain::ExecuteUtilities");
fName = QFileDialog::getSaveFileName(this, fName = QFileDialog::getSaveFileName(this,
tr("Save Current Detector Settings"),fName, tr("Save Current Detector Settings"),fName,
@ -585,7 +585,7 @@ void qDetectorMain::ExecuteUtilities(QAction *action){
#ifdef VERBOSE #ifdef VERBOSE
cout << "Saving Trimbits" << endl; cout << "Saving Trimbits" << endl;
#endif//different output directory so as not to overwrite #endif//different output directory so as not to overwrite
QString fName = QString(myDet->getSettingsDir()); QString fName = QString( (myDet->getSettingsDir()).c_str() );
qDefs::checkErrorMessage(myDet,"qDetectorMain::ExecuteUtilities"); qDefs::checkErrorMessage(myDet,"qDetectorMain::ExecuteUtilities");
fName = QFileDialog::getSaveFileName(this, fName = QFileDialog::getSaveFileName(this,
tr("Save Current Detector Trimbits"),fName, tr("Save Current Detector Trimbits"),fName,