Skip to content

Commit 82af6da

Browse files
authored
Merge pull request bqplot#198 from dmadeka/MarketMapFix
Add listeners for colors in MarketMap
2 parents 1098b2d + c3f5e1a commit 82af6da

File tree

2 files changed

+17
-193
lines changed

2 files changed

+17
-193
lines changed

examples/Marks/Market Map.ipynb

+11-193
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,17 @@
5757
"display(market_map)"
5858
]
5959
},
60+
{
61+
"cell_type": "code",
62+
"execution_count": null,
63+
"metadata": {
64+
"collapsed": true
65+
},
66+
"outputs": [],
67+
"source": [
68+
"market_map.colors = ['MediumSeaGreen']"
69+
]
70+
},
6071
{
6172
"cell_type": "markdown",
6273
"metadata": {},
@@ -250,199 +261,6 @@
250261
"nbconvert_exporter": "python",
251262
"pygments_lexer": "ipython2",
252263
"version": "2.7.11"
253-
},
254-
"widgets": {
255-
"state": {
256-
"0ac53ba39ba94f61ad65be8d28ea776a": {
257-
"views": []
258-
},
259-
"0d84476fe71c45a79839a916f11164ea": {
260-
"views": []
261-
},
262-
"1a0c431cf2164037997ac637d9fbbc06": {
263-
"views": []
264-
},
265-
"1cc37041c8be44cfbed7a8ee2fda4b5a": {
266-
"views": []
267-
},
268-
"236ecaa091194a5a8d1383c59802d05a": {
269-
"views": []
270-
},
271-
"31a0db058663453c945ca6caeb52512a": {
272-
"views": []
273-
},
274-
"34c3398a38734aca90dec93684d0aa89": {
275-
"views": []
276-
},
277-
"38a4d4b9540841148517dca6641cd14c": {
278-
"views": []
279-
},
280-
"3d02e2d861414d3bba874c518a382f2c": {
281-
"views": []
282-
},
283-
"3eb8c53f2f884e25a138751cef6544c9": {
284-
"views": [
285-
{
286-
"cell_index": 16
287-
}
288-
]
289-
},
290-
"456a185cea6c4d5ab5231bb63301c075": {
291-
"views": []
292-
},
293-
"47a548a15e52482180c4c86759acb08c": {
294-
"views": []
295-
},
296-
"4aa0475e802349f19ed02ce2e5f7894f": {
297-
"views": []
298-
},
299-
"4b349f755bdc473faf37234a8ea2882e": {
300-
"views": []
301-
},
302-
"4b541a88114243d5bbd9b3bd5221f5f2": {
303-
"views": [
304-
{
305-
"cell_index": 8
306-
}
307-
]
308-
},
309-
"4f5f0d109b2749cfbe3fdd84c694ca80": {
310-
"views": []
311-
},
312-
"5388af06f74448f4bcec77c663156e08": {
313-
"views": []
314-
},
315-
"556d05b45e9e436cb5430fa56deda5f4": {
316-
"views": []
317-
},
318-
"564326a3f98b4d3da48dedf67565e939": {
319-
"views": []
320-
},
321-
"5ba7d038867f4024af6787c946b6ff4d": {
322-
"views": []
323-
},
324-
"5d49221086f2490aa2b9379794ff793e": {
325-
"views": []
326-
},
327-
"67068e4d8c974626a8cc0eeee85aee44": {
328-
"views": []
329-
},
330-
"6b5364e9b8ea4041b35a288f3091408b": {
331-
"views": []
332-
},
333-
"730d2538a3b3481bba6b9f4663065c97": {
334-
"views": []
335-
},
336-
"758c842803e64b53b4f26c7fa3065dbd": {
337-
"views": []
338-
},
339-
"871efd5c1576462892ecb526f9ef1576": {
340-
"views": [
341-
{
342-
"cell_index": 8
343-
}
344-
]
345-
},
346-
"894df3e8acc54376a24e32220701fac3": {
347-
"views": []
348-
},
349-
"8fb2212e92534943840826bf97331a7d": {
350-
"views": []
351-
},
352-
"9093ea4426464ab4a91c3d653d83f61a": {
353-
"views": [
354-
{
355-
"cell_index": 8
356-
},
357-
{
358-
"cell_index": 8
359-
}
360-
]
361-
},
362-
"9c9562833bef4eb7b8765778b15c17d1": {
363-
"views": []
364-
},
365-
"9d73767c1d76406f8f7236a424dc408d": {
366-
"views": []
367-
},
368-
"a2e42467ee944c21be424d4ca4db2ef5": {
369-
"views": [
370-
{
371-
"cell_index": 8
372-
},
373-
{
374-
"cell_index": 8
375-
}
376-
]
377-
},
378-
"a7ddeb2af6f94aadb3f82ec95347b348": {
379-
"views": [
380-
{
381-
"cell_index": 4
382-
}
383-
]
384-
},
385-
"ab7c3da3653f485cb96f59c90688c256": {
386-
"views": [
387-
{
388-
"cell_index": 8
389-
},
390-
{
391-
"cell_index": 8
392-
}
393-
]
394-
},
395-
"ab933fe30a73479e80842412bf2089df": {
396-
"views": []
397-
},
398-
"ae07dc4cfea641cb8196dc64ee77c217": {
399-
"views": []
400-
},
401-
"b726b24536014fc09575123dc9ac7c87": {
402-
"views": []
403-
},
404-
"c1845e6ba46b4fa78d758531f74baecf": {
405-
"views": []
406-
},
407-
"c417c3ae6c5a469db68da5d66b25efb3": {
408-
"views": [
409-
{
410-
"cell_index": 8
411-
}
412-
]
413-
},
414-
"c8259e34677743f5bea977c0e47ac52b": {
415-
"views": []
416-
},
417-
"cdf479d25ccd4740ba7d68c133280b93": {
418-
"views": []
419-
},
420-
"cef9cc3a2ea645378b3882b61d6b7b68": {
421-
"views": []
422-
},
423-
"d75ac3ea002f4d58b2be3c5fd846d6a5": {
424-
"views": []
425-
},
426-
"e1223619f4b645d0bb8eb03b9fe29f9b": {
427-
"views": []
428-
},
429-
"e9125ec144fb4199a962c9fbcbf3a605": {
430-
"views": []
431-
},
432-
"ea469f52d1b94883a93a90790de07a5c": {
433-
"views": []
434-
},
435-
"f4f59569c7f8419188141c5d82477475": {
436-
"views": []
437-
},
438-
"f7287e74c30b4d7dab7d046bee089d70": {
439-
"views": []
440-
},
441-
"f967ede07e1d4056b8d91c551565b8fc": {
442-
"views": []
443-
}
444-
},
445-
"version": "2.0.0-dev"
446264
}
447265
},
448266
"nbformat": 4,

js/src/MarketMap.js

+6
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,7 @@ define(["jupyter-js-widgets", "d3", "./Figure", "underscore"],
149149

150150
create_listeners: function() {
151151
this.listenTo(this.model, "change:color", this.recolor_chart, this);
152+
this.listenTo(this.model, "change:colors", this.colors_updated, this);
152153
this.listenTo(this.model, "change:show_groups", this.show_groups, this);
153154
this.listenTo(this.model, "change:selected_stroke", this.update_selected_stroke, this);
154155
this.listenTo(this.model, "change:hovered_stroke", this.update_hovered_stroke, this);
@@ -709,6 +710,11 @@ define(["jupyter-js-widgets", "d3", "./Figure", "underscore"],
709710
}
710711
},
711712

713+
colors_updated: function() {
714+
this.colors = this.model.get("colors");
715+
this.recolor_chart();
716+
},
717+
712718
get_color: function(index, length) {
713719
return this.colors[index % length];
714720
},

0 commit comments

Comments
 (0)