Skip to content

Commit

Permalink
Modifed REFM gui to try to fix issue with file not found and disabled…
Browse files Browse the repository at this point in the history 
… new widgets in REF_L gui. This refs #5801
  • Loading branch information
@JeanBilheux
JeanBilheux committed Sep 7, 2012
1 parent df1d5a5 commit 23b9b41
Show file tree
Hide file tree
Showing 4 changed files with 230 additions and 214 deletions.
2 changes: 1 addition & 1 deletion Code/Mantid/scripts/Interface/reduction_gui/widgets/reflectometer/base_ref_reduction.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -899,7 +899,7 @@ def _plot_tof(self):
return
try:
f = FileFinder.findRuns("%s%s" % (self.instrument_name, str(self._summary.norm_run_number_edit.text())))[0]
print FileFinder.findRuns("%s%s" % (self.instrument_name, str(self._summary.norm_run_number_edit.text())))
# print FileFinder.findRuns("%s%s" % (self.instrument_name, str(self._summary.norm_run_number_edit.text())))

range_min = int(self._summary.data_from_tof.text())
range_max = int(self._summary.data_to_tof.text())
Expand Down
2 changes: 1 addition & 1 deletion Code/Mantid/scripts/Interface/reduction_gui/widgets/reflectometer/refm_reduction.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -547,7 +547,7 @@ def _integrated_plot(self, is_high_res, file_ctrl, min_ctrl, max_ctrl):
if not IS_IN_MANTIDPLOT:
return

f = FileFinder.findRuns("%s%s" % (self.instrument_name, str(file_ctrl.text())))
f = FileFinder.findRuns("%s%s" % (self.instrument_name, str(file_ctrl.text())))[0]

range_min = int(min_ctrl.text())
range_max = int(max_ctrl.text())
Expand Down
58 changes: 35 additions & 23 deletions Code/Mantid/scripts/Interface/ui/reflectometer/data_refl_simple.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,7 @@ p, li { white-space: pre-wrap; }
</widget>
</item>
<item>
<widget class="QLabel" name="data_peak_from_pixel_label_2">
<widget class="QLabel" name="data_peak_from_pixel_label">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Preferred">
<horstretch>0</horstretch>
Expand Down Expand Up @@ -400,7 +400,7 @@ p, li { white-space: pre-wrap; }
</widget>
</item>
<item>
<widget class="QLineEdit" name="data_peak_from_pixel_2">
<widget class="QLineEdit" name="data_peak_from_pixel">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
Expand All @@ -425,7 +425,7 @@ p, li { white-space: pre-wrap; }
</widget>
</item>
<item>
<widget class="QLabel" name="data_peak_from_pixel_estimate_2">
<widget class="QLabel" name="data_peak_from_pixel_estimate">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Preferred">
<horstretch>0</horstretch>
Expand Down Expand Up @@ -868,7 +868,7 @@ p, li { white-space: pre-wrap; }
</widget>
</item>
<item>
<widget class="QLabel" name="data_peak_to_pixel_label_2">
<widget class="QLabel" name="data_peak_to_pixel_label">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Preferred">
<horstretch>0</horstretch>
Expand All @@ -887,7 +887,7 @@ p, li { white-space: pre-wrap; }
</widget>
</item>
<item>
<widget class="QLineEdit" name="data_peak_to_pixel_2">
<widget class="QLineEdit" name="data_peak_to_pixel">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
Expand All @@ -912,7 +912,7 @@ p, li { white-space: pre-wrap; }
</widget>
</item>
<item>
<widget class="QLabel" name="data_peak_to_pixel_estimate_2">
<widget class="QLabel" name="data_peak_to_pixel_estimate">
<property name="minimumSize">
<size>
<width>40</width>
Expand Down Expand Up @@ -987,7 +987,7 @@ p, li { white-space: pre-wrap; }
</spacer>
</item>
<item>
<widget class="QPushButton" name="plot_count_vs_y_btn_2">
<widget class="QPushButton" name="plot_count_vs_y_btn">
<property name="minimumSize">
<size>
<width>150</width>
Expand Down Expand Up @@ -1019,7 +1019,7 @@ p, li { white-space: pre-wrap; }
<number>0</number>
</property>
<item>
<widget class="QCheckBox" name="data_background_switch_2">
<widget class="QCheckBox" name="data_background_switch">
<property name="minimumSize">
<size>
<width>170</width>
Expand All @@ -1041,7 +1041,7 @@ p, li { white-space: pre-wrap; }
</widget>
</item>
<item>
<widget class="QLabel" name="data_background_from_pixel1_label_2">
<widget class="QLabel" name="data_background_from_pixel1_label">
<property name="enabled">
<bool>true</bool>
</property>
Expand Down Expand Up @@ -1072,7 +1072,7 @@ p, li { white-space: pre-wrap; }
</widget>
</item>
<item>
<widget class="QLineEdit" name="data_background_from_pixel1_2">
<widget class="QLineEdit" name="data_background_from_pixel1">
<property name="enabled">
<bool>true</bool>
</property>
Expand Down Expand Up @@ -1106,7 +1106,7 @@ p, li { white-space: pre-wrap; }
</widget>
</item>
<item>
<widget class="QLabel" name="data_background_from_pixel1_missing_2">
<widget class="QLabel" name="data_background_from_pixel1_missing">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Preferred">
<horstretch>0</horstretch>
Expand All @@ -1131,7 +1131,7 @@ p, li { white-space: pre-wrap; }
</widget>
</item>
<item>
<widget class="QLabel" name="data_background_to_pixel1_label_2">
<widget class="QLabel" name="data_background_to_pixel1_label">
<property name="enabled">
<bool>true</bool>
</property>
Expand All @@ -1153,7 +1153,7 @@ p, li { white-space: pre-wrap; }
</widget>
</item>
<item>
<widget class="QLineEdit" name="data_background_to_pixel1_2">
<widget class="QLineEdit" name="data_background_to_pixel1">
<property name="enabled">
<bool>true</bool>
</property>
Expand Down Expand Up @@ -1181,7 +1181,7 @@ p, li { white-space: pre-wrap; }
</widget>
</item>
<item>
<widget class="QLabel" name="data_background_to_pixel1_missing_2">
<widget class="QLabel" name="data_background_to_pixel1_missing">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Preferred">
<horstretch>0</horstretch>
Expand Down Expand Up @@ -1222,7 +1222,7 @@ p, li { white-space: pre-wrap; }
</spacer>
</item>
<item>
<widget class="QPushButton" name="plot_count_vs_y_bck_btn_2">
<widget class="QPushButton" name="plot_count_vs_y_bck_btn">
<property name="minimumSize">
<size>
<width>150</width>
Expand Down Expand Up @@ -1254,7 +1254,7 @@ p, li { white-space: pre-wrap; }
<number>0</number>
</property>
<item>
<widget class="QCheckBox" name="data_low_res_range_switch_2">
<widget class="QCheckBox" name="data_low_res_range_switch">
<property name="minimumSize">
<size>
<width>170</width>
Expand All @@ -1273,7 +1273,7 @@ p, li { white-space: pre-wrap; }
</widget>
</item>
<item>
<widget class="QLabel" name="data_low_res_from_label_2">
<widget class="QLabel" name="data_low_res_from_label">
<property name="enabled">
<bool>false</bool>
</property>
Expand Down Expand Up @@ -1304,7 +1304,7 @@ p, li { white-space: pre-wrap; }
</widget>
</item>
<item>
<widget class="QLineEdit" name="x_min_edit_2">
<widget class="QLineEdit" name="x_min_edit">
<property name="enabled">
<bool>false</bool>
</property>
Expand All @@ -1326,7 +1326,7 @@ p, li { white-space: pre-wrap; }
</widget>
</item>
<item>
<widget class="QLabel" name="x_min_estimate_2">
<widget class="QLabel" name="x_min_estimate">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Preferred">
<horstretch>0</horstretch>
Expand Down Expand Up @@ -1354,7 +1354,7 @@ p, li { white-space: pre-wrap; }
</widget>
</item>
<item>
<widget class="QLabel" name="data_low_res_to_label_2">
<widget class="QLabel" name="data_low_res_to_label">
<property name="enabled">
<bool>false</bool>
</property>
Expand All @@ -1376,7 +1376,7 @@ p, li { white-space: pre-wrap; }
</widget>
</item>
<item>
<widget class="QLineEdit" name="x_max_edit_2">
<widget class="QLineEdit" name="x_max_edit">
<property name="enabled">
<bool>false</bool>
</property>
Expand All @@ -1398,7 +1398,7 @@ p, li { white-space: pre-wrap; }
</widget>
</item>
<item>
<widget class="QLabel" name="x_max_estimate_2">
<widget class="QLabel" name="x_max_estimate">
<property name="minimumSize">
<size>
<width>40</width>
Expand Down Expand Up @@ -1436,7 +1436,7 @@ p, li { white-space: pre-wrap; }
</spacer>
</item>
<item>
<widget class="QPushButton" name="plot_count_vs_x_btn_2">
<widget class="QPushButton" name="plot_count_vs_x_btn">
<property name="minimumSize">
<size>
<width>150</width>
Expand Down Expand Up @@ -1481,6 +1481,9 @@ p, li { white-space: pre-wrap; }
<layout class="QVBoxLayout" name="verticalLayout_13">
<item>
<widget class="QPushButton" name="pushButton_2">
<property name="enabled">
<bool>false</bool>
</property>
<property name="minimumSize">
<size>
<width>0</width>
Expand All @@ -1500,6 +1503,9 @@ p, li { white-space: pre-wrap; }
</item>
<item>
<widget class="QPushButton" name="pushButton_3">
<property name="enabled">
<bool>false</bool>
</property>
<property name="minimumSize">
<size>
<width>0</width>
Expand Down Expand Up @@ -2915,6 +2921,9 @@ p, li { white-space: pre-wrap; }
<layout class="QVBoxLayout" name="verticalLayout_17">
<item>
<widget class="QPushButton" name="pushButton_4">
<property name="enabled">
<bool>false</bool>
</property>
<property name="minimumSize">
<size>
<width>0</width>
Expand All @@ -2934,6 +2943,9 @@ p, li { white-space: pre-wrap; }
</item>
<item>
<widget class="QPushButton" name="pushButton_5">
<property name="enabled">
<bool>false</bool>
</property>
<property name="minimumSize">
<size>
<width>0</width>
Expand Down

0 comments on commit 23b9b41

Please sign in to comment.