Changeset 2e3e959 in sasview for src/sas/qtgui/UI
- Timestamp:
- Jan 13, 2017 4:28:30 AM (8 years ago)
- 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:
- 239214f
- Parents:
- db5cd8d
- Location:
- src/sas/qtgui/UI
- Files:
-
- 4 edited
-
LinearFitUI.ui (modified) (3 diffs)
-
SetGraphRangeUI.ui (modified) (2 diffs)
-
convert_all.sh (modified) (1 diff)
-
convert_ui.sh (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
src/sas/qtgui/UI/LinearFitUI.ui
r570a58f9 r2e3e959 7 7 <x>0</x> 8 8 <y>0</y> 9 <width>4 13</width>10 <height>32 7</height>9 <width>439</width> 10 <height>324</height> 11 11 </rect> 12 12 </property> 13 13 <property name="sizePolicy"> 14 <sizepolicy hsizetype=" MinimumExpanding" vsizetype="MinimumExpanding">14 <sizepolicy hsizetype="Fixed" vsizetype="Fixed"> 15 15 <horstretch>0</horstretch> 16 16 <verstretch>0</verstretch> … … 28 28 <widget class="QLabel" name="label"> 29 29 <property name="text"> 30 <string><html><head/><body><p>Perform fit for <span style=" font- style:italic;">y(x) = ax + b</span></p></body></html></string>30 <string><html><head/><body><p>Perform fit for <span style=" font-weight:600; font-style:italic;">y(x) = ax + b</span></p></body></html></string> 31 31 </property> 32 32 </widget> 33 33 </item> 34 34 <item row="1" column="0" colspan="2"> 35 <widget class="QGroupBox" name="groupBox_2"> 36 <property name="title"> 37 <string>Fit ranges</string> 38 </property> 39 <layout class="QGridLayout" name="gridLayout_3"> 40 <item row="0" column="0"> 41 <layout class="QGridLayout" name="gridLayout_2"> 42 <item row="0" column="1"> 43 <widget class="QLabel" name="label_9"> 44 <property name="text"> 45 <string>Min</string> 46 </property> 47 </widget> 48 </item> 49 <item row="0" column="2"> 50 <widget class="QLabel" name="label_10"> 51 <property name="text"> 52 <string>Max</string> 53 </property> 54 </widget> 55 </item> 56 <item row="1" column="0"> 57 <widget class="QLabel" name="label_8"> 58 <property name="text"> 59 <string>Range (linear scale)</string> 60 </property> 61 </widget> 62 </item> 63 <item row="1" column="1"> 64 <widget class="QLineEdit" name="txtRangeMin"> 65 <property name="toolTip"> 66 <string><html><head/><body><p>Minimum value on the x-axis for the plotted data.</p></body></html></string> 67 </property> 68 <property name="autoFillBackground"> 69 <bool>true</bool> 70 </property> 71 <property name="readOnly"> 72 <bool>true</bool> 73 </property> 74 </widget> 75 </item> 76 <item row="1" column="2"> 77 <widget class="QLineEdit" name="txtRangeMax"> 78 <property name="toolTip"> 79 <string><html><head/><body><p>Maximum value on the x-axis for the plotted data.</p></body></html></string> 80 </property> 81 <property name="autoFillBackground"> 82 <bool>true</bool> 83 </property> 84 <property name="readOnly"> 85 <bool>true</bool> 86 </property> 87 </widget> 88 </item> 89 <item row="2" column="0"> 90 <widget class="QLabel" name="lblRange"> 91 <property name="text"> 92 <string><html><head/><body><p>Fit range</p></body></html></string> 93 </property> 94 </widget> 95 </item> 96 <item row="2" column="1"> 97 <widget class="QLineEdit" name="txtFitRangeMin"> 98 <property name="toolTip"> 99 <string><html><head/><body><p>Enter the minimum value on the x-axis to be included in the fit.</p></body></html></string> 100 </property> 101 </widget> 102 </item> 103 <item row="2" column="2"> 104 <widget class="QLineEdit" name="txtFitRangeMax"> 105 <property name="toolTip"> 106 <string><html><head/><body><p>Enter the maximum value on the x-axis to be included in the fit.</p></body></html></string> 107 </property> 108 </widget> 109 </item> 110 </layout> 111 </item> 112 </layout> 113 </widget> 114 </item> 115 <item row="2" column="0" colspan="2"> 35 116 <widget class="QGroupBox" name="groupBox"> 36 117 <property name="title"> … … 134 215 </widget> 135 216 </item> 136 <item row="2" column="0" colspan="2">137 <widget class="QGroupBox" name="groupBox_2">138 <property name="title">139 <string>Fit ranges</string>140 </property>141 <layout class="QGridLayout" name="gridLayout_3">142 <item row="0" column="0">143 <layout class="QGridLayout" name="gridLayout_2">144 <item row="0" column="1">145 <widget class="QLabel" name="label_9">146 <property name="text">147 <string>Min</string>148 </property>149 </widget>150 </item>151 <item row="0" column="2">152 <widget class="QLabel" name="label_10">153 <property name="text">154 <string>Max</string>155 </property>156 </widget>157 </item>158 <item row="1" column="0">159 <widget class="QLabel" name="label_8">160 <property name="text">161 <string>Range (linear scale)</string>162 </property>163 </widget>164 </item>165 <item row="1" column="1">166 <widget class="QLineEdit" name="txtRangeMin">167 <property name="toolTip">168 <string><html><head/><body><p>Minimum value on the x-axis for the plotted data.</p></body></html></string>169 </property>170 <property name="readOnly">171 <bool>true</bool>172 </property>173 </widget>174 </item>175 <item row="1" column="2">176 <widget class="QLineEdit" name="txtRangeMax">177 <property name="toolTip">178 <string><html><head/><body><p>Maximum value on the x-axis for the plotted data.</p></body></html></string>179 </property>180 <property name="readOnly">181 <bool>true</bool>182 </property>183 </widget>184 </item>185 <item row="2" column="0">186 <widget class="QLabel" name="lblRange">187 <property name="text">188 <string><html><head/><body><p>Fit range</p></body></html></string>189 </property>190 </widget>191 </item>192 <item row="2" column="1">193 <widget class="QLineEdit" name="txtFitRangeMin">194 <property name="toolTip">195 <string><html><head/><body><p>Enter the minimum value on the x-axis to be included in the fit.</p></body></html></string>196 </property>197 </widget>198 </item>199 <item row="2" column="2">200 <widget class="QLineEdit" name="txtFitRangeMax">201 <property name="toolTip">202 <string><html><head/><body><p>Enter the maximum value on the x-axis to be included in the fit.</p></body></html></string>203 </property>204 </widget>205 </item>206 </layout>207 </item>208 </layout>209 </widget>210 </item>211 217 <item row="3" column="0" colspan="2"> 212 218 <widget class="QLabel" name="label_2"> 213 219 <property name="text"> 214 <string><html><head/><body><p><span style=" color:# ff0000;">WARNING! Resolution is NOT accounted for.<br/>Thus slit smeared data will give very wrong answers!</span></p></body></html></string>220 <string><html><head/><body><p><span style=" color:#000000;">Resolution is NOT accounted for.<br/>Slit smeared data will give very wrong answers!</span></p></body></html></string> 215 221 </property> 216 222 </widget> -
src/sas/qtgui/UI/SetGraphRangeUI.ui
rd3ca363 r2e3e959 19 19 <property name="windowTitle"> 20 20 <string>Set Graph Range</string> 21 </property> 22 <property name="windowIcon"> 23 <iconset resource="main_resources.qrc"> 24 <normaloff>:/res/ball.ico</normaloff>:/res/ball.ico</iconset> 21 25 </property> 22 26 <property name="modal"> … … 93 97 </layout> 94 98 </widget> 95 <resources/> 99 <resources> 100 <include location="main_resources.qrc"/> 101 </resources> 96 102 <connections> 97 103 <connection> -
src/sas/qtgui/UI/convert_all.sh
r9290b1a r2e3e959 1 1 # UI -> PY 2 2 for filename in *.ui; do 3 pyuic .bat$filename > "`basename "$filename" .ui`.py"3 pyuic4 $filename > "`basename "$filename" .ui`.py" 4 4 done 5 5 -
src/sas/qtgui/UI/convert_ui.sh
rf51ed67 r2e3e959 1 pyuic .bat$1.ui > $1.py1 pyuic4 $1.ui > $1.py
Note: See TracChangeset
for help on using the changeset viewer.
