Merged muonspin/musrfit:root6 into master
This commit is contained in:
commit
a30ac29032
@ -262,7 +262,6 @@ bool PParamDataHandler::analyzeFileList(const QStringList &fln, QString &collect
|
|||||||
bool PParamDataHandler::ReadParamFile(const QStringList fln, QString &errorMsg)
|
bool PParamDataHandler::ReadParamFile(const QStringList fln, QString &errorMsg)
|
||||||
{
|
{
|
||||||
bool valid = true;
|
bool valid = true;
|
||||||
PmuppRun run;
|
|
||||||
PmuppCollection collection;
|
PmuppCollection collection;
|
||||||
QString collName("");
|
QString collName("");
|
||||||
|
|
||||||
|
@ -990,9 +990,11 @@ void PmuppGui::remove()
|
|||||||
updateXYList(fColList->currentRow());
|
updateXYList(fColList->currentRow());
|
||||||
|
|
||||||
// if there no collections left remove all the parameters from the X/Y list
|
// if there no collections left remove all the parameters from the X/Y list
|
||||||
|
// remove all fXY as well
|
||||||
if (fColList->count() == 0) {
|
if (fColList->count() == 0) {
|
||||||
fViewX->clear();
|
fViewX->clear();
|
||||||
fViewY->clear();
|
fViewY->clear();
|
||||||
|
fXY.clear();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user