New upstream version 0.6.0+dfsg

3 files changed, 15 insertions, 9 deletions

diff --git a/silx/gui/fit/BackgroundWidget.py b/silx/gui/fit/BackgroundWidget.py
index 577a8c7..2171e87 100644
--- a/silx/gui/fit/BackgroundWidget.py
+++ b/silx/gui/fit/BackgroundWidget.py
@@ -26,7 +26,11 @@
 # #########################################################################*/
 """This module provides a background configuration widget
 :class:`BackgroundWidget` and a corresponding dialog window
-:class:`BackgroundDialog`."""
+:class:`BackgroundDialog`.
+
+.. image:: img/BackgroundDialog.png
+   :height: 300px
+"""
 import sys
 import numpy
 from silx.gui import qt
@@ -35,7 +39,7 @@ from silx.math.fit import filters
 
 __authors__ = ["V.A. Sole", "P. Knobel"]
 __license__ = "MIT"
-__date__ = "24/01/2017"
+__date__ = "28/06/2017"
 
 
 class HorizontalSpacer(qt.QWidget):
@@ -262,7 +266,7 @@ class BackgroundParamWidget(qt.QWidget):
 
 
 class BackgroundWidget(qt.QWidget):
-    """Background configuration widget, with a :class:`PlotWindow`.
+    """Background configuration widget, with a plot to preview the results.
 
     Strip and snip filters parameters can be adjusted using input widgets,
     and the computed backgrounds are plotted next to the original data to
@@ -400,7 +404,7 @@ class BackgroundWidget(qt.QWidget):
                                   legend='SNIP Background',
                                   resetzoom=False)
         if self._xmin is not None and self._xmax is not None:
-            self.graphWidget.setGraphXLimits(xmin=self._xmin, xmax=self._xmax)
+            self.graphWidget.getXAxis().setLimits(self._xmin, self._xmax)
 
 
 class BackgroundDialog(qt.QDialog):
@@ -467,11 +471,11 @@ class BackgroundDialog(qt.QDialog):
         return self.parametersWidget.getParameters()
 
     def setParameters(self, ddict):
-        """See :meth:`BackgroundWidget.setParameters`"""
+        """See :meth:`BackgroundWidget.setPrintGeometry`"""
         return self.parametersWidget.setParameters(ddict)
 
     def setDefault(self, ddict):
-        """Alias for :meth:`setParameters`"""
+        """Alias for :meth:`setPrintGeometry`"""
         return self.setParameters(ddict)
 
 
diff --git a/silx/gui/fit/FitConfig.py b/silx/gui/fit/FitConfig.py
index 70b6fbe..04e411b 100644
--- a/silx/gui/fit/FitConfig.py
+++ b/silx/gui/fit/FitConfig.py
@@ -307,7 +307,7 @@ class SearchPage(qt.QWidget):
         self.yScalingEntry.setToolTip(
                 "Data values will be multiplied by this value prior to peak" +
                 " search")
-        self.yScalingEntry.setValidator(qt.QDoubleValidator())
+        self.yScalingEntry.setValidator(qt.QDoubleValidator(self))
         layout3.addWidget(self.yScalingEntry)
         # ----------------------------------------------------
 
@@ -324,7 +324,7 @@ class SearchPage(qt.QWidget):
             "Peak search sensitivity threshold, expressed as a multiple " +
             "of the standard deviation of the noise.\nMinimum value is 1 " +
             "(to be detected, peak must be higher than the estimated noise)")
-        sensivalidator = qt.QDoubleValidator()
+        sensivalidator = qt.QDoubleValidator(self)
         sensivalidator.setBottom(1.0)
         self.sensitivityEntry.setValidator(sensivalidator)
         layout4.addWidget(self.sensitivityEntry)
@@ -418,7 +418,7 @@ class BackgroundPage(qt.QGroupBox):
             "Factor used by the strip algorithm to decide whether a sample" +
             "value should be stripped.\nThe value must be higher than the " +
             "average of the 2 samples at +- w times this factor.\n")
-        self.thresholdFactorEntry.setValidator(qt.QDoubleValidator())
+        self.thresholdFactorEntry.setValidator(qt.QDoubleValidator(self))
         layout.addWidget(self.thresholdFactorEntry, 2, 1)
 
         self.smoothStripGB = qt.QGroupBox("Apply smoothing prior to strip", self)
diff --git a/silx/gui/fit/FitWidget.py b/silx/gui/fit/FitWidget.py
index a5c3cfd..7012b63 100644
--- a/silx/gui/fit/FitWidget.py
+++ b/silx/gui/fit/FitWidget.py
@@ -87,6 +87,8 @@ class FitWidget(qt.QWidget):
     run the estimation, set constraints on parameters and run the actual fit.
 
     The results are displayed in a table.
+
+    .. image:: img/FitWidget.png
     """
     sigFitWidgetSignal = qt.Signal(object)
     """This signal is emitted by the estimation and fit methods.