CDPP / AMDA_IHM

Commit 7ff3a6d06e3b20f1349adcc9e924694f50884ce1

Authored by Erdogan Furkan
2 parents 8018f104 07e4ac11
Exists in master and in 38 other branches FER_10400, FER_10435, 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_6265, FER_6860, FER_6951, FER_7618, FER_7862, FER_9629, FER_CR41, FER_CR42, FER_CR43, FER_TFCat, Histo1D2D, MAZ_10936, MAZ_11362, MAZ_11427, MAZ_9016_New, MAZ_FIX_9016, SpeasyGet, akkodis/amdadev, amdadev, amdadev_test, density_maps, develop, openam

Merge branch 'FER_8455' into 'develop' 

Fer 8455

See merge request !55
Showing 2 changed files with 23 additions and 0 deletions   Show diff stats
Inline Side-by-side
generic_data/Functions/functions.xml
  Diff comments   View file @7ff3a6d
... ... @@ -7,6 +7,13 @@
7 7 <info_brief>average</info_brief>
8 8 <new_kernel>#sampling_classic</new_kernel>
9 9 </function>
  10 + <function name="isinside_(,)" args="1" kind="time" group="stat">
  11 + <prompts>
  12 + <prompt>ahahah</prompt>
  13 + </prompts>
  14 + <info_brief>average</info_brief>
  15 + <new_kernel>#ttcat_to_param</new_kernel>
  16 + </function>
10 17 <function name="median_(,)" args="1" kind="time" group="stat">
11 18 <prompts>
12 19 <prompt>input averaging time in secs</prompt>
... ...
js/app/views/ParameterUI.js
  Diff comments   View file @7ff3a6d
... ... @@ -310,6 +310,10 @@ Ext.define(&#39;amdaUI.ParameterUI&#39;,
310 310 (data.records[0].get('nodeType') == 'derivedParam') ||
311 311 (data.records[0].get('nodeType') == 'specialParam') ||
312 312 (data.records[0].get('nodeType') == 'myDataParam') ||
  313 + (data.records[0].get('nodeType') == 'timeTable') ||
  314 + (data.records[0].get('nodeType') == 'catalog') ||
  315 + (data.records[0].get('nodeType') == 'sharedtimeTable') ||
  316 + (data.records[0].get('nodeType') == 'sharedcatalog') ||
313 317 (data.records[0].get('nodeType') == 'alias')) &&
314 318 (data.records[0].isLeaf() || data.records[0].get('isParameter')) &&
315 319 !(data.records[0].data.disable)) {
... ... @@ -359,6 +363,18 @@ Ext.define(&#39;amdaUI.ParameterUI&#39;,
359 363 case 'specialParam':
360 364 nameToSent = data.records[0].get('id');
361 365 break;
  366 + case 'timeTable':
  367 + nameToSent = "tt_"+data.records[0].get('text');
  368 + break;
  369 + case 'catalog':
  370 + nameToSent = "cat_"+data.records[0].get('text');
  371 + break;
  372 + case 'sharedtimeTable':
  373 + nameToSent = "sharedtimeTable"+data.records[0].get('text');
  374 + break;
  375 + case 'sharedcatalog':
  376 + nameToSent = "sharedcatalog_"+data.records[0].get('text');
  377 + break;
362 378 case 'myDataParam':
363 379 var name = data.records[0].get('text');
364 380 nameToSent = "wsd_" + name;
... ...