Commit 74c27538d464174195926f5e4ee914d1c426d5db
1 parent
43c1f2bf
Exists in
master
and in
32 other branches
Add functions to calculate planarity & elongation from tetrahedron
Showing
2 changed files
with
12 additions
and
1 deletions
Show diff stats
generic_data/Functions/functions.xml
... | ... | @@ -283,7 +283,14 @@ |
283 | 283 | <info_brief>Magnitude</info_brief> |
284 | 284 | <new_kernel>magnitude</new_kernel> |
285 | 285 | </function> |
286 | - | |
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> | |
287 | 294 | <function name="abs()" kind="math" group="math"> |
288 | 295 | <info_brief>Absolute value</info_brief> |
289 | 296 | <new_kernel>abs</new_kernel> | ... | ... |
js/app/views/CalculatorUI.js
... | ... | @@ -584,6 +584,7 @@ Ext.define('amdaUI.CalculatorUI', { |
584 | 584 | amdaUI.CalculatorUI.functionStore.filter('group', 'math'); |
585 | 585 | this.createFunctionBtns('MathFunctions', 'Simple Maths','#calc_tab_math_id'); |
586 | 586 | this.createFunctionBtns('VectorFunctions', 'Vector Functions', '#calc_tab_math_id'); |
587 | + this.createFunctionBtns('Tetrahedron', 'Tetrahedron', '#calc_tab_math_id'); | |
587 | 588 | amdaUI.CalculatorUI.functionStore.clearFilter(); |
588 | 589 | |
589 | 590 | // group space |
... | ... | @@ -690,6 +691,9 @@ Ext.define('amdaUI.CalculatorUI', { |
690 | 691 | case 'VectorFunctions' : |
691 | 692 | amdaUI.CalculatorUI.functionStore.filter('kind', 'vector'); |
692 | 693 | break; |
694 | + case 'Tetrahedron' : | |
695 | + amdaUI.CalculatorUI.functionStore.filter('kind', 'tetrahedron'); | |
696 | + break; | |
693 | 697 | case 'ModelFunctions' : |
694 | 698 | amdaUI.CalculatorUI.functionStore.filter('kind', 'model'); |
695 | 699 | width = .45; | ... | ... |