New upstream version 0.14.0+dfsg

1 files changed, 7 insertions, 7 deletions

diff --git a/silx/gui/plot/backends/glutils/GLPlotTriangles.py b/silx/gui/plot/backends/glutils/GLPlotTriangles.py
index 7aeb5ab..d5ba1a6 100644
--- a/silx/gui/plot/backends/glutils/GLPlotTriangles.py
+++ b/silx/gui/plot/backends/glutils/GLPlotTriangles.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 # /*##########################################################################
 #
-# Copyright (c) 2019 European Synchrotron Radiation Facility
+# Copyright (c) 2019-2020 European Synchrotron Radiation Facility
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -38,9 +38,10 @@ import numpy
 from .....math.combo import min_max
 from .... import _glutils as glutils
 from ...._glutils import gl
+from .GLPlotItem import GLPlotItem
 
 
-class GLPlotTriangles(object):
+class GLPlotTriangles(GLPlotItem):
     """Handle rendering of a set of colored triangles"""
 
     _PROGRAM = glutils.Program(
@@ -81,6 +82,7 @@ class GLPlotTriangles(object):
         :param numpy.ndarray triangles: (N, 3) array of indices of triangles
         :param float alpha: Opacity in [0, 1]
         """
+        super().__init__()
         # Check and convert input data
         x = numpy.ravel(numpy.array(x, dtype=numpy.float32))
         y = numpy.ravel(numpy.array(y, dtype=numpy.float32))
@@ -161,12 +163,10 @@ class GLPlotTriangles(object):
                 usage=gl.GL_STATIC_DRAW,
                 target=gl.GL_ELEMENT_ARRAY_BUFFER)
 
-    def render(self, matrix, isXLog, isYLog):
+    def render(self, context):
         """Perform rendering
 
-        :param numpy.ndarray matrix: 4x4 transform matrix to use
-        :param bool isXLog:
-        :param bool isYLog:
+        :param RenderContext context: Rendering information
         """
         self.prepare()
 
@@ -178,7 +178,7 @@ class GLPlotTriangles(object):
         gl.glUniformMatrix4fv(self._PROGRAM.uniforms['matrix'],
                               1,
                               gl.GL_TRUE,
-                              matrix.astype(numpy.float32))
+                              context.matrix.astype(numpy.float32))
 
         gl.glUniform1f(self._PROGRAM.uniforms['alpha'], self.__alpha)