Skip to content

Commit 20fc40c

Browse files
committed
Added colorscale test
1 parent 0de0349 commit 20fc40c

File tree

2 files changed

+36
-13
lines changed

2 files changed

+36
-13
lines changed

plotly/tests/test_optional/test_opt_tracefactory.py

Lines changed: 28 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -194,17 +194,19 @@ def test_dendrogram_random_matrix(self):
194194
def test_dendrogram_orientation(self):
195195
X = np.random.rand(5, 5)
196196

197-
dendro_left = tls.FigureFactory.create_dendrogram(X, orientation='left')
198-
197+
dendro_left = tls.FigureFactory.create_dendrogram(
198+
X, orientation='left')
199199
self.assertEqual(len(dendro_left['layout']['yaxis']['ticktext']), 5)
200200
tickvals_left = np.array(dendro_left['layout']['yaxis']['tickvals'])
201201
self.assertTrue((tickvals_left <= 0).all())
202202

203-
dendro_right = tls.FigureFactory.create_dendrogram(X, orientation='right')
203+
dendro_right = tls.FigureFactory.create_dendrogram(
204+
X, orientation='right')
204205
tickvals_right = np.array(dendro_right['layout']['yaxis']['tickvals'])
205206
self.assertTrue((tickvals_right >= 0).all())
206207

207-
dendro_bottom = tls.FigureFactory.create_dendrogram(X, orientation='bottom')
208+
dendro_bottom = tls.FigureFactory.create_dendrogram(
209+
X, orientation='bottom')
208210
self.assertEqual(len(dendro_bottom['layout']['xaxis']['ticktext']), 5)
209211
tickvals_bottom = np.array(dendro_bottom['layout']['xaxis']['tickvals'])
210212
self.assertTrue((tickvals_bottom >= 0).all())
@@ -213,4 +215,25 @@ def test_dendrogram_orientation(self):
213215
tickvals_top = np.array(dendro_top['layout']['xaxis']['tickvals'])
214216
self.assertTrue((tickvals_top <= 0).all())
215217

216-
218+
def test_dendrogram_orientation(self):
219+
X = np.array([[1, 2, 3, 4],
220+
[1, 1, 3, 4],
221+
[1, 2, 1, 4],
222+
[1, 2, 3, 1]])
223+
greyscale = [
224+
'rgb(0,0,0)', # black
225+
'rgb(05,105,105)', # dim grey
226+
'rgb(128,128,128)', # grey
227+
'rgb(169,169,169)', # dark grey
228+
'rgb(192,192,192)', # silver
229+
'rgb(211,211,211)', # light grey
230+
'rgb(220,220,220)', # gainsboro
231+
'rgb(245,245,245)'] # white smoke
232+
233+
dendro = tls.FigureFactory.create_dendrogram(X, colorscale=greyscale)
234+
self.assertEqual(dendro["data"][0]['marker']['color'],
235+
'rgb(128,128,128)')
236+
self.assertEqual(dendro["data"][1]['marker']['color'],
237+
'rgb(128,128,128)')
238+
self.assertEqual(dendro["data"][2]['marker']['color'],
239+
'rgb(0,0,0)')

plotly/tools.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3012,14 +3012,14 @@ def get_color_dict(self, colorscale):
30123012

30133013
if colorscale is None:
30143014
colorscale = [
3015-
"rgb(0,116,217)", # blue
3016-
"rgb(35,205,205)", # cyan
3017-
"rgb(61,153,112)", # green
3018-
"rgb(40,35,35)", # black
3019-
"rgb(133,20,75)", # magenta
3020-
"rgb(255,65,54)", # red
3021-
"rgb(255,255,255)", # white
3022-
"rgb(255,220,0)"] # yellow
3015+
'rgb(0,116,217)', # blue
3016+
'rgb(35,205,205)', # cyan
3017+
'rgb(61,153,112)', # green
3018+
'rgb(40,35,35)', # black
3019+
'rgb(133,20,75)', # magenta
3020+
'rgb(255,65,54)', # red
3021+
'rgb(255,255,255)', # white
3022+
'rgb(255,220,0)'] # yellow
30233023

30243024
for i in range(len(default_colors.keys())):
30253025
k = default_colors.keys()[i]

0 commit comments

Comments
 (0)