Commit 49d32f0a authored by Thomas Vincent's avatar Thomas Vincent
Browse files

Update avoid addItem->addShape renaming deprecation warning

parent b30abfe8
...@@ -28,6 +28,7 @@ from collections import OrderedDict, namedtuple ...@@ -28,6 +28,7 @@ from collections import OrderedDict, namedtuple
import numpy as np import numpy as np
from silx.gui import qt, icons from silx.gui import qt, icons
from silx import hexversion as silx_hexversion
__author__ = ["D. Naudet"] __author__ = ["D. Naudet"]
__license__ = "MIT" __license__ = "MIT"
...@@ -238,12 +239,16 @@ class RoiItemBase(qt.QObject): ...@@ -238,12 +239,16 @@ class RoiItemBase(qt.QObject):
assert item == handle assert item == handle
def _drawShape(self): def _drawShape(self):
item = self._plot.addItem(self.xData, if silx_hexversion >= 0xd00d2: # silx >= v0.13.0b2
self.yData, addShape = self._plot.addShape
shape=self.shape, else: # Backward compatibility silx <=0.12.0
legend=self._name, addShape = self._plot.addItem
overlay=True, item = addShape(self.xData,
color='pink') self.yData,
shape=self.shape,
legend=self._name,
overlay=True,
color='pink')
assert item == self._name assert item == self._name
def _setHandleData(self, name, point): def _setHandleData(self, name, point):
......
...@@ -34,6 +34,7 @@ import os ...@@ -34,6 +34,7 @@ import os
import numpy as np import numpy as np
from silx import hexversion as silx_hexversion
from silx.utils.weakref import WeakMethodProxy from silx.utils.weakref import WeakMethodProxy
from silx.gui import qt as Qt from silx.gui import qt as Qt
from silx.gui.plot import actions, items, PlotToolButtons, PlotWidget from silx.gui.plot import actions, items, PlotToolButtons, PlotWidget
...@@ -688,7 +689,11 @@ class QSpaceView(Qt.QMainWindow): ...@@ -688,7 +689,11 @@ class QSpaceView(Qt.QMainWindow):
xRange = roiSliders[xIndex].getValues() xRange = roiSliders[xIndex].getValues()
yRange = roiSliders[yIndex].getValues() yRange = roiSliders[yIndex].getValues()
self.__stackView.addItem( if silx_hexversion >= 0xd00d2: # silx >= v0.13.0b2
addShape = self.__stackView.addShape
else: # Backward compatibility silx <=0.12.0
addShape = self.__stackView.addItem
addShape(
xRange, yRange, xRange, yRange,
legend="__QSpaceView_ROI__", legend="__QSpaceView_ROI__",
shape='rectangle', shape='rectangle',
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment