diff options
| author | Alexandre Marie <alexandre.marie@synchrotron-soleil.fr> | 2018-12-17 12:28:24 +0100 |
|---|---|---|
| committer | Alexandre Marie <alexandre.marie@synchrotron-soleil.fr> | 2018-12-17 12:28:24 +0100 |
| commit | cebdc9244c019224846cb8d2668080fe386a6adc (patch) | |
| tree | aedec55da0f9dd4fc4d6c7eb0f58489a956e2e8c /silx/gui/plot/ColorBar.py | |
| parent | 159ef14fb9e198bb0066ea14e6b980f065de63dd (diff) | |
New upstream version 0.9.0+dfsg
Diffstat (limited to 'silx/gui/plot/ColorBar.py')
| -rw-r--r-- | silx/gui/plot/ColorBar.py | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/silx/gui/plot/ColorBar.py b/silx/gui/plot/ColorBar.py index 0941e82..fd4d34e 100644 --- a/silx/gui/plot/ColorBar.py +++ b/silx/gui/plot/ColorBar.py @@ -155,19 +155,17 @@ class ColorBarWidget(qt.QWidget): self._disconnectPlot() def getColormap(self): - """ - - :return: the :class:`.Colormap` colormap displayed in the colorbar. + """Returns the colormap displayed in the colorbar. + :rtype: ~silx.gui.colors.Colormap """ return self.getColorScaleBar().getColormap() def setColormap(self, colormap, data=None): """Set the colormap to be displayed. - :param colormap: The colormap to apply on the - ColorBarWidget - :type colormap: :class:`.Colormap` + :param ~silx.gui.colors.Colormap colormap: + The colormap to apply on the ColorBarWidget :param numpy.ndarray data: the data to display, needed if the colormap require an autoscale """ @@ -207,7 +205,7 @@ class ColorBarWidget(qt.QWidget): :return: return the legend displayed along the colorbar :rtype: str """ - return self.legend.getText() + return self.legend.text() def _activeScatterChanged(self, previous, legend): """Handle plot active scatter changed""" |