Commit ae2e30bdd83b9ce92fbb41c922d13e5cb19663a2
1 parent
f5ed8bb2
Exists in
master
and in
40 other branches
For now
Showing
2 changed files
with
15 additions
and
0 deletions
Show diff stats
generic_data/Functions/functions.xml
@@ -7,6 +7,13 @@ | @@ -7,6 +7,13 @@ | ||
7 | <info_brief>average</info_brief> | 7 | <info_brief>average</info_brief> |
8 | <new_kernel>#sampling_classic</new_kernel> | 8 | <new_kernel>#sampling_classic</new_kernel> |
9 | </function> | 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 | <function name="median_(,)" args="1" kind="time" group="stat"> | 17 | <function name="median_(,)" args="1" kind="time" group="stat"> |
11 | <prompts> | 18 | <prompts> |
12 | <prompt>input averaging time in secs</prompt> | 19 | <prompt>input averaging time in secs</prompt> |
js/app/views/ParameterUI.js
@@ -310,6 +310,8 @@ Ext.define('amdaUI.ParameterUI', | @@ -310,6 +310,8 @@ Ext.define('amdaUI.ParameterUI', | ||
310 | (data.records[0].get('nodeType') == 'derivedParam') || | 310 | (data.records[0].get('nodeType') == 'derivedParam') || |
311 | (data.records[0].get('nodeType') == 'specialParam') || | 311 | (data.records[0].get('nodeType') == 'specialParam') || |
312 | (data.records[0].get('nodeType') == 'myDataParam') || | 312 | (data.records[0].get('nodeType') == 'myDataParam') || |
313 | + (data.records[0].get('nodeType') == 'timeTable') || | ||
314 | + (data.records[0].get('nodeType') == 'catalog') | | ||
313 | (data.records[0].get('nodeType') == 'alias')) && | 315 | (data.records[0].get('nodeType') == 'alias')) && |
314 | (data.records[0].isLeaf() || data.records[0].get('isParameter')) && | 316 | (data.records[0].isLeaf() || data.records[0].get('isParameter')) && |
315 | !(data.records[0].data.disable)) { | 317 | !(data.records[0].data.disable)) { |
@@ -359,6 +361,12 @@ Ext.define('amdaUI.ParameterUI', | @@ -359,6 +361,12 @@ Ext.define('amdaUI.ParameterUI', | ||
359 | case 'specialParam': | 361 | case 'specialParam': |
360 | nameToSent = data.records[0].get('id'); | 362 | nameToSent = data.records[0].get('id'); |
361 | break; | 363 | break; |
364 | + case 'timeTable': | ||
365 | + nameToSent = data.records[0].get('text'); | ||
366 | + break; | ||
367 | + case 'catalog': | ||
368 | + nameToSent = data.records[0].get('text'); | ||
369 | + break; | ||
362 | case 'myDataParam': | 370 | case 'myDataParam': |
363 | var name = data.records[0].get('text'); | 371 | var name = data.records[0].get('text'); |
364 | nameToSent = "wsd_" + name; | 372 | nameToSent = "wsd_" + name; |