diff --git a/generic_data/Functions/functions.xml b/generic_data/Functions/functions.xml
index 93c1698..c933272 100644
--- a/generic_data/Functions/functions.xml
+++ b/generic_data/Functions/functions.xml
@@ -109,7 +109,10 @@
Shifts parameter by T secs back (T < 0) and forth (T > 0))
#timeShift
-
+
+ Remove Spikes
+ #filter
+
density[cm^⁻3], b_magnitude[nT]
Alfven velocity Valfven(density[cm^⁻3], b_magnitude[nT])
@@ -274,4 +277,5 @@
Square root
sqrt
+
diff --git a/js/app/models/PlotObjects/PlotParamObject.js b/js/app/models/PlotObjects/PlotParamObject.js
index 95988a7..44c501f 100644
--- a/js/app/models/PlotObjects/PlotParamObject.js
+++ b/js/app/models/PlotObjects/PlotParamObject.js
@@ -71,8 +71,8 @@ Ext.define('amdaPlotObj.PlotParamObject', {
{
case 'serie' :
return new amdaPlotObj.PlotSerieObject(data);
- case 'orbit-serie' :
- return new amdaPlotObj.PlotOrbitSerieObject(data);
+ case 'orbit-serie' :
+ return new amdaPlotObj.PlotOrbitSerieObject(data);
case 'spectro' :
return new amdaPlotObj.PlotSpectroObject(data);
case 'status-bar' :
diff --git a/js/app/models/RequestParamObject.js b/js/app/models/RequestParamObject.js
index f581499..ec70a1f 100644
--- a/js/app/models/RequestParamObject.js
+++ b/js/app/models/RequestParamObject.js
@@ -63,7 +63,10 @@ Ext.define('amdaModel.RequestParamObject', {
/* Field for arguments of a templated parameter */
{name: 'template_args', type: 'auto', defaultValue: null},
/* ?? */
- {name: 'plotonly', type: 'bool', defaultValue: false}
+ {name: 'plotonly', type: 'bool', defaultValue: false},
+ {name:'filter_spikes', type:'bool', defaultValue: true},
+ {name: 'filter_spikes_factor', type: 'float', defaultValue: 5},
+ {name: 'filter_spikes_nPoints', type: 'int', defaultValue: 100}
],
getDimSum : function(dim) {
@@ -141,20 +144,24 @@ Ext.define('amdaModel.RequestParamObject', {
paramValues['dim1-index'] = this.get('dim1-index');
paramValues['dim1-sum-type'] = this.get('dim1-sum-type');
- paramValues['dim1-min-value'] = this.get('dim1-min-value');
- paramValues['dim1-max-value'] = this.get('dim1-max-value');
- paramValues['dim1-min-index'] = this.get('dim1-min-index');
- paramValues['dim1-max-index'] = this.get('dim1-max-index');
+ paramValues['dim1-min-value'] = this.get('dim1-min-value');
+ paramValues['dim1-max-value'] = this.get('dim1-max-value');
+ paramValues['dim1-min-index'] = this.get('dim1-min-index');
+ paramValues['dim1-max-index'] = this.get('dim1-max-index');
paramValues['dim2-index'] = this.get('dim2-index');
paramValues['dim2-sum-type'] = this.get('dim2-sum-type');
- paramValues['dim2-min-value'] = this.get('dim2-min-value');
- paramValues['dim2-max-value'] = this.get('dim2-max-value');
- paramValues['dim2-min-index'] = this.get('dim2-min-index');
- paramValues['dim2-max-index'] = this.get('dim2-max-index');
+ paramValues['dim2-min-value'] = this.get('dim2-min-value');
+ paramValues['dim2-max-value'] = this.get('dim2-max-value');
+ paramValues['dim2-min-index'] = this.get('dim2-min-index');
+ paramValues['dim2-max-index'] = this.get('dim2-max-index');
- paramValues['type'] = this.get('type');
- paramValues['is-init'] = this.get('is-init');
+ paramValues['type'] = this.get('type');
+ paramValues['is-init'] = this.get('is-init');
+
+ paramValues['filter_spikes'] = this.get('filter_spikes');
+ paramValues['filter_spikes_factor'] = this.get('filter_spikes_factor');
+ paramValues['filter_spikes_nPoints'] = this.get('filter_spikes_nPoints');
if (this.get('template_args') != null) {
paramValues['template_args'] = new Object();
--
libgit2 0.21.2