rm 8444 +

Elena.Budnik
1 parent 6aa5af40
Showing 3 changed files with 12 additions and 6 deletions Show diff stats
generic_data/Functions/functions.xml
js/app/models/Function.js
js/app/views/CalculatorUI.js
@@ -97,15 +97,16 @@
     </function>
  
     <!--<function name="fairfield70(,tilt_angle_60)" args="2" kind="physics">-->
-    <function name="fairfield70(,)" args="2" kind="physics">
-        <!-- <prompt>xyz_sm (Re), dipole tilt angle (deg)</prompt> -->
+    <function name="fairfield70(,tilt_angle_60)" args="2" kind="physics">
+        <prompt_param>xyz_sm (Re), dipole tilt angle (deg)</prompt_param>
+        <default_args>,tilt_angle_60</default_args>
         <info_brief>Distance (Re) from s/c location to Fairfield1970 model neutral sheet position.&lt;br/&gt;
             dZ = fairfield70(xyz_sm, tilt_angle),&lt;br/&gt; xyz_sm is the s/c SM coordinates (Re) and  tilt angle is in degrees.&lt;br/&gt; Valid for y_sm &lt; 15 Re.</info_brief>
-        <new_kernel>fairfield70</new_kernel>
+        <new_kernel>fairfield70</new_kernel>        
     </function>
  
    <!--<function name="fairfield80(,tilt_angle_60)" args="2" kind="physics">-->
-   <function name="fairfield80(,)" args="2" kind="physics">
+   <function name="fairfield80(,tilt_angle_60)" args="2" kind="physics">
         <!-- <prompt>xyz_sm (Re), dipole tilt angle (deg)</prompt> -->
  
         <info_brief>Distance (Re) from s/c location to Fairfield1980 model neutral sheet position.&lt;br/&gt;
@@ -18,7 +18,8 @@ Ext.define(&#39;amdaModel.Function&#39;, {
 		{name: 'args', mapping: '@args', type: 'int', defaultValue: 1},
 		{name: 'argv', mapping: '@argv', type: 'string'},
 		{name: 'prompt', type: 'string', defaultValue: ''},
-                                        {name: 'default_args', type: 'string', defaultValue: ''},
+        {name: 'prompt_param', type: 'string', defaultValue: ''},
+        {name: 'default_args', type: 'string', defaultValue: ''},
 		{name: 'info_brief', type: 'string', defaultValue: ''}
 	],
  
@@ -176,10 +176,13 @@ Ext.define(&#39;amdaUI.CalculatorUI&#39;, {
                     var afterParamsText = text + ")";
                     //TODO: more than one args and prompt
                     this.processFormula(sel, currentBtn, params, afterParamsText);
-
                 }
             }, this);
         } else {
+            if ( currentBtn.initialConfig.prompt_param != "" ) {
+                console.log(currentBtn.initialConfig);
+                 Ext.Msg.alert('Input Parameters', currentBtn.initialConfig.prompt_param);
+            }
             this.processFormula(sel, currentBtn, params, ")");
         }// endif prompt
     },
@@ -473,6 +476,7 @@ Ext.define(&#39;amdaUI.CalculatorUI&#39;, {
                         args: f.get('args'),
                         defaultArgs: f.get('default_args'),
                         prompt: f.get('prompt'),
+                        prompt_param: f.get('prompt_param'),
                         tooltip: f.get('info_brief'),
                         scope: this,
                         handler: function (b, e) {