CDPP / AMDA_IHM

Commit 8841d4a04af4e81b1f6e9c4910910bbe00bb809e

Authored by Benjamin Renard
2 parents 2843351a 795ce270
Exists in master and in 32 other branches FER_10435, 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_6951, FER_7618, FER_7862, FER_9629, FER_CR41, FER_CR42, FER_CR43, FER_TFCat, Histo1D2D, MAZ_11362, MAZ_11427, MAZ_9016_New, MAZ_FIX_9016, SpeasyGet, amdadev, amdadev_test, develop, openam

Merge branch 'amdadev' into MAZ_9016_New

Showing 2 changed files with 12 additions and 8 deletions   Show diff stats
Inline Side-by-side
generic_data/Functions/functions.xml
  Diff comments   View file @8841d4a
@@ -7,13 +7,6 @@ @@ -7,13 +7,6 @@
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>  
17 <function name="median_(,)" args="1" kind="time" group="stat"> 10 <function name="median_(,)" args="1" kind="time" group="stat">
18 <prompts> 11 <prompts>
19 <prompt>input averaging time in secs</prompt> 12 <prompt>input averaging time in secs</prompt>
@@ -290,7 +283,14 @@ @@ -290,7 +283,14 @@
290 <info_brief>Magnitude</info_brief> 283 <info_brief>Magnitude</info_brief>
291 <new_kernel>magnitude</new_kernel> 284 <new_kernel>magnitude</new_kernel>
292 </function> 285 </function>
293 - 286 + <function name="planarity(,,,)" args="4" kind="tetrahedron" group="math">
  287 + <info_brief>Planarity calculation from tetrahedron</info_brief>
  288 + <new_kernel>planarity</new_kernel>
  289 + </function>
  290 + <function name="elongation(,,,)" args="4" kind="tetrahedron" group="math">
  291 + <info_brief>Elongation calculation from tetrahedron</info_brief>
  292 + <new_kernel>elongation</new_kernel>
  293 + </function>
294 <function name="abs()" kind="math" group="math"> 294 <function name="abs()" kind="math" group="math">
295 <info_brief>Absolute value</info_brief> 295 <info_brief>Absolute value</info_brief>
296 <new_kernel>abs</new_kernel> 296 <new_kernel>abs</new_kernel>
js/app/views/CalculatorUI.js
  Diff comments   View file @8841d4a
@@ -584,6 +584,7 @@ Ext.define(&#39;amdaUI.CalculatorUI&#39;, { @@ -584,6 +584,7 @@ Ext.define(&#39;amdaUI.CalculatorUI&#39;, {
584 amdaUI.CalculatorUI.functionStore.filter('group', 'math'); 584 amdaUI.CalculatorUI.functionStore.filter('group', 'math');
585 this.createFunctionBtns('MathFunctions', 'Simple Maths','#calc_tab_math_id'); 585 this.createFunctionBtns('MathFunctions', 'Simple Maths','#calc_tab_math_id');
586 this.createFunctionBtns('VectorFunctions', 'Vector Functions', '#calc_tab_math_id'); 586 this.createFunctionBtns('VectorFunctions', 'Vector Functions', '#calc_tab_math_id');
  587 + this.createFunctionBtns('Tetrahedron', 'Tetrahedron', '#calc_tab_math_id');
587 amdaUI.CalculatorUI.functionStore.clearFilter(); 588 amdaUI.CalculatorUI.functionStore.clearFilter();
588 589
589 // group space 590 // group space
@@ -690,6 +691,9 @@ Ext.define(&#39;amdaUI.CalculatorUI&#39;, { @@ -690,6 +691,9 @@ Ext.define(&#39;amdaUI.CalculatorUI&#39;, {
690 case 'VectorFunctions' : 691 case 'VectorFunctions' :
691 amdaUI.CalculatorUI.functionStore.filter('kind', 'vector'); 692 amdaUI.CalculatorUI.functionStore.filter('kind', 'vector');
692 break; 693 break;
  694 + case 'Tetrahedron' :
  695 + amdaUI.CalculatorUI.functionStore.filter('kind', 'tetrahedron');
  696 + break;
693 case 'ModelFunctions' : 697 case 'ModelFunctions' :
694 amdaUI.CalculatorUI.functionStore.filter('kind', 'model'); 698 amdaUI.CalculatorUI.functionStore.filter('kind', 'model');
695 width = .45; 699 width = .45;