diff options
Diffstat (limited to 'silx/gui/plot/backends/BackendMatplotlib.py')
-rw-r--r-- | silx/gui/plot/backends/BackendMatplotlib.py | 28 |
1 files changed, 18 insertions, 10 deletions
diff --git a/silx/gui/plot/backends/BackendMatplotlib.py b/silx/gui/plot/backends/BackendMatplotlib.py index 49c4540..3b1d6dd 100644 --- a/silx/gui/plot/backends/BackendMatplotlib.py +++ b/silx/gui/plot/backends/BackendMatplotlib.py @@ -28,7 +28,7 @@ from __future__ import division __authors__ = ["V.A. Sole", "T. Vincent, H. Payno"] __license__ = "MIT" -__date__ = "18/10/2017" +__date__ = "01/08/2018" import logging @@ -56,8 +56,7 @@ from matplotlib.collections import PathCollection, LineCollection from matplotlib.ticker import Formatter, ScalarFormatter, Locator - -from ..matplotlib.ModestImage import ModestImage +from ....third_party.modest_image import ModestImage from . import BackendBase from .._utils import FLOAT32_MINPOS from .._utils.dtime_ticklayout import calcTicks, bestFormatString, timestamp @@ -520,7 +519,7 @@ class BackendMatplotlib(BackendBase.BackendBase): def addMarker(self, x, y, legend, text, color, selectable, draggable, - symbol, constraint): + symbol, linestyle, linewidth, constraint): legend = "__MARKER__" + legend textArtist = None @@ -548,7 +547,11 @@ class BackendMatplotlib(BackendBase.BackendBase): verticalalignment=valign) elif x is not None: - line = self.ax.axvline(x, label=legend, color=color) + line = self.ax.axvline(x, + label=legend, + color=color, + linewidth=linewidth, + linestyle=linestyle) if text is not None: # Y position will be updated in updateMarkerText call textArtist = self.ax.text(x, 1., " " + text, @@ -557,7 +560,11 @@ class BackendMatplotlib(BackendBase.BackendBase): verticalalignment='top') elif y is not None: - line = self.ax.axhline(y, label=legend, color=color) + line = self.ax.axhline(y, + label=legend, + color=color, + linewidth=linewidth, + linestyle=linestyle) if text is not None: # X position will be updated in updateMarkerText call @@ -1117,7 +1124,6 @@ class BackendMatplotlibQt(FigureCanvasQTAgg, BackendMatplotlib): # cursor _QT_CURSORS = { - None: qt.Qt.ArrowCursor, BackendBase.CURSOR_DEFAULT: qt.Qt.ArrowCursor, BackendBase.CURSOR_POINTING: qt.Qt.PointingHandCursor, BackendBase.CURSOR_SIZE_HOR: qt.Qt.SizeHorCursor, @@ -1126,6 +1132,8 @@ class BackendMatplotlibQt(FigureCanvasQTAgg, BackendMatplotlib): } def setGraphCursorShape(self, cursor): - cursor = self._QT_CURSORS[cursor] - - FigureCanvasQTAgg.setCursor(self, qt.QCursor(cursor)) + if cursor is None: + FigureCanvasQTAgg.unsetCursor(self) + else: + cursor = self._QT_CURSORS[cursor] + FigureCanvasQTAgg.setCursor(self, qt.QCursor(cursor)) |