Changeset 6c8fb2c in sasview for src/sas/qtgui/Perspectives/Fitting/FittingWidget.py
- Timestamp:
- Apr 11, 2017 6:06:56 AM (7 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:
- 83eb5208
- Parents:
- 9687d58
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
src/sas/qtgui/Perspectives/Fitting/FittingWidget.py
r1970780 r6c8fb2c 164 164 self.updateQRange() 165 165 self.cmdFit.setEnabled(True) 166 self.boxWeighting.setEnabled(True) 167 self.cmdMaskEdit.setEnabled(True) 168 # Switch off txtNpts related controls 169 self.txtNpts.setEnabled(False) 170 self.txtNptsFit.setEnabled(False) 171 self.chkLogData.setEnabled(False) 166 172 167 173 def acceptsData(self): … … 204 210 self.onSelectModel() 205 211 212 def toggleLogData(self, isChecked): 213 """ Toggles between log and linear data sets """ 214 pass 215 206 216 def initializeControls(self): 207 217 """ … … 210 220 self.cmdFit.setEnabled(False) 211 221 self.cmdPlot.setEnabled(True) 222 self.cmdComputePoints.setVisible(False) # probably redundant 212 223 self.chkPolydispersity.setEnabled(True) 213 224 self.chkPolydispersity.setCheckState(False) … … 220 231 self.tabFitting.setTabEnabled(TAB_MAGNETISM, False) 221 232 self.lblChi2Value.setText("---") 233 # group boxes 234 self.boxWeighting.setEnabled(False) 235 self.cmdMaskEdit.setEnabled(False) 222 236 223 237 def initializeSignals(self): … … 229 243 self.cbCategory.currentIndexChanged.connect(self.onSelectCategory) 230 244 self.cbModel.currentIndexChanged.connect(self.onSelectModel) 245 self.cbSmearing.currentIndexChanged.connect(self.onSelectSmearing) 231 246 # Checkboxes 232 247 self.chk2DView.toggled.connect(self.toggle2D) 233 248 self.chkPolydispersity.toggled.connect(self.togglePoly) 234 249 self.chkMagnetism.toggled.connect(self.toggleMagnetism) 250 self.chkLogData.toggled.connect(self.toggleLogData) 235 251 # Buttons 236 252 self.cmdFit.clicked.connect(self.onFit) 237 253 self.cmdPlot.clicked.connect(self.onPlot) 254 self.cmdMaskEdit.clicked.connect(self.onMaskEdit) 255 self.cmdReset.clicked.connect(self.onReset) 238 256 # Line edits 239 257 self.txtNpts.editingFinished.connect(self.onNpts) 240 258 self.txtMinRange.editingFinished.connect(self.onMinRange) 241 259 self.txtMaxRange.editingFinished.connect(self.onMaxRange) 260 self.txtSmearUp.editingFinished.connect(self.onSmearUp) 261 self.txtSmearDown.editingFinished.connect(self.onSmearDown) 242 262 243 263 # Respond to change in parameters from the UI … … 315 335 # Populate the models combobox 316 336 self.cbModel.addItems(sorted([model for (model, _) in model_list])) 337 338 def onSelectSmearing(self): 339 """ 340 Select Smearing type from list 341 """ 342 pass 343 344 def onSmearUp(self): 345 """ 346 Update state based on entered smear value 347 """ 348 pass 349 350 def onSmearDown(self): 351 """ 352 Update state based on entered smear value 353 """ 354 pass 317 355 318 356 def onPolyModelChange(self, item): … … 549 587 return 550 588 # set Q range labels on the main tab 551 self.lblMinRangeDef.setText(str(self.q_range_min))589 #self.lblMinRangeDef.setText(str(self.q_range_min)) 552 590 if self.model_is_loaded: 553 591 self.onPlot() … … 567 605 self.onPlot() 568 606 607 def onMaskEdit(self): 608 """ 609 Callback for running the mask editor 610 """ 611 pass 612 613 def onReset(self): 614 """ 615 Callback for resetting qmin/qmax 616 """ 617 pass 618 569 619 def setDefaultStructureCombo(self): 570 620 """ … … 652 702 self.txtMinRange.setText(str(self.q_range_min)) 653 703 self.txtNpts.setText(str(self.npts)) 704 self.txtNptsFit.setText(str(self.npts)) 654 705 655 706 def SASModelToQModel(self, model_name, structure_factor=None):
Note: See TracChangeset
for help on using the changeset viewer.