Commit b3bc639c9c22413de9941535664e3c0a8ab08ccc
1 parent
73c866c9
Exists in
master
and in
29 other branches
Add acknowledgements for new colour maps
Showing
2 changed files
with
26 additions
and
1 deletions
Show diff stats
... | ... | @@ -0,0 +1,12 @@ |
1 | +<body> | |
2 | + | |
3 | +<h2>AMDA Colour Maps</h2> | |
4 | + | |
5 | +<p> | |
6 | + Colour Maps 'Acton', 'Bamako', 'Batlow', 'BatlowK', 'BatlowW', 'Bilbao', 'Buda', 'Davos', 'Devon', | |
7 | + 'GrayC', 'Hawaii', 'Imola', 'Lajolla', 'Lapaz', 'Nuuk', 'Oslo', 'Tokyo', 'Turku', 'Bam', 'Berlin', | |
8 | + 'Broc', 'Cork', 'Lisbon', 'Roma', 'Tofino', 'Vanimo', 'vik' comes from: <br/> | |
9 | + Crameri, Fabio. (2021). Scientific colour maps (7.0.1). Zenodo. <a href="https://doi.org/10.5281/zenodo.5501399" target="_blank">https://doi.org/10.5281/zenodo.5501399</a> | |
10 | +</p> | |
11 | + | |
12 | +</body> | |
0 | 13 | \ No newline at end of file |
... | ... |
js/app/views/PlotComponents/PlotColorAxisForm.js
... | ... | @@ -22,7 +22,7 @@ Ext.define('amdaPlotComp.PlotColorAxisForm', { |
22 | 22 | |
23 | 23 | var combo = new Ext.form.ComboBox({ |
24 | 24 | name: 'axis-color-map', |
25 | - fieldLabel: 'Color Map', | |
25 | + fieldLabel: 'Color Map <img amda_clicktip="colourMaps" style="vertical-align:bottom" src="js/resources/images/16x16/info_mini.png"', | |
26 | 26 | store: new Ext.data.Store({ |
27 | 27 | fields: ['key','name', 'iconUrl'], |
28 | 28 | data: data |
... | ... | @@ -51,6 +51,19 @@ Ext.define('amdaPlotComp.PlotColorAxisForm', { |
51 | 51 | |
52 | 52 | this.object.set('axis-color-map', newValue); |
53 | 53 | }, |
54 | + click: { | |
55 | + element: 'el', | |
56 | + fn: function(e,t) { | |
57 | + var me = t, | |
58 | + text = me.getAttribute('amda_clicktip'); | |
59 | + if (text) { | |
60 | + e.preventDefault(); | |
61 | + AmdaAction.getInfo({name : text}, function(res,e) { | |
62 | + if (res.success) myDesktopApp.infoMsg(res.result); | |
63 | + }); | |
64 | + } | |
65 | + } | |
66 | + }, | |
54 | 67 | scope:this |
55 | 68 | }, |
56 | 69 | }); |
... | ... |