CDPP / AMDA_IHM

Commit 9077f5d3da3cdbe9159b94cbf600dbfb4e29f85d

Authored by Myriam Bouchemit
2 parents c1590d8f c88da604
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, akkodis/amdadev, amdadev, amdadev_test, anr_tempete, create-user, cu2022, density_maps, develop, epn-tap, expression-parser-bre, frames-transformation, hapi, master_vge, mlplasmas, multiplot, openam, remoteData, rm_6912, rm_6912_bis, rm_7926, rm_8932, save-other-requests, special-params, test-merge, ws_get_catalog

Merge branch 'master' of https://gitlab.irap.omp.eu/CDPP/AMDA_IHM

Showing 2 changed files with 4 additions and 3 deletions   Show diff stats
Inline Side-by-side
generic_data/Functions/functions.xml
  Diff comments   View file @9077f5d
... ... @@ -132,9 +132,9 @@
132 132 <info_brief>Arc-tangent</info_brief>
133 133 <new_kernel>atan</new_kernel>
134 134 </function>
135   - <function name="atan2(,)" kind="math">
  135 + <function name="atan2(,)" params="2" kind="math">
136 136 <info_brief>Arc-tangent</info_brief>
137   - <new_kernel>atan_2f</new_kernel>
  137 + <new_kernel>atan2</new_kernel>
138 138 </function>
139 139 <function name="ceil()" kind="math">
140 140 <info_brief>Closest integer greater than or equal to its argument</info_brief>
... ...
js/app/models/PlotObjects/PlotObjectConfig.js
  Diff comments   View file @9077f5d
... ... @@ -333,7 +333,8 @@ Ext.define(&#39;amdaPlotObj.PlotObjectConfig&#39;, {
333 333 {'key' : '0', 'value' : 'Default'},
334 334 {'key' : '1', 'value' : 'Blue Red'},
335 335 {'key' : '2', 'value' : 'Blue Yellow'},
336   - {'key' : '3', 'value' : 'Grayscale'}
  336 + {'key' : '3', 'value' : 'Grayscale'},
  337 + {'key' : '4', 'value' : 'AMDA Default'},
337 338 ],
338 339  
339 340 availableColors : [
... ...