ASCEE/pyqtgraph
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

missed a conflict marker

Browse Source
This commit is contained in:
Nils Nemitz 2021-05-09 22:07:59 +09:00
parent c83f849acf
commit 8124cec3ea
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pyqtgraph/colormap.py
View File

@ -169,11 +169,7 @@ def getFromMatplotlib(name):
col_data[:,-1] = np.linspace(0., 1., 64)
for idx, key in enumerate(['red','green','blue']):
col_data[:,idx] = np.clip( data[key](col_data[:,-1]), 0, 1)
<<<<<<< HEAD
cmap = ColorMap(pos=col_data[:,-1], color=255*col_data[:,:3]+0.5)
=======
cm = ColorMap(pos=col_data[:,-1], color=255*col_data[:,:3]+0.5)
>>>>>>> upstream/master
cmap = ColorMap(pos=col_data[:,-1], color=255*col_data[:,:3]+0.5)
elif hasattr(col_map, 'colors'): # handle ListedColormap
col_data = np.array(col_map.colors)
cmap = ColorMap( name=name,