Changeset f07d8ab in sasview
- Timestamp:
- Sep 8, 2018 6:09:29 AM (6 years ago)
- Branches:
- ESS_GUI, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc
- Children:
- c4b23dd
- Parents:
- a2e8ea5 (diff), 7cc38a7 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent. - Files:
-
- 3 edited
-
.gitignore (modified) (1 diff)
-
src/sas/qtgui/Perspectives/Fitting/UI/FittingWidgetUI.ui (modified) (11 diffs)
-
src/sas/qtgui/Perspectives/Fitting/UI/OptionsWidgetUI.ui (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
.gitignore
rce1f491 r7cc38a7 16 16 *.pyproj 17 17 *.sln 18 .*.swp 18 19 .DS_Store 19 20 /.settings -
src/sas/qtgui/Perspectives/Fitting/UI/FittingWidgetUI.ui
r76a0ffc ra2e8ea5 77 77 <number>0</number> 78 78 </property> 79 <property name="iconSize">80 <size>81 <width>16</width>82 <height>16</height>83 </size>84 </property>85 79 <widget class="QWidget" name="tab_3"> 86 80 <attribute name="title"> … … 88 82 </attribute> 89 83 <layout class="QGridLayout" name="gridLayout_4"> 90 <item row="0" column="0" colspan=" 3">84 <item row="0" column="0" colspan="4"> 91 85 <widget class="QGroupBox" name="groupBox_6"> 92 86 <property name="sizePolicy"> … … 164 158 <item row="1" column="0"> 165 159 <widget class="QGroupBox" name="groupBox_7"> 166 <property name="minimumSize">167 <size>168 <width>80</width>169 <height>0</height>170 </size>171 </property>172 <property name="maximumSize">173 <size>174 <width>16777215</width>175 <height>16777215</height>176 </size>177 </property>178 160 <property name="title"> 179 161 <string>Options </string> … … 249 231 <item row="1" column="1"> 250 232 <widget class="QGroupBox" name="groupBox_8"> 251 <property name="minimumSize">252 <size>253 <width>100</width>254 <height>0</height>255 </size>256 </property>257 <property name="maximumSize">258 <size>259 <width>16777215</width>260 <height>16777215</height>261 </size>262 </property>263 233 <property name="title"> 264 234 <string>Fitting details </string> 265 235 </property> 266 236 <layout class="QGridLayout" name="gridLayout_17"> 267 <property name="sizeConstraint">268 <enum>QLayout::SetFixedSize</enum>269 </property>270 237 <item row="0" column="0" colspan="2"> 271 238 <layout class="QGridLayout" name="gridLayout_8"> 272 239 <item row="0" column="0"> 273 240 <widget class="QLabel" name="label_16"> 274 <property name="minimumSize">275 <size>276 <width>25</width>277 <height>0</height>278 </size>279 </property>280 <property name="maximumSize">281 <size>282 <width>16777215</width>283 <height>16777215</height>284 </size>285 </property>286 241 <property name="text"> 287 242 <string>Min range</string> … … 291 246 <item row="0" column="1"> 292 247 <widget class="QLabel" name="lblMinRangeDef"> 293 <property name="minimumSize">294 <size>295 <width>0</width>296 <height>0</height>297 </size>298 </property>299 248 <property name="text"> 300 249 <string>0.005</string> … … 304 253 <item row="0" column="2"> 305 254 <widget class="QLabel" name="label_17"> 306 <property name="minimumSize">307 <size>308 <width>0</width>309 <height>0</height>310 </size>311 </property>312 255 <property name="text"> 313 256 <string><html><head/><body><p>Ã … … 318 261 <item row="1" column="0"> 319 262 <widget class="QLabel" name="label_18"> 320 <property name="minimumSize">321 <size>322 <width>25</width>323 <height>0</height>324 </size>325 </property>326 <property name="maximumSize">327 <size>328 <width>16777215</width>329 <height>16777215</height>330 </size>331 </property>332 263 <property name="text"> 333 264 <string>Max range</string> … … 337 268 <item row="1" column="1"> 338 269 <widget class="QLabel" name="lblMaxRangeDef"> 339 <property name="minimumSize">340 <size>341 <width>0</width>342 <height>0</height>343 </size>344 </property>345 270 <property name="text"> 346 271 <string>0.1</string> … … 350 275 <item row="1" column="2"> 351 276 <widget class="QLabel" name="label_19"> 352 <property name="minimumSize">353 <size>354 <width>0</width>355 <height>0</height>356 </size>357 </property>358 277 <property name="text"> 359 278 <string><html><head/><body><p>Ã … … 382 301 </item> 383 302 <item row="1" column="2"> 303 <spacer name="horizontalSpacer_3"> 304 <property name="orientation"> 305 <enum>Qt::Horizontal</enum> 306 </property> 307 <property name="sizeHint" stdset="0"> 308 <size> 309 <width>207</width> 310 <height>20</height> 311 </size> 312 </property> 313 </spacer> 314 </item> 315 <item row="1" column="3"> 384 316 <widget class="QGroupBox" name="groupBox_9"> 385 <property name="minimumSize">386 <size>387 <width>80</width>388 <height>0</height>389 </size>390 </property>391 <property name="maximumSize">392 <size>393 <width>16777215</width>394 <height>16777215</height>395 </size>396 </property>397 317 <property name="toolTip"> 398 318 <string><html><head/><body><p>Ï<span style=" vertical-align:super;">2</span>/DOF (DOF=N<span style=" vertical-align:sub;">pts</span>-N<span style=" vertical-align:sub;">par</span> fitted)</p></body></html></string> … … 413 333 <item> 414 334 <widget class="QLabel" name="lblChi2Value"> 415 <property name="minimumSize">416 <size>417 <width>50</width>418 <height>0</height>419 </size>420 </property>421 335 <property name="text"> 422 336 <string><html><head/><body><p><span style=" font-weight:600;">0.01625</span></p></body></html></string> -
src/sas/qtgui/Perspectives/Fitting/UI/OptionsWidgetUI.ui
r76a0ffc ra2e8ea5 32 32 <item row="0" column="1"> 33 33 <widget class="QLineEdit" name="txtMinRange"> 34 <property name="minimumSize">35 <size>36 <width>5</width>37 <height>0</height>38 </size>39 </property>40 34 <property name="toolTip"> 41 35 <string><html><head/><body><p>Minimum value of Q.</p></body></html></string> … … 82 76 <property name="sizeHint" stdset="0"> 83 77 <size> 84 <width> 40</width>78 <width>217</width> 85 79 <height>20</height> 86 80 </size>
Note: See TracChangeset
for help on using the changeset viewer.
