removed unnecessary check form musredit_qt5 msr2data interface.
This commit is contained in:
parent
9c700a3773
commit
14e4b28946
@ -10,6 +10,7 @@ FIXED 2015-10-29 TMusrRunHeader didn't map a double vector properly into a
|
|||||||
comment typo.
|
comment typo.
|
||||||
FIXED 2015-11-11 Fixes the crash of Fourier if the maximal range given in the
|
FIXED 2015-11-11 Fixes the crash of Fourier if the maximal range given in the
|
||||||
Fourier block is larger than the available.
|
Fourier block is larger than the available.
|
||||||
|
CHANGED 2015-11-15 removed unnecessary check form musredit_qt5 msr2data interface.
|
||||||
|
|
||||||
changes since 0.14.0
|
changes since 0.14.0
|
||||||
===================================
|
===================================
|
||||||
|
@ -679,42 +679,6 @@ void PTextEdit::doConnections( PSubTextEdit *e )
|
|||||||
connect( e, SIGNAL( cursorPositionChanged() ), this, SLOT( currentCursorPosition() ));
|
connect( e, SIGNAL( cursorPositionChanged() ), this, SLOT( currentCursorPosition() ));
|
||||||
}
|
}
|
||||||
|
|
||||||
//----------------------------------------------------------------------------------------------------
|
|
||||||
/**
|
|
||||||
* <p>Validates a given runlist.
|
|
||||||
*
|
|
||||||
* \param runList run list string which should be a space separated list of run numbers.
|
|
||||||
*/
|
|
||||||
bool PTextEdit::validRunList(const QString runList)
|
|
||||||
{
|
|
||||||
bool success = true;
|
|
||||||
|
|
||||||
int i = 0;
|
|
||||||
QString subStr;
|
|
||||||
bool done = false;
|
|
||||||
int val = 0;
|
|
||||||
bool ok;
|
|
||||||
while (!done) {
|
|
||||||
subStr = runList.section(' ', i, i, QString::SectionSkipEmpty);
|
|
||||||
if (subStr.isEmpty()) {
|
|
||||||
done = true;
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
i++;
|
|
||||||
val = subStr.toInt(&ok);
|
|
||||||
if (!ok) {
|
|
||||||
done = true;
|
|
||||||
success = false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (i == 0) { // no token found
|
|
||||||
success = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
return success;
|
|
||||||
}
|
|
||||||
|
|
||||||
//----------------------------------------------------------------------------------------------------
|
//----------------------------------------------------------------------------------------------------
|
||||||
/**
|
/**
|
||||||
* <p>Start the dialog to enter a msr-file title. See also https://intranet.psi.ch/MUSR/MusrFit#4_1_The_Title
|
* <p>Start the dialog to enter a msr-file title. See also https://intranet.psi.ch/MUSR/MusrFit#4_1_The_Title
|
||||||
@ -1892,12 +1856,6 @@ void PTextEdit::musrMsr2Data()
|
|||||||
break;
|
break;
|
||||||
case 1: // run list
|
case 1: // run list
|
||||||
runList = fMsr2DataParam->runList;
|
runList = fMsr2DataParam->runList;
|
||||||
if (!validRunList(runList)) {
|
|
||||||
QMessageBox::critical(this, "**ERROR**",
|
|
||||||
"Invalid Run List!\nThe run list needs to be a space separated list of run numbers.",
|
|
||||||
QMessageBox::Ok, QMessageBox::NoButton);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
break;
|
break;
|
||||||
case 2: // run list file name
|
case 2: // run list file name
|
||||||
runListFileName = fMsr2DataParam->runListFileName;
|
runListFileName = fMsr2DataParam->runListFileName;
|
||||||
|
@ -77,7 +77,6 @@ private:
|
|||||||
void load( const QString &f, const int index=-1 );
|
void load( const QString &f, const int index=-1 );
|
||||||
PSubTextEdit *currentEditor() const;
|
PSubTextEdit *currentEditor() const;
|
||||||
void doConnections( PSubTextEdit *e );
|
void doConnections( PSubTextEdit *e );
|
||||||
bool validRunList(const QString runList);
|
|
||||||
void fileSystemWatcherActivation();
|
void fileSystemWatcherActivation();
|
||||||
|
|
||||||
private slots:
|
private slots:
|
||||||
|
Loading…
x
Reference in New Issue
Block a user