diff --git a/scripts/Interface/ui/sans_isis/sans_data_processor_window.ui b/scripts/Interface/ui/sans_isis/sans_data_processor_window.ui index 37cabfe50e052c3f1c61d809dc1c0f07a3cb01eb..5fac4b91dec5f0f0823dbc95eb19f52956ad9152 100644 --- a/scripts/Interface/ui/sans_isis/sans_data_processor_window.ui +++ b/scripts/Interface/ui/sans_isis/sans_data_processor_window.ui @@ -428,7 +428,7 @@ QGroupBox::title { <item> <widget class="QTabWidget" name="settings_tab_widget"> <property name="currentIndex"> - <number>3</number> + <number>0</number> </property> <widget class="QWidget" name="general_tab"> <attribute name="title"> @@ -626,7 +626,7 @@ QGroupBox::title { <item> <widget class="QGroupBox" name="slice_event_group_box"> <property name="toolTip"> - <string><html><head/><body><p>In the case of data which was measured in event-mode, it is possible to perform time-of-flight slices of the data and reduce these separately.</p><p>Input can be:</p><p>-<span style=" font-style:italic;"> start:step:stop</span> specifies time slices from the <span style=" font-style:italic;">start</span> value to the <span style=" font-style:italic;">stop </span>value in steps of <span style=" font-style:italic;">step</span></p><p>- <span style=" font-style:italic;">start-stop </span>which specifies a time slice from the <span style=" font-style:italic;">start</span> value to the <span style=" font-style:italic;">stop</span> value</p><p>- <span style=" font-style:italic;">&gt;start</span> specifies a slice from the <span style=" font-style:italic;">start </span>value to the end of the data set</p><p>- <span style=" font-style:italic;">&lt;stop</span> specifes a slcie from teh start of the data set to the <span style=" font-style:italic;">stop </span>value</p><p>In addition it is possible to concatenate these specifications useing comma-separation. An example is:</p><p><span style=" font-style:italic;">5-10,12:2:16,20-30</span></p></body></html></string> + <string><html><head/><body><p>In the case of data which was measured in event-mode, it is possible to perform time-of-flight slices of the data and reduce these separately.</p><p>Input can be:</p><p>-<span style=" font-style:italic;"> start:step:stop</span> specifies time slices from the <span style=" font-style:italic;">start</span> value to the <span style=" font-style:italic;">stop </span>value in steps of <span style=" font-style:italic;">step</span></p><p>- <span style=" font-style:italic;">start-stop </span>which specifies a time slice from the <span style=" font-style:italic;">start</span> value to the <span style=" font-style:italic;">stop</span> value</p><p>- <span style=" font-style:italic;">&gt;start</span> specifies a slice from the <span style=" font-style:italic;">start </span>value to the end of the data set</p><p>- <span style=" font-style:italic;">&lt;stop</span> specifes a slice from the start of the data set to the <span style=" font-style:italic;">stop </span>value</p><p>In addition it is possible to concatenate these specifications useing comma-separation. An example is:</p><p><span style=" font-style:italic;">5-10,12:2:16,20-30</span></p></body></html></string> </property> <property name="title"> <string>Event Slice</string> @@ -912,7 +912,7 @@ QGroupBox::title { <string><html><head/><body><p>Spectrum number of the incident monitor which is used for monitor normalization.</p></body></html></string> </property> <property name="text"> - <string>Incidient monitor</string> + <string>Incident monitor</string> </property> </widget> </item> @@ -1879,12 +1879,12 @@ QGroupBox::title { </property> <item> <property name="text"> - <string>Circular</string> + <string>Pinhole</string> </property> </item> <item> <property name="text"> - <string>Rectangular</string> + <string>Slit</string> </property> </item> </widget> @@ -1899,7 +1899,7 @@ QGroupBox::title { </property> </widget> </item> - <item row="3" column="4"> + <item row="3" column="2"> <widget class="QLabel" name="q_resolution_sample_a_label"> <property name="toolTip"> <string><html><head/><body><p>Diameter of a circular sample aperature.</p></body></html></string> @@ -1916,7 +1916,7 @@ QGroupBox::title { </property> </widget> </item> - <item row="2" column="4"> + <item row="2" column="2"> <widget class="QLabel" name="q_resolution_sample_w_label"> <property name="toolTip"> <string><html><head/><body><p>Width of a rectangular sample aperature.</p></body></html></string> @@ -1926,14 +1926,14 @@ QGroupBox::title { </property> </widget> </item> - <item row="2" column="5"> + <item row="2" column="3"> <widget class="QLineEdit" name="q_resolution_sample_w_line_edit"> <property name="toolTip"> <string><html><head/><body><p>Width of a rectangular sample aperature.</p></body></html></string> </property> </widget> </item> - <item row="6" column="0"> + <item row="5" column="0"> <widget class="QLabel" name="q_resolution_collimation_length_label"> <property name="toolTip"> <string><html><head/><body><p>The collimation length.</p></body></html></string> @@ -1943,7 +1943,7 @@ QGroupBox::title { </property> </widget> </item> - <item row="6" column="4"> + <item row="5" column="2"> <widget class="QLabel" name="q_resolution_delta_r_label"> <property name="toolTip"> <string><html><head/><body><p>Delta r.</p></body></html></string> @@ -1953,21 +1953,21 @@ QGroupBox::title { </property> </widget> </item> - <item row="7" column="1" colspan="4"> + <item row="6" column="1" colspan="2"> <widget class="QLineEdit" name="q_resolution_moderator_file_line_edit"> <property name="toolTip"> <string><html><head/><body><p>Path to the moderator file.</p></body></html></string> </property> </widget> </item> - <item row="7" column="5"> + <item row="6" column="3"> <widget class="QPushButton" name="q_resolution_moderator_file_push_button"> <property name="text"> <string>Browse</string> </property> </widget> </item> - <item row="7" column="0"> + <item row="6" column="0"> <widget class="QLabel" name="q_resolution_moderator_file_label"> <property name="toolTip"> <string><html><head/><body><p>Path to the moderator file.</p></body></html></string> @@ -1977,24 +1977,24 @@ QGroupBox::title { </property> </widget> </item> - <item row="6" column="1"> + <item row="5" column="1"> <widget class="QLineEdit" name="q_resolution_collimation_length_line_edit"> <property name="toolTip"> <string><html><head/><body><p>The collimation length.</p></body></html></string> </property> </widget> </item> - <item row="6" column="5"> + <item row="5" column="3"> <widget class="QLineEdit" name="q_resolution_delta_r_line_edit"> <property name="toolTip"> <string><html><head/><body><p>Delta r.</p></body></html></string> </property> </widget> </item> - <item row="5" column="0" colspan="6"> - <widget class="Line" name="line_6"> - <property name="orientation"> - <enum>Qt::Horizontal</enum> + <item row="3" column="3"> + <widget class="QLineEdit" name="q_resolution_sample_a_line_edit"> + <property name="toolTip"> + <string><html><head/><body><p>Diameter of a circular sample aperature.</p></body></html></string> </property> </widget> </item> @@ -2005,10 +2005,10 @@ QGroupBox::title { </property> </widget> </item> - <item row="3" column="5"> - <widget class="QLineEdit" name="q_resolution_sample_a_line_edit"> + <item row="2" column="1"> + <widget class="QLineEdit" name="q_resolution_source_w_line_edit"> <property name="toolTip"> - <string><html><head/><body><p>Diameter of a circular sample aperature.</p></body></html></string> + <string><html><head/><body><p>Width of a rectangular source aperature.</p></body></html></string> </property> </widget> </item> @@ -2022,10 +2022,10 @@ QGroupBox::title { </property> </widget> </item> - <item row="2" column="1"> - <widget class="QLineEdit" name="q_resolution_source_w_line_edit"> + <item row="1" column="3"> + <widget class="QLineEdit" name="q_resolution_sample_h_line_edit"> <property name="toolTip"> - <string><html><head/><body><p>Width of a rectangular source aperature.</p></body></html></string> + <string><html><head/><body><p>Height of a rectangular sample aperature.</p></body></html></string> </property> </widget> </item> @@ -2039,14 +2039,7 @@ QGroupBox::title { </property> </widget> </item> - <item row="1" column="5"> - <widget class="QLineEdit" name="q_resolution_sample_h_line_edit"> - <property name="toolTip"> - <string><html><head/><body><p>Height of a rectangular sample aperature.</p></body></html></string> - </property> - </widget> - </item> - <item row="1" column="4"> + <item row="1" column="2"> <widget class="QLabel" name="q_resolution_sample_h_label"> <property name="toolTip"> <string><html><head/><body><p>Height of a rectangular sample aperature.</p></body></html></string> @@ -2056,13 +2049,6 @@ QGroupBox::title { </property> </widget> </item> - <item row="1" column="2" rowspan="3"> - <widget class="Line" name="line_7"> - <property name="orientation"> - <enum>Qt::Vertical</enum> - </property> - </widget> - </item> </layout> </widget> </item>