Changeset 0efe791 in sasview for src/sas/qtgui/Perspectives/Fitting/UI

Timestamp:

Feb 21, 2017 8:56:32 AM (8 years ago)

Author:

wojciech

Branches:

ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc

Children:

b9c4c1e1

Parents:

2162fa0

Message:

Complied with naming convention of widgets

File:

• src/sas/qtgui/Perspectives/Fitting/UI/FittingUI.ui (modified) (11 diffs)

src/sas/qtgui/Perspectives/Fitting/UI/FittingUI.ui

@@ -133 +133 @@
                 </item>
                 <item row="1" column="0">
-                 <widget class="QComboBox" name="comboBox"/>
+                 <widget class="QComboBox" name="cbCategory"/>
                 </item>
                 <item row="1" column="1">
-                 <widget class="QComboBox" name="comboBox_2"/>
+                 <widget class="QComboBox" name="cbModel"/>
                 </item>
                 <item row="1" column="2">
-                 <widget class="QComboBox" name="comboBox_3">
-                  <item>
-                   <property name="text">
-                    <string>Hard Sphere Structure</string>
-                   </property>
-                  </item>
+                 <widget class="QComboBox" name="cbStructureFactor">
                   <item>
                    <property name="text">
@@ -174 +169 @@
              <layout class="QGridLayout" name="gridLayout_16">
               <item row="0" column="0">
-               <widget class="QCheckBox" name="checkBox_3">
+               <widget class="QCheckBox" name="chkPolydispersity">
                 <property name="enabled">
                  <bool>true</bool>
@@ -187 +182 @@
               </item>
               <item row="1" column="0">
-               <widget class="QCheckBox" name="checkBox_4">
+               <widget class="QCheckBox" name="chkSmearing">
                 <property name="enabled">
                  <bool>true</bool>
@@ -211 +206 @@
                <layout class="QGridLayout" name="gridLayout_8">
                 <item row="0" column="0">
-                 <widget class="QLabel" name="label_16">
+                 <widget class="QLabel" name="lblMinRange">
                   <property name="text">
                    <string>Min range</string>
@@ -218 +213 @@
                 </item>
                 <item row="0" column="1">
-                 <widget class="QLabel" name="label_20">
+                 <widget class="QLabel" name="lblMinRangeDef">
                   <property name="text">
                    <string>0.005</string>
@@ -225 +220 @@
                 </item>
                 <item row="0" column="2">
-                 <widget class="QLabel" name="label_17">
+                 <widget class="QLabel" name="lblMinRangeUnit">
                   <property name="text">
                    <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Ã
@@ -233 +228 @@
                 </item>
                 <item row="1" column="0">
-                 <widget class="QLabel" name="label_18">
+                 <widget class="QLabel" name="lblMaxRange">
                   <property name="text">
                    <string>Max range</string>
@@ -240 +235 @@
                 </item>
                 <item row="1" column="1">
-                 <widget class="QLabel" name="label_21">
+                 <widget class="QLabel" name="lblMaxRangeDef">
                   <property name="text">
                    <string>0.1</string>
@@ -247 +242 @@
                 </item>
                 <item row="1" column="2">
-                 <widget class="QLabel" name="label_19">
+                 <widget class="QLabel" name="lblMaxRangeUnit">
                   <property name="text">
                    <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Ã
@@ -281 +276 @@
                <layout class="QHBoxLayout" name="horizontalLayout_2">
                 <item>
-                 <widget class="QLabel" name="label_23">
+                 <widget class="QLabel" name="lblChi2">
                   <property name="text">
                    <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;χ&lt;/span&gt;&lt;span style=&quot; font-weight:600; vertical-align:super;&quot;&gt;2&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
@@ -288 +283 @@
                 </item>
                 <item>
-                 <widget class="QLabel" name="label_24">
+                 <widget class="QLabel" name="lblChi2Value">
                   <property name="text">
                    <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;0.01625&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>