Give the possibility to have more than one 'prompted argument' for a function in…

… CalculatorUI + Add selection list for frame selection (#8540 & #5110)

Give the possibility to have more than one 'prompted argument' for a function in…
… CalculatorUI + Add selection list for frame selection (#8540 & #5110)
Benjamin Renard
1 parent 55b10506
Showing 4 changed files with 309 additions and 27 deletions Show diff stats
generic_data/Functions/functions.xml
generic_data/Functions/functions_args_list.xml
js/app/models/Function.js
js/app/views/CalculatorUI.js
 <?xml version="1.0"?>
 <functions xml:id="functions">
     <function name="mean_(,)" args="1" kind="time" group="stat">
-        <prompt>input averaging time in secs</prompt>
+	<prompts>
+        	<prompt>input averaging time in secs</prompt>
+	</prompts>
         <info_brief>average</info_brief>
         <new_kernel>#sampling_classic</new_kernel>
     </function> 
     <function name="median_(,)" args="1" kind="time" group="stat">
-        <prompt>input averaging time in secs</prompt>
+	<prompts>
+        	<prompt>input averaging time in secs</prompt>
+	</prompts>
         <info_brief>median average</info_brief>
         <new_kernel>#median</new_kernel>
     </function>
     <function name="rms_(,)" args="1" kind="time" group="stat">
-        <prompt>input averaging time in secs</prompt>
+	<prompts>
+        	<prompt>input averaging time in secs</prompt>
+	</prompts>
         <info_brief>root mean square</info_brief>
         <new_kernel>#rms</new_kernel>
     </function>  
     <function name="min_(,)" args="1" kind="time"  group="stat">
-        <prompt>input window time in secs</prompt>
+	<prompts>
+        	<prompt>input window time in secs</prompt>
+	</prompts>
         <info_brief>min() function</info_brief>
         <new_kernel>#min</new_kernel>
     </function> 
     <function name="max_(,)" args="1" kind="time" group="stat">
-        <prompt>input window time in secs</prompt>
+	<prompts>
+        	<prompt>input window time in secs</prompt>
+	</prompts>
         <info_brief>max() function</info_brief>
         <new_kernel>#max</new_kernel>
     </function>
     <function name="var_(,)" args="1" kind="time" group="stat">
-        <prompt>input window time in secs</prompt>
+	<prompts>
+        	<prompt>input window time in secs</prompt>
+	</prompts>
         <info_brief>variance() function</info_brief>
         <new_kernel>#var</new_kernel>
     </function>
     <function name="skew_(,)" args="1" kind="time" group="stat">
-        <prompt>input window time in secs</prompt>
+	<prompts>
+        	<prompt>input window time in secs</prompt>
+	</prompts>
         <info_brief>skewness() function</info_brief>
         <new_kernel>#skew</new_kernel>
     </function>
     <function name="mean_sm_(,)" args="1" kind="sliding" group="stat">
-        <prompt>input averaging time in secs</prompt>
+	<prompts>
+        	<prompt>input averaging time in secs</prompt>
+	</prompts>
         <info_brief>average</info_brief>
         <new_kernel>#sliding_average</new_kernel>
     </function> 
     <function name="rms_sm_(,)" args="1" kind="sliding" group="stat">
-        <prompt>input averaging time in secs</prompt>
+	<prompts>
+        	<prompt>input averaging time in secs</prompt>
+	</prompts>
         <info_brief>root mean square</info_brief>
         <new_kernel>#rms_sm</new_kernel>
     </function>
     <function name="min_sm_(,)" args="1" kind="sliding" group="stat">
-        <prompt>input window time in secs</prompt>
+	<prompts>
+        	<prompt>input window time in secs</prompt>
+	</prompts>
         <info_brief>min() function</info_brief>
         <new_kernel>#min_sm</new_kernel>
     </function> 
     <function name="max_sm_(,)" args="1" kind="sliding" group="stat">
-        <prompt>input window time in secs</prompt>
+	<prompts>
+        	<prompt>input window time in secs</prompt>
+	</prompts>
         <info_brief>max() function</info_brief>
         <new_kernel>#max_sm</new_kernel>
     </function>
     <function name="var_sm_(,)" args="1" kind="sliding" group="stat">
-        <prompt>input window time in secs</prompt>
+	<prompts>
+	        <prompt>input window time in secs</prompt>
+	</prompts>
         <info_brief>variance() function</info_brief>
         <new_kernel>#var_sm</new_kernel>
     </function>
     <function name="skew_sm_(,)" args="1" kind="sliding" group="stat">
-        <prompt>input window time in secs</prompt>
+	<prompts>
+        	<prompt>input window time in secs</prompt>
+	</prompts>
         <info_brief>skewness() function</info_brief>
         <new_kernel>#skew_sm</new_kernel>
     </function>
     <function name="smooth_(,)" args="1" kind="sliding" group="stat">
-        <prompt>input averaging time in secs</prompt>
+	<prompts>
+        	<prompt>input averaging time in secs</prompt>
+	</prompts>
         <info_brief>smooths with a boxcar average</info_brief>
         <new_kernel>#boxcar</new_kernel>
     </function> 
@@ -75,7 +103,9 @@
       <info_brief>Delays array by N points back (N &lt; 0) and forth (N &gt; 0)</info_brief>
     </function>-->
     <function name="shiftT_(,)" args="1" kind="amda" group="space">
-        <prompt>input time interval T in secs to delay by</prompt>
+	<prompts>
+        	<prompt>input time interval T in secs to delay by</prompt>
+	</prompts>
         <info_brief>Shifts parameter by T secs back (T &lt; 0) and forth (T &gt; 0))</info_brief>
         <new_kernel>#timeShift</new_kernel>
     </function>
@@ -122,11 +152,15 @@
         </info_brief>
         <new_kernel>lopez90</new_kernel>
     </function>
-   <!-- <function name="frameTransformation(,,)" args="3" kind="vectors">
-        <prompt>FROM, TO, isPosition</prompt>
-        <info_brief>frame transformation</info_brief>
+    <function name="framesTransformation(,,,)" args="1" kind="frames" group="space">
+	<prompts>
+        	<prompt type="list" subtype="frames">Input frame:</prompt>
+        	<prompt type="list" subtype="frames">Output frame:</prompt>
+                <prompt type="boolean">Transform a position?</prompt>
+	</prompts>
+        <info_brief>Frames transformation</info_brief>
         <new_kernel>#framesTransformation</new_kernel>
-    </function>-->
+    </function>
     <function name="angle(,)" args="2" kind="vectors" group="math">
         <info_brief>Angle between two vectors</info_brief>
         <new_kernel>angle</new_kernel>
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<argslist xml:id="argslist">
+    <arglist id="frames">
+		<values>
+			<value key="GSM" value="GSM" info="Info GSM"/>
+			<value key="GSE" value="GSE" info="Info GSE"/>
+		</values>
+    </arglist>
+</argslist>
@@ -7,6 +7,15 @@
   * @author Benjamin      
   */
+Ext.define('amdaModel.PromptArg', {
+	extend: 'Ext.data.Model',
+	fields : [
+		{name: 'type', mapping: '@type', type:'string', defaultValue: 'float'},
+		{name: 'subtype', mapping: '@subtype', type:'string', defaultValue: null},
+		{name: 'prompt', mapping: '/', type: 'string', defaultValue: ''}
+	]
+});
+
 Ext.define('amdaModel.Function', {
 	extend: 'Ext.data.Model',
@@ -18,7 +27,6 @@ Ext.define(&#39;amdaModel.Function&#39;, {
         {name: 'group', mapping: '@group', type: 'string', defaultValue: 'space'},
 		{name: 'args', mapping: '@args', type: 'int', defaultValue: 1},
 		{name: 'argv', mapping: '@argv', type: 'string'},
-		{name: 'prompt', type: 'string', defaultValue: ''},
         {name: 'prompt_param', type: 'string', defaultValue: ''},
         {name: 'default_args', type: 'string', defaultValue: ''},
 		{name: 'info_brief', type: 'string', defaultValue: ''}
@@ -30,7 +38,18 @@ Ext.define(&#39;amdaModel.Function&#39;, {
         {type: 'presence', field: 'group'}/*,
 		{type: 'inclusion', field: 'kind', list: ['amda','time']}*/
 	],
-  
+
+	hasMany: {
+		associationKey : 'prompts',
+		name: 'prompts',
+		model: 'amdaModel.PromptArg',
+		reader : {
+			type: 'xml',
+			root: 'prompts',
+			record : 'prompt'
+		}
+	},
+ 
 	proxy: {
 			type: 'ajax',    
 			url : 'generic_data/Functions/functions.xml',
@@ -40,4 +59,44 @@ Ext.define(&#39;amdaModel.Function&#39;, {
 				record: 'function'
 			}
 	}
+
+});
+
+Ext.define('amdaModel.ArgListValue', {
+        extend: 'Ext.data.Model',
+        fields : [
+                {name: 'key', mapping: '@key', type:'string'},
+                {name: 'value', mapping: '@value', type: 'string'},
+		{name: 'info', mapping: '@info', type: 'string', defaultValue: ''}
+        ]
+});
+
+Ext.define('amdaModel.ArgList', {
+	extend: 'Ext.data.Model',
+	idProperty: 'id',
+
+	fields : [
+		{name: 'id', mapping: '@id', type: 'string'}
+	],
+
+	hasMany: {
+		associationKey : 'values',
+		name: 'values',
+		model: 'amdaModel.ArgListValue',
+		reader : {
+			type: 'xml',
+			root: 'values',
+			record : 'value'
+		}
+	},
+
+	proxy: {
+		type: 'ajax',
+		url : 'generic_data/Functions/functions_args_list.xml',
+		reader: {
+			type: 'xml',
+			root: 'argslist',
+			record: 'arglist'
+		}
+	}
 });
@@ -16,22 +16,177 @@
 var CalculatorData = ['1', '2', '3', '4', '5', '6', '7', '8', '9', '0', '(', ')', '[', ']', '+', '-', '*', '/', '^', '.', '>', '>=', '=', '!=', '<=', '<', '&', '|'];
+Ext.define('amdaUI.PromptArgsWin', {
+    extend: 'Ext.window.Window',
+
+    fieldsForm: null,
+    applyCallback: null,
+
+    constructor: function(config) {
+        this.init(config);
+        this.callParent(arguments);
+    },
+
+    promptArgs : function(prompts, fn, scope) {
+        var me = this;
+        if (fn)
+            this.applyCallback = Ext.Function.bind(fn, scope);
+        else
+            this.applyCallback = null;
+        this.fieldsForm.removeAll();
+        prompts.each(function(promptObj, index) {
+            switch (promptObj.get('type')) {
+                case 'float':
+                    me.addFloatField(promptObj.get('prompt'), index);
+                    break;
+                case 'list':
+                    me.addComboField(promptObj.get('prompt'), promptObj.get('subtype'), index);
+                    break;
+                case 'boolean':
+                    me.addBooleanField(promptObj.get('prompt'), index);
+                    break;
+                case 'string':
+                    me.addStringField(promptObj.get('prompt'), index);
+                    break;
+                default:
+                    console.log('Unknown arg type: ' + promptObj.get('type'));
+                    break;
+            }
+        });
+        this.show();
+    },
+
+    addFloatField: function(label, index) {
+        this.fieldsForm.add({
+            xtype: 'numberfield',
+            name: 'arg' + index,
+            fieldLabel: label,
+            decimalPrecision : 20,
+            allowBlank: false
+        });
+    },
+
+    addComboField: function(label, listtype, index) {
+        var argslistStore = amdaUI.CalculatorUI.argslistStore;
+        if (!argslistStore) {
+            return;
+        }
+
+        var valuesStore = null;
+        argslistStore.each(function(arglist) {
+            if (arglist.get('id') == listtype) {
+                valuesStore = arglist.valuesStore;
+            }
+        });
+        if (!valuesStore) {
+            return;
+        }
+
+
+	var listData = [];
+	valuesStore.each(function (item) {
+		listData.push({'key': item.get('key'), 'value': item.get('value')});
+	});
+
+	var comboStore = Ext.create('Ext.data.Store', {
+            fields: ['key', 'value'],
+            data : listData
+        });
+
+        this.fieldsForm.add({
+             xtype: 'combo',
+             name: 'arg' + index,
+             fieldLabel: label,
+             store: comboStore,
+             queryMode: 'local',
+             displayField: 'value',
+             valueField: 'key',
+             editable: false
+        });
+    },
+
+    addBooleanField: function(label, index) {
+        this.fieldsForm.add({
+            xtype: 'checkbox',
+            name: 'arg' + index,
+            boxLabel: label,
+            inputValue: '1',
+            uncheckedValue: '0'
+        });
+    },
+
+    addStringField: function(label, index) {
+        this.fieldsForm.add({
+            xtype: 'textfield',
+            name: 'arg' + index,
+            fieldLabel: label
+        });
+    },
+
+    init : function(config) {
+        this.fieldsForm = Ext.create('Ext.form.Panel', {
+            layout: {
+                type: 'vbox',
+                pack: 'start',
+                align: 'stretch'
+            }
+        });
+
+        var myConf = {
+            layout: 'fit',
+            title: 'Function arguments',
+            modal: true,
+            closeAction: 'hide',
+            width: 300,
+            height: 200, 
+            items: [
+                this.fieldsForm
+            ],
+            buttons: [
+                {
+                    text: 'Apply',
+                    scope : this,
+                    handler: function(bt,event) {
+                        if (this.applyCallback)
+                            this.applyCallback(this.fieldsForm.getValues());
+                        this.close();
+                    },
+                },
+                {
+                     text: 'Cancel',
+                     scope : this,
+                     handler: function(bt,event) {
+                         this.close();
+                     }
+                }
+            ] 
+        };
+
+        Ext.apply(this, Ext.apply(arguments, myConf));
+    }
+});
+
+    
+
 Ext.define('amdaUI.CalculatorUI', {
     extend: 'Ext.util.Observable',
     requires: [
         'amdaModel.Constant',
-        'amdaModel.Function'
+        'amdaModel.Function',
+        'amdaUI.PromptArgsWin'
     ],
     alias: 'plugin.calculator',
     statics: {
         constantStore: null,
-        functionStore: null
+        functionStore: null,
+        argslistStore: null
     },
     win: null,
+    promptArgsWin: null,
     constructor: function (config) {
         Ext.apply(this, config);
@@ -40,6 +195,8 @@ Ext.define(&#39;amdaUI.CalculatorUI&#39;, {
     init: function (cmp)
     {
+        this.promptArgsWin = Ext.create('amdaUI.PromptArgsWin', {});
+
         this.hostCmp = cmp;
         this.hostCmp.on({
             scope: this,
@@ -113,7 +270,16 @@ Ext.define(&#39;amdaUI.CalculatorUI&#39;, {
         } else
             this.createAllBtns();
-
+        if (!amdaUI.CalculatorUI.argslistStore)
+        {
+            amdaUI.CalculatorUI.argslistStore = Ext.create('Ext.data.Store', {model: 'amdaModel.ArgList'});
+            amdaUI.CalculatorUI.argslistStore.load({
+                scope: this,
+                callback: function (records, operation, success)
+                {
+                }
+            });
+        }
     },
     onShow: function () {
@@ -185,14 +351,23 @@ Ext.define(&#39;amdaUI.CalculatorUI&#39;, {
      */
     preProcessFormula: function (sel, currentBtn, params) {
-        if (currentBtn.initialConfig.args != 0 && currentBtn.initialConfig.prompt != "") {
+        if (currentBtn.initialConfig.args != 0 && currentBtn.initialConfig.prompts.count() > 0) {
             // Prompt for user precision and process the result using a callback
-            Ext.Msg.prompt('Argument', currentBtn.initialConfig.prompt, function (bt2, text) {
+            /*Ext.Msg.prompt('Argument', currentBtn.initialConfig.prompts.getAt(0).get('prompt'), function (bt2, text) {
                 if (bt2 === 'ok') {
                     var afterParamsText = text + ")";
                     //TODO: more than one args and prompt
                     this.processFormula(sel, currentBtn, params, afterParamsText);
                 }
+            }, this);*/
+            this.promptArgsWin.promptArgs(currentBtn.initialConfig.prompts, function (values) {
+                var afterParamsText = '';
+                Ext.Object.each(values, function(key, value) {
+                    afterParamsText += (afterParamsText == '' ? '' : ',');
+                    afterParamsText += value;
+                });
+                afterParamsText += ')';
+                this.processFormula(sel, currentBtn, params, afterParamsText);
             }, this);
         } else {
             if ( currentBtn.initialConfig.prompt_param != "" ) {
@@ -389,6 +564,7 @@ Ext.define(&#39;amdaUI.CalculatorUI&#39;, {
         this.createFunctionBtns('PhysicsFunctions', 'Derived', '#calc_tab_func_id');
         this.createFunctionBtns('ModelFunctions', 'Models', '#calc_tab_func_id');
         this.createFunctionBtns('AmdaFunctions', 'TimeShift', '#calc_tab_func_id');
+        this.createFunctionBtns('FramesFunctions', 'Frames', '#calc_tab_func_id');
         amdaUI.CalculatorUI.functionStore.clearFilter();
         // group stat
@@ -492,6 +668,10 @@ Ext.define(&#39;amdaUI.CalculatorUI&#39;, {
                  amdaUI.CalculatorUI.functionStore.filter('kind', 'physics');
                 width = .25;
                 break;
+            case 'FramesFunctions' :
+                amdaUI.CalculatorUI.functionStore.filter('kind', 'frames');
+                width = .45;
+                break;
         }
         var crtTab = funcTab[0].add(
@@ -507,7 +687,7 @@ Ext.define(&#39;amdaUI.CalculatorUI&#39;, {
                         text: f.get('name'),
                         args: f.get('args'),
                         defaultArgs: f.get('default_args'),
-                        prompt: f.get('prompt'),
+                        prompts: f.prompts(),
                         prompt_param: f.get('prompt_param'),
                         tooltip: f.get('info_brief'),
                         scope: this,