CDPP / AMDA_IHM

Merged
Merge Request #55 · created by Erdogan Furkan

Fer 8455

From FER_8455 into develop

Merged by Erdogan Furkan

1 participants

20 Dec, 2022

1 commit

25 Nov, 2022

1 commit

Showing 2 changed files   Show diff stats
Inline Side-by-side
generic_data/Functions/functions.xml
  Diff comments   Edit  View file @07e4ac1
... ... @@ -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   Edit  View file @07e4ac1
... ... @@ -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;
... ...