Skip to content

Commit

Permalink
Merge pull request #577 from vasole/clarify
Browse files Browse the repository at this point in the history
Make clear PyMca does not depend on PyQtGraph.
  • Loading branch information
vasole committed Aug 26, 2019
2 parents 4aeaeeb + a807d3c commit 418ab0a
Show file tree
Hide file tree
Showing 5 changed files with 4 additions and 943 deletions.
5 changes: 0 additions & 5 deletions PyMca5/PyMcaGraph/Plot.py
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,6 @@
_COLORDICT['darkYellow'],
_COLORDICT['darkBrown']]

#PyQtGraph symbols ['o', 's', 't', 'd', '+', 'x']
#
#Matplotlib symbols:
#"." point
Expand Down Expand Up @@ -137,8 +136,6 @@ def __init__(self, parent=None, backend=None, callback=None):
from .backends.MatplotlibBackend import MatplotlibBackend as be
elif lowerCaseString in ["gl", "opengl"]:
from .backends.OpenGLBackend import OpenGLBackend as be
elif lowerCaseString in ["pyqtgraph"]:
from .backends.PyQtGraphBackend import PyQtGraphBackend as be
elif lowerCaseString in ["glut"]:
from .backends.GLUTOpenGLBackend import GLUTOpenGLBackend as be
elif lowerCaseString in ["osmesa", "mesa"]:
Expand Down Expand Up @@ -873,8 +870,6 @@ def setActiveCurve(self, legend, replot=True):
if self._activeCurve == oldActiveCurve:
# the labels may need to be updated!!!!
return self._activeCurve
# this was giving troubles in the PyQtGraph binding
#if self._activeCurve != oldActiveCurve:
self._plot.setActiveCurve(self._activeCurve, replot=replot)
return self._activeCurve

Expand Down
Loading

0 comments on commit 418ab0a

Please sign in to comment.