got rid of the missing first character when changing the field

This commit is contained in:
nemu
2009-09-10 14:20:40 +00:00
parent f910550c0f
commit 1c3a6eb924
3 changed files with 53 additions and 29 deletions

View File

@ -132,7 +132,7 @@ PMsr2DataParam* PMsr2DataDialog::getMsr2DataParam()
/** /**
* <p> * <p>
*/ */
void PMsr2DataDialog::runFirstLastEntered() void PMsr2DataDialog::runFirstEntered(const QString &str)
{ {
fRunTag = 0; fRunTag = 0;
@ -140,13 +140,31 @@ void PMsr2DataDialog::runFirstLastEntered()
fRunList_lineEdit->clear(); fRunList_lineEdit->clear();
if (!fRunListFileName_lineEdit->text().isEmpty()) if (!fRunListFileName_lineEdit->text().isEmpty())
fRunListFileName_lineEdit->clear(); fRunListFileName_lineEdit->clear();
fFirst_lineEdit->setText(str);
} }
//---------------------------------------------------------------------------------------------------- //----------------------------------------------------------------------------------------------------
/** /**
* <p> * <p>
*/ */
void PMsr2DataDialog::runListEntered() void PMsr2DataDialog::runLastEntered(const QString &str)
{
fRunTag = 0;
if (!fRunList_lineEdit->text().isEmpty())
fRunList_lineEdit->clear();
if (!fRunListFileName_lineEdit->text().isEmpty())
fRunListFileName_lineEdit->clear();
fLast_lineEdit->setText(str);
}
//----------------------------------------------------------------------------------------------------
/**
* <p>
*/
void PMsr2DataDialog::runListEntered(const QString &str)
{ {
fRunTag = 1; fRunTag = 1;
@ -156,13 +174,15 @@ void PMsr2DataDialog::runListEntered()
fLast_lineEdit->clear(); fLast_lineEdit->clear();
if (!fRunListFileName_lineEdit->text().isEmpty()) if (!fRunListFileName_lineEdit->text().isEmpty())
fRunListFileName_lineEdit->clear(); fRunListFileName_lineEdit->clear();
fRunList_lineEdit->setText(str);
} }
//---------------------------------------------------------------------------------------------------- //----------------------------------------------------------------------------------------------------
/** /**
* <p> * <p>
*/ */
void PMsr2DataDialog::runListFileNameEntered() void PMsr2DataDialog::runListFileNameEntered(const QString &str)
{ {
fRunTag = 2; fRunTag = 2;
@ -172,6 +192,8 @@ void PMsr2DataDialog::runListFileNameEntered()
fLast_lineEdit->clear(); fLast_lineEdit->clear();
if (!fRunList_lineEdit->text().isEmpty()) if (!fRunList_lineEdit->text().isEmpty())
fRunList_lineEdit->clear(); fRunList_lineEdit->clear();
fRunListFileName_lineEdit->setText(str);
} }
//---------------------------------------------------------------------------------------------------- //----------------------------------------------------------------------------------------------------

View File

@ -44,9 +44,10 @@ class PMsr2DataDialog : public PMsr2DataDialogBase
virtual PMsr2DataParam* getMsr2DataParam(); virtual PMsr2DataParam* getMsr2DataParam();
public slots: public slots:
void runFirstLastEntered(); void runFirstEntered(const QString&);
void runListEntered(); void runLastEntered(const QString&);
void runListFileNameEntered(); void runListEntered(const QString&);
void runListFileNameEntered(const QString&);
private: private:
int fRunTag; // -1 = not valid, 0 = first last, 1 = run list, 2 = run list file name int fRunTag; // -1 = not valid, 0 = first last, 1 = run list, 2 = run list file name

View File

@ -151,22 +151,6 @@
<string>last run no, .e.g. 275</string> <string>last run no, .e.g. 275</string>
</property> </property>
</widget> </widget>
<widget class="QLineEdit">
<property name="name">
<cstring>fFirst_lineEdit</cstring>
</property>
<property name="geometry">
<rect>
<x>50</x>
<y>30</y>
<width>90</width>
<height>24</height>
</rect>
</property>
<property name="toolTip" stdset="0">
<string>first run no, e.g. 147</string>
</property>
</widget>
<widget class="QLineEdit"> <widget class="QLineEdit">
<property name="name"> <property name="name">
<cstring>fRunList_lineEdit</cstring> <cstring>fRunList_lineEdit</cstring>
@ -199,6 +183,22 @@
<string></string> <string></string>
</property> </property>
</widget> </widget>
<widget class="QLineEdit">
<property name="name">
<cstring>fFirst_lineEdit</cstring>
</property>
<property name="geometry">
<rect>
<x>50</x>
<y>30</y>
<width>90</width>
<height>24</height>
</rect>
</property>
<property name="toolTip" stdset="0">
<string>first run no, e.g. 147</string>
</property>
</widget>
</widget> </widget>
<widget class="QLayoutWidget"> <widget class="QLayoutWidget">
<property name="name"> <property name="name">
@ -615,25 +615,25 @@
<sender>fFirst_lineEdit</sender> <sender>fFirst_lineEdit</sender>
<signal>textChanged(const QString&amp;)</signal> <signal>textChanged(const QString&amp;)</signal>
<receiver>PMsr2DataDialogBase</receiver> <receiver>PMsr2DataDialogBase</receiver>
<slot>runFirstLastEntered()</slot> <slot>runFirstEntered(const QString&amp;)</slot>
</connection> </connection>
<connection> <connection>
<sender>fLast_lineEdit</sender> <sender>fLast_lineEdit</sender>
<signal>textChanged(const QString&amp;)</signal> <signal>textChanged(const QString&amp;)</signal>
<receiver>PMsr2DataDialogBase</receiver> <receiver>PMsr2DataDialogBase</receiver>
<slot>runFirstLastEntered()</slot> <slot>runLastEntered(const QString&amp;)</slot>
</connection> </connection>
<connection> <connection>
<sender>fRunList_lineEdit</sender> <sender>fRunList_lineEdit</sender>
<signal>textChanged(const QString&amp;)</signal> <signal>textChanged(const QString&amp;)</signal>
<receiver>PMsr2DataDialogBase</receiver> <receiver>PMsr2DataDialogBase</receiver>
<slot>runListEntered()</slot> <slot>runListEntered(const QString&amp;)</slot>
</connection> </connection>
<connection> <connection>
<sender>fRunListFileName_lineEdit</sender> <sender>fRunListFileName_lineEdit</sender>
<signal>textChanged(const QString&amp;)</signal> <signal>textChanged(const QString&amp;)</signal>
<receiver>PMsr2DataDialogBase</receiver> <receiver>PMsr2DataDialogBase</receiver>
<slot>runListFileNameEntered()</slot> <slot>runListFileNameEntered(const QString&amp;)</slot>
</connection> </connection>
</connections> </connections>
<tabstops> <tabstops>
@ -655,9 +655,10 @@
<tabstop>fHelp_button</tabstop> <tabstop>fHelp_button</tabstop>
</tabstops> </tabstops>
<slots> <slots>
<slot>runFirstLastEntered()</slot> <slot>runFirstEntered(const QString&amp;)</slot>
<slot>runListEntered()</slot> <slot>runListEntered(const QString&amp;)</slot>
<slot>runListFileNameEntered()</slot> <slot>runListFileNameEntered(const QString&amp;)</slot>
<slot>runLastEntered(const QString&amp;)</slot>
</slots> </slots>
<layoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
</UI> </UI>