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

fixed a bug which was leading to wrong file format settings when loading default msr files.

Browse Source
This commit is contained in:
nemu
2009-03-25 09:49:32 +00:00
parent 4cb6aa2ec9
commit df7f36de2f
4 changed files with 76 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

160
src/musrgui/forms/PGetDefaultDialogBase.ui
View File

@@ -174,6 +174,71 @@
</widget>
</hbox>
</widget>
<widget class="QLineEdit">
<property name="name">
<cstring>fRunFileName_lineEdit</cstring>
</property>
<property name="geometry">
<rect>
<x>130</x>
<y>20</y>
<width>360</width>
<height>24</height>
</rect>
</property>
<property name="toolTip" stdset="0">
<string>e.g. 2007/lem07_his_0147</string>
</property>
</widget>
<widget class="QLineEdit">
<property name="name">
<cstring>fBeamline_lineEdit</cstring>
</property>
<property name="geometry">
<rect>
<x>130</x>
<y>60</y>
<width>360</width>
<height>24</height>
</rect>
</property>
<property name="toolTip" stdset="0">
<string>e.g. mue4</string>
</property>
</widget>
<widget class="QComboBox">
<item>
<property name="text">
<string>PSI</string>
</property>
</item>
<item>
<property name="text">
<string>RAL</string>
</property>
</item>
<item>
<property name="text">
<string>TRIUMF</string>
</property>
</item>
<item>
<property name="text">
<string>JPARC</string>
</property>
</item>
<property name="name">
<cstring>fInstitute_comboBox</cstring>
</property>
<property name="geometry">
<rect>
<x>130</x>
<y>100</y>
<width>99</width>
<height>24</height>
</rect>
</property>
</widget>
<widget class="QComboBox">
<item>
<property name="text">
@@ -227,71 +292,6 @@
</rect>
</property>
</widget>
<widget class="QComboBox">
<item>
<property name="text">
<string>PSI</string>
</property>
</item>
<item>
<property name="text">
<string>RAL</string>
</property>
</item>
<item>
<property name="text">
<string>TRIUMF</string>
</property>
</item>
<item>
<property name="text">
<string>JPARC</string>
</property>
</item>
<property name="name">
<cstring>fInstitute_comboBox</cstring>
</property>
<property name="geometry">
<rect>
<x>130</x>
<y>100</y>
<width>99</width>
<height>24</height>
</rect>
</property>
</widget>
<widget class="QLineEdit">
<property name="name">
<cstring>fRunFileName_lineEdit</cstring>
</property>
<property name="geometry">
<rect>
<x>130</x>
<y>20</y>
<width>360</width>
<height>24</height>
</rect>
</property>
<property name="toolTip" stdset="0">
<string>e.g. 2007/lem07_his_0147</string>
</property>
</widget>
<widget class="QLineEdit">
<property name="name">
<cstring>fBeamline_lineEdit</cstring>
</property>
<property name="geometry">
<rect>
<x>130</x>
<y>60</y>
<width>360</width>
<height>24</height>
</rect>
</property>
<property name="toolTip" stdset="0">
<string>e.g. mue4</string>
</property>
</widget>
</widget>
<images>
<image name="image0">
@@ -311,30 +311,6 @@
<receiver>PGetDefaultDialogBase</receiver>
<slot>reject()</slot>
</connection>
<connection>
<sender>fRunFileName_lineEdit</sender>
<signal>textChanged(const QString&amp;)</signal>
<receiver>PGetDefaultDialogBase</receiver>
<slot>runFileNameChanged(const QString&amp;)</slot>
</connection>
<connection>
<sender>fBeamline_lineEdit</sender>
<signal>textChanged(const QString&amp;)</signal>
<receiver>PGetDefaultDialogBase</receiver>
<slot>beamlineChanged(const QString&amp;)</slot>
</connection>
<connection>
<sender>fInstitute_comboBox</sender>
<signal>activated(const QString&amp;)</signal>
<receiver>PGetDefaultDialogBase</receiver>
<slot>instituteChanged(const QString&amp;)</slot>
</connection>
<connection>
<sender>fFileFormat_comboBox</sender>
<signal>activated(const QString&amp;)</signal>
<receiver>PGetDefaultDialogBase</receiver>
<slot>fileFormatChanged(const QString&amp;)</slot>
</connection>
</connections>
<tabstops>
<tabstop>fRunFileName_lineEdit</tabstop>
@@ -345,11 +321,5 @@
<tabstop>buttonCancel</tabstop>
<tabstop>buttonHelp</tabstop>
</tabstops>
<slots>
<slot>runFileNameChanged(const QString&amp;)</slot>
<slot>beamlineChanged(const QString&amp;)</slot>
<slot>instituteChanged(const QString&amp;)</slot>
<slot>fileFormatChanged(const QString&amp;)</slot>
</slots>
<layoutdefaults spacing="6" margin="11"/>
</UI>