proper fix of MUSR-112 problem
This commit is contained in:
parent
9d8b4fe3bd
commit
f02e3d0b3a
@ -138,15 +138,16 @@ PMsr2DataParam* PMsr2DataDialog::getMsr2DataParam()
|
|||||||
*/
|
*/
|
||||||
void PMsr2DataDialog::runFirstEntered(const QString &str)
|
void PMsr2DataDialog::runFirstEntered(const QString &str)
|
||||||
{
|
{
|
||||||
|
|
||||||
|
if (str.length() == 0)
|
||||||
|
return;
|
||||||
|
|
||||||
fRunTag = 0;
|
fRunTag = 0;
|
||||||
|
|
||||||
if (!fRunList_lineEdit->text().isEmpty())
|
if (!fRunList_lineEdit->text().isEmpty())
|
||||||
fRunList_lineEdit->clear();
|
fRunList_lineEdit->clear();
|
||||||
if (!fRunListFileName_lineEdit->text().isEmpty())
|
if (!fRunListFileName_lineEdit->text().isEmpty())
|
||||||
fRunListFileName_lineEdit->clear();
|
fRunListFileName_lineEdit->clear();
|
||||||
|
|
||||||
if (str.length() == 1)
|
|
||||||
fFirst_lineEdit->setText(str);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
//----------------------------------------------------------------------------------------------------
|
//----------------------------------------------------------------------------------------------------
|
||||||
@ -155,6 +156,9 @@ void PMsr2DataDialog::runFirstEntered(const QString &str)
|
|||||||
*/
|
*/
|
||||||
void PMsr2DataDialog::runLastEntered(const QString &str)
|
void PMsr2DataDialog::runLastEntered(const QString &str)
|
||||||
{
|
{
|
||||||
|
if (str.length() == 0)
|
||||||
|
return;
|
||||||
|
|
||||||
fRunTag = 0;
|
fRunTag = 0;
|
||||||
|
|
||||||
if (!fRunList_lineEdit->text().isEmpty())
|
if (!fRunList_lineEdit->text().isEmpty())
|
||||||
@ -162,8 +166,8 @@ void PMsr2DataDialog::runLastEntered(const QString &str)
|
|||||||
if (!fRunListFileName_lineEdit->text().isEmpty())
|
if (!fRunListFileName_lineEdit->text().isEmpty())
|
||||||
fRunListFileName_lineEdit->clear();
|
fRunListFileName_lineEdit->clear();
|
||||||
|
|
||||||
if (str.length() == 1)
|
if (fLast_lineEdit->text().length() == 1)
|
||||||
fLast_lineEdit->setText(str);
|
fLast_lineEdit->update();
|
||||||
}
|
}
|
||||||
|
|
||||||
//----------------------------------------------------------------------------------------------------
|
//----------------------------------------------------------------------------------------------------
|
||||||
@ -172,6 +176,9 @@ void PMsr2DataDialog::runLastEntered(const QString &str)
|
|||||||
*/
|
*/
|
||||||
void PMsr2DataDialog::runListEntered(const QString &str)
|
void PMsr2DataDialog::runListEntered(const QString &str)
|
||||||
{
|
{
|
||||||
|
if (str.length() == 0)
|
||||||
|
return;
|
||||||
|
|
||||||
fRunTag = 1;
|
fRunTag = 1;
|
||||||
|
|
||||||
if (!fFirst_lineEdit->text().isEmpty())
|
if (!fFirst_lineEdit->text().isEmpty())
|
||||||
@ -180,9 +187,6 @@ void PMsr2DataDialog::runListEntered(const QString &str)
|
|||||||
fLast_lineEdit->clear();
|
fLast_lineEdit->clear();
|
||||||
if (!fRunListFileName_lineEdit->text().isEmpty())
|
if (!fRunListFileName_lineEdit->text().isEmpty())
|
||||||
fRunListFileName_lineEdit->clear();
|
fRunListFileName_lineEdit->clear();
|
||||||
|
|
||||||
if (str.length() == 1)
|
|
||||||
fRunList_lineEdit->setText(str);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
//----------------------------------------------------------------------------------------------------
|
//----------------------------------------------------------------------------------------------------
|
||||||
@ -191,6 +195,9 @@ void PMsr2DataDialog::runListEntered(const QString &str)
|
|||||||
*/
|
*/
|
||||||
void PMsr2DataDialog::runListFileNameEntered(const QString &str)
|
void PMsr2DataDialog::runListFileNameEntered(const QString &str)
|
||||||
{
|
{
|
||||||
|
if (str.length() == 0)
|
||||||
|
return;
|
||||||
|
|
||||||
fRunTag = 2;
|
fRunTag = 2;
|
||||||
|
|
||||||
if (!fFirst_lineEdit->text().isEmpty())
|
if (!fFirst_lineEdit->text().isEmpty())
|
||||||
@ -199,9 +206,6 @@ void PMsr2DataDialog::runListFileNameEntered(const QString &str)
|
|||||||
fLast_lineEdit->clear();
|
fLast_lineEdit->clear();
|
||||||
if (!fRunList_lineEdit->text().isEmpty())
|
if (!fRunList_lineEdit->text().isEmpty())
|
||||||
fRunList_lineEdit->clear();
|
fRunList_lineEdit->clear();
|
||||||
|
|
||||||
if (str.length() == 1)
|
|
||||||
fRunListFileName_lineEdit->setText(str);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
//----------------------------------------------------------------------------------------------------
|
//----------------------------------------------------------------------------------------------------
|
||||||
|
Loading…
x
Reference in New Issue
Block a user