LMU/musrfit
5
0
Fork 0
Code Issues 6 Pull Requests Actions Packages Projects Releases 4 Activity

a more coherent error message handling.

Browse Source
This commit is contained in:
suter_a
2018-07-02 15:13:49 +02:00
parent 07ad8205c8
commit a3ddd07a9e
4 changed files with 65 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/musredit_qt5/mupp/PmuppGui.cpp
View File

@ -223,8 +223,9 @@ PmuppGui::PmuppGui( QStringList fln, QWidget *parent, Qt::WindowFlags f )
QString collName = QString("collName0");
fParamDataHandler->NewCollection(collName);
}
if (!fParamDataHandler->ReadParamFile(fln)) {
// parameter file(s) is/are not valid
QString errorMsg("");
if (!fParamDataHandler->ReadParamFile(fln, errorMsg)) {
QMessageBox::critical(this, "ERROR", errorMsg);
} else {
dataAtStartup = true; // delay to deal with the data sets until the GUI is ready to do so
}
@ -571,7 +572,10 @@ void PmuppGui::fileOpen()
return;
}
fParamDataHandler->ReadParamFile(list);
QString errorMsg("");
if (!fParamDataHandler->ReadParamFile(list, errorMsg)) {
QMessageBox::critical(this, "ERROR", errorMsg);
}
}
//----------------------------------------------------------------------------------------------------
@ -817,17 +821,21 @@ void PmuppGui::refresh()
PmuppCollection coll;
bool ok=false;
if (pathName.endsWith(".db")) {
coll = fParamDataHandler->ReadDbFile(pathName, ok);
QString errorMsg("");
coll = fParamDataHandler->ReadDbFile(pathName, ok, errorMsg);
if (!ok) {
QMessageBox::critical(this, "ERROR - REFRESH",
QString("Couldn't refresh %1\nFile corrupted?!").arg(fParamDataHandler->GetCollection(collIdx)->GetName()));
QString("Couldn't refresh %1\nFile corrupted?!\n").arg(fParamDataHandler->GetCollection(collIdx)->GetName())+
errorMsg);
return;
}
} else if (pathName.endsWith(".dat")) {
coll = fParamDataHandler->ReadColumnParamFile(pathName, ok);
QString errorMsg("");
coll = fParamDataHandler->ReadColumnParamFile(pathName, ok, errorMsg);
if (!ok) {
QMessageBox::critical(this, "ERROR - REFRESH",
QString("Couldn't refresh %1\nFile corrupted?!").arg(fParamDataHandler->GetCollection(collIdx)->GetName()));
QString("Couldn't refresh %1\nFile corrupted?!\n").arg(fParamDataHandler->GetCollection(collIdx)->GetName())+
errorMsg);
return;
}
} else {