Index: src/sas/qtgui/GuiManager.py
===================================================================
--- src/sas/qtgui/GuiManager.py (revision 1970780bb41fa72bf4fc9e750008667278c2f7b8)
+++ src/sas/qtgui/GuiManager.py (revision 6c8fb2ce67ed94f8fd44ef74eff5f71b3cd6b6f6)
@@ -30,6 +30,5 @@
# Perspectives
import Perspectives
-#from sas.qtgui.Perspectives.Invariant.InvariantPerspective import InvariantWindow
-#from sas.qtgui.Perspectives.Fitting.FittingPerspective import FittingWindow
+from sas.qtgui.Perspectives.Fitting.FittingPerspective import FittingWindow
from sas.qtgui.DataExplorer import DataExplorerWindow
Index: src/sas/qtgui/Perspectives/Fitting/FittingPerspective.py
===================================================================
--- src/sas/qtgui/Perspectives/Fitting/FittingPerspective.py (revision 454670d9c31222d3fd4e862e5308396fdd3ae7d4)
+++ src/sas/qtgui/Perspectives/Fitting/FittingPerspective.py (revision 6c8fb2ce67ed94f8fd44ef74eff5f71b3cd6b6f6)
@@ -8,4 +8,5 @@
from FittingWidget import FittingWidget
+from FitPage import FitPage
class FittingWindow(QtGui.QTabWidget):
Index: src/sas/qtgui/Perspectives/Fitting/FittingWidget.py
===================================================================
--- src/sas/qtgui/Perspectives/Fitting/FittingWidget.py (revision 1970780bb41fa72bf4fc9e750008667278c2f7b8)
+++ src/sas/qtgui/Perspectives/Fitting/FittingWidget.py (revision 6c8fb2ce67ed94f8fd44ef74eff5f71b3cd6b6f6)
@@ -164,4 +164,10 @@
self.updateQRange()
self.cmdFit.setEnabled(True)
+ self.boxWeighting.setEnabled(True)
+ self.cmdMaskEdit.setEnabled(True)
+ # Switch off txtNpts related controls
+ self.txtNpts.setEnabled(False)
+ self.txtNptsFit.setEnabled(False)
+ self.chkLogData.setEnabled(False)
def acceptsData(self):
@@ -204,4 +210,8 @@
self.onSelectModel()
+ def toggleLogData(self, isChecked):
+ """ Toggles between log and linear data sets """
+ pass
+
def initializeControls(self):
"""
@@ -210,4 +220,5 @@
self.cmdFit.setEnabled(False)
self.cmdPlot.setEnabled(True)
+ self.cmdComputePoints.setVisible(False) # probably redundant
self.chkPolydispersity.setEnabled(True)
self.chkPolydispersity.setCheckState(False)
@@ -220,4 +231,7 @@
self.tabFitting.setTabEnabled(TAB_MAGNETISM, False)
self.lblChi2Value.setText("---")
+ # group boxes
+ self.boxWeighting.setEnabled(False)
+ self.cmdMaskEdit.setEnabled(False)
def initializeSignals(self):
@@ -229,15 +243,21 @@
self.cbCategory.currentIndexChanged.connect(self.onSelectCategory)
self.cbModel.currentIndexChanged.connect(self.onSelectModel)
+ self.cbSmearing.currentIndexChanged.connect(self.onSelectSmearing)
# Checkboxes
self.chk2DView.toggled.connect(self.toggle2D)
self.chkPolydispersity.toggled.connect(self.togglePoly)
self.chkMagnetism.toggled.connect(self.toggleMagnetism)
+ self.chkLogData.toggled.connect(self.toggleLogData)
# Buttons
self.cmdFit.clicked.connect(self.onFit)
self.cmdPlot.clicked.connect(self.onPlot)
+ self.cmdMaskEdit.clicked.connect(self.onMaskEdit)
+ self.cmdReset.clicked.connect(self.onReset)
# Line edits
self.txtNpts.editingFinished.connect(self.onNpts)
self.txtMinRange.editingFinished.connect(self.onMinRange)
self.txtMaxRange.editingFinished.connect(self.onMaxRange)
+ self.txtSmearUp.editingFinished.connect(self.onSmearUp)
+ self.txtSmearDown.editingFinished.connect(self.onSmearDown)
# Respond to change in parameters from the UI
@@ -315,4 +335,22 @@
# Populate the models combobox
self.cbModel.addItems(sorted([model for (model, _) in model_list]))
+
+ def onSelectSmearing(self):
+ """
+ Select Smearing type from list
+ """
+ pass
+
+ def onSmearUp(self):
+ """
+ Update state based on entered smear value
+ """
+ pass
+
+ def onSmearDown(self):
+ """
+ Update state based on entered smear value
+ """
+ pass
def onPolyModelChange(self, item):
@@ -549,5 +587,5 @@
return
# set Q range labels on the main tab
- self.lblMinRangeDef.setText(str(self.q_range_min))
+ #self.lblMinRangeDef.setText(str(self.q_range_min))
if self.model_is_loaded:
self.onPlot()
@@ -567,4 +605,16 @@
self.onPlot()
+ def onMaskEdit(self):
+ """
+ Callback for running the mask editor
+ """
+ pass
+
+ def onReset(self):
+ """
+ Callback for resetting qmin/qmax
+ """
+ pass
+
def setDefaultStructureCombo(self):
"""
@@ -652,4 +702,5 @@
self.txtMinRange.setText(str(self.q_range_min))
self.txtNpts.setText(str(self.npts))
+ self.txtNptsFit.setText(str(self.npts))
def SASModelToQModel(self, model_name, structure_factor=None):
Index: src/sas/qtgui/Perspectives/Fitting/UI/FittingWidgetUI.ui
===================================================================
--- src/sas/qtgui/Perspectives/Fitting/UI/FittingWidgetUI.ui (revision f182f93463e4e6fc08ca96b3539a3dfe42621d26)
+++ src/sas/qtgui/Perspectives/Fitting/UI/FittingWidgetUI.ui (revision 6c8fb2ce67ed94f8fd44ef74eff5f71b3cd6b6f6)
@@ -8,5 +8,5 @@
0
514
- 721
+ 669
@@ -37,4 +37,74 @@
459
+ 20
+
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 75
+ 23
+
+
+
+ Show Plot
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 75
+ 23
+
+
+
+ Fit
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 75
+ 23
+
+
+
+ Help
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 273
20
@@ -346,5 +416,5 @@
-
-
+
Reset
@@ -353,5 +423,5 @@
-
-
+
Mask Editor
@@ -381,5 +451,5 @@
-
-
+
Log spaced points
@@ -408,5 +478,5 @@
-
-
+
Compute
@@ -414,4 +484,17 @@
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
@@ -420,5 +503,5 @@
-
-
+
Weighting
@@ -490,5 +573,5 @@
-
-
+
0
@@ -519,5 +602,5 @@
-
-
+
<html><head/><body><p>dQ<span style=" vertical-align:sub;">low</span></p></body></html>
@@ -526,5 +609,5 @@
-
-
+
-
@@ -537,5 +620,5 @@
-
-
+
<html><head/><body><p>dQ<span style=" vertical-align:sub;">high</span></p></body></html>
@@ -544,5 +627,5 @@
-
-
+
-
@@ -570,5 +653,5 @@
- comboBox_4
+ cbSmearing
horizontalSpacer_2
@@ -651,74 +734,4 @@
- -
-
-
-
- 0
- 0
-
-
-
-
- 75
- 23
-
-
-
- Show Plot
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
-
- 75
- 23
-
-
-
- Fit
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
-
- 75
- 23
-
-
-
- Help
-
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- 273
- 20
-
-
-
-