CDPP / AMDA_IHM

Commit 48bbaed68f83a1490b01d40fb896e1a14b53fda0

Authored by Benjamin Renard
2 parents e7cdc0af 40df211d
Exists in master and in 95 other branches 10098, 10178, 5390, 6629, 6728, 6920, 7494, 7497, 7616, 8459, 8528, 8928, 9014, 9016Bis, 9017, 9049, 9084, 9259, 9326, 9345, 9505, 9660, 9750, 9750.bck, 9800, 9980, FER_10285, FER_10400, FER_10435, FER_10557, FER_10663, FER_10765, FER_10828, FER_10828_2, FER_10829, FER_10836, FER_10852, FER_10934, FER_11100, FER_11242, FER_11478, FER_11500, FER_11537, FER_11586, FER_11588, FER_5119, FER_5165, FER_6265, FER_6860, FER_6899, FER_6951, FER_7618, FER_7862, FER_8455, FER_9629, FER_9660, FER_9915, FER_CR41, FER_CR42, FER_CR43, FER_TFCat, Histo1D2D, MAZ_10936, MAZ_11362, MAZ_11427, MAZ_6018, MAZ_9016_New, MAZ_FIX_9016, New_ColorMaps, SpeasyGet, amdadev, amdadev_test, anr_tempete, create-user, cu2022, density_maps, develop, epn-tap, expression-parser-bre, frames-transformation, hapi, master_vge, mlplasmas, multiplot, new-save-plot-request, openam, remoteData, rm_6912, rm_6912_bis, rm_7926, rm_8932, save-other-requests, special-params, test-merge, ws_get_catalog

Merge branch 'master' into new-save-plot-request

Showing 1 changed file with 4 additions and 0 deletions   Show diff stats
Inline Side-by-side
js/app/models/PlotObjects/PlotObjectConfig.js
  Diff comments   View file @48bbaed
... ... @@ -335,6 +335,10 @@ Ext.define('amdaPlotObj.PlotObjectConfig', {
335 335 {'key' : '2', 'value' : 'Blue Yellow'},
336 336 {'key' : '3', 'value' : 'Grayscale'},
337 337 {'key' : '4', 'value' : 'AMDA Default'},
  338 + {'key' : '5', 'value' : 'GeoWhite'},
  339 + {'key' : '6', 'value' : 'GeoBlack'},
  340 + {'key' : '7', 'value' : 'Violet Yellow'},
  341 + {'key' : '8', 'value' : 'Red Blue 4'}
338 342 ],
339 343  
340 344 availableColors : [
... ...