diff --git a/js/app/models/PlotObjects/PlotBaseSerieObject.js b/js/app/models/PlotObjects/PlotBaseSerieObject.js
index 9aa2a24..29676cc 100644
--- a/js/app/models/PlotObjects/PlotBaseSerieObject.js
+++ b/js/app/models/PlotObjects/PlotBaseSerieObject.js
@@ -11,182 +11,191 @@
******************************************************************************
* : :14/09/2015: BRE - file creation
*/
-
-
+
+
Ext.define('amdaPlotObj.PlotBaseSerieObject', {
- extend: 'Ext.data.Model',
-
- requires: [
- 'amdaPlotObj.PlotObjectConfig'
- ],
-
- fields : [
- {name: 'serie-yaxis', type: 'string'},
- {name: 'serie-resolution', type: 'int'},
- {name: 'serie-lines-activated', type: 'boolean'},
- {name: 'serie-lines-style', type: 'string'},
- {name: 'serie-lines-width', type: 'float'},
- {name: 'serie-lines-color', type: 'string'},
- {name: 'serie-symbols-activated', type: 'boolean'},
- {name: 'serie-symbols-type', type: 'string'},
- {name: 'serie-symbols-size', type: 'float'},
- {name: 'serie-symbols-color', type: 'string'},
- {name: 'serie-colored-param', type: 'string'},
- {name: 'serie-value-min', type: 'float', useNull:true},
- {name: 'serie-value-max', type: 'float', useNull:true},
-
- //Time tick
- {name: 'serie-timetick-activated', type: 'boolean'},
- {name: 'serie-timetick-type', type: 'string'},
- {name: 'serie-timetick-step', type: 'float'},
- {name: 'serie-timetick-nbmajor', type: 'int'},
- {name: 'serie-timetick-nbminor', type: 'int'},
- {name: 'serie-timetick-color', type: 'string'},
- {name: 'serie-timetick-symbols-type', type: 'string'},
- {name: 'serie-timetick-symbols-size', type: 'float'},
- {name: 'serie-timetick-symbols-color', type: 'string'},
- {name: 'serie-timetick-firstsymbols-activated', type: 'boolean'},
- {name: 'serie-timetick-firstsymbols-type', type: 'string'},
- {name: 'serie-timetick-firstsymbols-size', type: 'float'},
- {name: 'serie-timetick-firstsymbols-color', type: 'string'},
- {name: 'serie-timetick-font-activated', type: 'boolean'},
- {name: 'serie-timetick-font-name', type: 'string'},
- {name: 'serie-timetick-font-size', type: 'int'},
- {name: 'serie-timetick-font-bold', type: 'boolean'},
- {name: 'serie-timetick-font-italic', type: 'boolean'},
-
- //Interval tick
- {name: 'serie-intervaltick-activated', type: 'boolean'},
- {name: 'serie-intervaltick-mode', type: 'string'},
- {name: 'serie-intervaltick-color', type: 'string'},
- {name: 'serie-intervaltick-symbols-type', type: 'string'},
- {name: 'serie-intervaltick-symbols-size', type: 'float'},
- {name: 'serie-intervaltick-symbols-color', type: 'string'},
- {name: 'serie-intervaltick-font-activated', type: 'boolean'},
- {name: 'serie-intervaltick-font-name', type: 'string'},
- {name: 'serie-intervaltick-font-size', type: 'int'},
- {name: 'serie-intervaltick-font-bold', type: 'boolean'},
- {name: 'serie-intervaltick-font-italic', type: 'boolean'},
+ extend: 'Ext.data.Model',
+
+ requires: [
+ 'amdaPlotObj.PlotObjectConfig'
],
-
- constructor: function(){
+
+ fields: [
+ {name: 'serie-yaxis', type: 'string'},
+ {name: 'serie-resolution', type: 'int'},
+ {name: 'serie-lines-activated', type: 'boolean'},
+ {name: 'serie-lines-style', type: 'string'},
+ {name: 'serie-lines-width', type: 'float'},
+ {name: 'serie-lines-color', type: 'string'},
+ {name: 'serie-symbols-activated', type: 'boolean'},
+ {name: 'serie-symbols-type', type: 'string'},
+ {name: 'serie-symbols-size', type: 'float'},
+ {name: 'serie-symbols-color', type: 'string'},
+ {name: 'serie-colored-param', type: 'string'},
+ {name: 'serie-value-min', type: 'float', useNull: true},
+ {name: 'serie-value-max', type: 'float', useNull: true},
+
+ //Time tick
+ {name: 'serie-timetick-activated', type: 'boolean'},
+ {name: 'serie-timetick-type', type: 'string'},
+ {name: 'serie-timetick-step', type: 'float'},
+ {name: 'serie-timetick-nbmajor', type: 'int'},
+ {name: 'serie-timetick-nbminor', type: 'int'},
+ {name: 'serie-timetick-color', type: 'string'},
+ {name: 'serie-timetick-symbols-type', type: 'string'},
+ {name: 'serie-timetick-symbols-size', type: 'float'},
+ {name: 'serie-timetick-symbols-color', type: 'string'},
+ {name: 'serie-timetick-firstsymbols-activated', type: 'boolean'},
+ {name: 'serie-timetick-firstsymbols-type', type: 'string'},
+ {name: 'serie-timetick-firstsymbols-size', type: 'float'},
+ {name: 'serie-timetick-firstsymbols-color', type: 'string'},
+ {name: 'serie-timetick-font-activated', type: 'boolean'},
+ {name: 'serie-timetick-font-name', type: 'string'},
+ {name: 'serie-timetick-font-size', type: 'int'},
+ {name: 'serie-timetick-font-bold', type: 'boolean'},
+ {name: 'serie-timetick-font-italic', type: 'boolean'},
+
+ //Interval tick
+ {name: 'serie-intervaltick-activated', type: 'boolean'},
+ {name: 'serie-intervaltick-mode', type: 'string'},
+ {name: 'serie-intervaltick-color', type: 'string'},
+ {name: 'serie-intervaltick-symbols-type', type: 'string'},
+ {name: 'serie-intervaltick-symbols-size', type: 'float'},
+ {name: 'serie-intervaltick-symbols-color', type: 'string'},
+ {name: 'serie-intervaltick-font-activated', type: 'boolean'},
+ {name: 'serie-intervaltick-font-name', type: 'string'},
+ {name: 'serie-intervaltick-font-size', type: 'int'},
+ {name: 'serie-intervaltick-font-bold', type: 'boolean'},
+ {name: 'serie-intervaltick-font-italic', type: 'boolean'},
+ //Filtering
+ {name: 'filtering-activated', type: 'boolean'},
+ {name:'filtering-level', type:'int'}
+ ],
+
+ constructor: function () {
var me = this;
me.callParent(arguments);
if ((arguments.length > 0) && arguments[0])
{
- }
- else
+ } else
{
- //new object, set default fields values
- me.setDefaultValues();
+ //new object, set default fields values
+ me.setDefaultValues();
}
this.dirty = false;
},
-
- setDefaultValues: function()
+
+ setDefaultValues: function ()
{
- this.set('serie-yaxis', amdaPlotObj.PlotObjectConfig.defaultValues.serie.yAxis);
- this.set('serie-resolution', amdaPlotObj.PlotObjectConfig.defaultValues.serie.resolution);
- this.set('serie-lines-activated', true);
- this.set('serie-lines-style', amdaPlotObj.PlotObjectConfig.defaultValues.serie.lines.style);
- this.set('serie-lines-width', amdaPlotObj.PlotObjectConfig.defaultValues.serie.lines.width);
- this.set('serie-lines-color', amdaPlotObj.PlotObjectConfig.defaultValues.serie.lines.color);
- this.set('serie-symbols-activated', false);
- this.set('serie-symbols-type', amdaPlotObj.PlotObjectConfig.defaultValues.serie.symbols.type);
- this.set('serie-symbols-size', amdaPlotObj.PlotObjectConfig.defaultValues.serie.symbols.size);
- this.set('serie-symbols-color', amdaPlotObj.PlotObjectConfig.defaultValues.serie.symbols.color);
- this.set('serie-colored-param', '');
-
- this.set('serie-timetick-activated', false);
- this.set('serie-timetick-type', amdaPlotObj.PlotObjectConfig.defaultValues.serie.timetick.type);
- this.set('serie-timetick-step', amdaPlotObj.PlotObjectConfig.defaultValues.serie.timetick.step);
- this.set('serie-timetick-nbmajor', amdaPlotObj.PlotObjectConfig.defaultValues.serie.timetick.nbmajor);
- this.set('serie-timetick-nbminor', amdaPlotObj.PlotObjectConfig.defaultValues.serie.timetick.nbminor);
- this.set('serie-timetick-color', amdaPlotObj.PlotObjectConfig.defaultValues.serie.timetick.color);
- this.set('serie-timetick-symbols-type', amdaPlotObj.PlotObjectConfig.defaultValues.serie.timetick.symbols.type);
- this.set('serie-timetick-symbols-size', amdaPlotObj.PlotObjectConfig.defaultValues.serie.timetick.symbols.size);
- this.set('serie-timetick-symbols-color', amdaPlotObj.PlotObjectConfig.defaultValues.serie.timetick.symbols.color);
- this.set('serie-timetick-firstsymbols-activated', true);
- this.set('serie-timetick-firstsymbols-type', amdaPlotObj.PlotObjectConfig.defaultValues.serie.timetick.firstsymbols.type);
- this.set('serie-timetick-firstsymbols-size', amdaPlotObj.PlotObjectConfig.defaultValues.serie.timetick.firstsymbols.size);
- this.set('serie-timetick-firstsymbols-color', amdaPlotObj.PlotObjectConfig.defaultValues.serie.timetick.firstsymbols.color);
- this.set('serie-timetick-font-activated', false);
+ this.set('serie-yaxis', amdaPlotObj.PlotObjectConfig.defaultValues.serie.yAxis);
+ this.set('serie-resolution', amdaPlotObj.PlotObjectConfig.defaultValues.serie.resolution);
+ this.set('serie-lines-activated', true);
+ this.set('serie-lines-style', amdaPlotObj.PlotObjectConfig.defaultValues.serie.lines.style);
+ this.set('serie-lines-width', amdaPlotObj.PlotObjectConfig.defaultValues.serie.lines.width);
+ this.set('serie-lines-color', amdaPlotObj.PlotObjectConfig.defaultValues.serie.lines.color);
+ this.set('serie-symbols-activated', false);
+ this.set('serie-symbols-type', amdaPlotObj.PlotObjectConfig.defaultValues.serie.symbols.type);
+ this.set('serie-symbols-size', amdaPlotObj.PlotObjectConfig.defaultValues.serie.symbols.size);
+ this.set('serie-symbols-color', amdaPlotObj.PlotObjectConfig.defaultValues.serie.symbols.color);
+ this.set('serie-colored-param', '');
+
+ this.set('serie-timetick-activated', false);
+ this.set('serie-timetick-type', amdaPlotObj.PlotObjectConfig.defaultValues.serie.timetick.type);
+ this.set('serie-timetick-step', amdaPlotObj.PlotObjectConfig.defaultValues.serie.timetick.step);
+ this.set('serie-timetick-nbmajor', amdaPlotObj.PlotObjectConfig.defaultValues.serie.timetick.nbmajor);
+ this.set('serie-timetick-nbminor', amdaPlotObj.PlotObjectConfig.defaultValues.serie.timetick.nbminor);
+ this.set('serie-timetick-color', amdaPlotObj.PlotObjectConfig.defaultValues.serie.timetick.color);
+ this.set('serie-timetick-symbols-type', amdaPlotObj.PlotObjectConfig.defaultValues.serie.timetick.symbols.type);
+ this.set('serie-timetick-symbols-size', amdaPlotObj.PlotObjectConfig.defaultValues.serie.timetick.symbols.size);
+ this.set('serie-timetick-symbols-color', amdaPlotObj.PlotObjectConfig.defaultValues.serie.timetick.symbols.color);
+ this.set('serie-timetick-firstsymbols-activated', true);
+ this.set('serie-timetick-firstsymbols-type', amdaPlotObj.PlotObjectConfig.defaultValues.serie.timetick.firstsymbols.type);
+ this.set('serie-timetick-firstsymbols-size', amdaPlotObj.PlotObjectConfig.defaultValues.serie.timetick.firstsymbols.size);
+ this.set('serie-timetick-firstsymbols-color', amdaPlotObj.PlotObjectConfig.defaultValues.serie.timetick.firstsymbols.color);
+ this.set('serie-timetick-font-activated', false);
this.set('serie-timetick-font-name', amdaPlotObj.PlotObjectConfig.defaultValues.serie.timetick.font.name);
this.set('serie-timetick-font-size', amdaPlotObj.PlotObjectConfig.defaultValues.serie.timetick.font.size);
this.set('serie-timetick-font-bold', false);
this.set('serie-timetick-font-italic', false);
-
- this.set('serie-intervaltick-activated', false);
- this.set('serie-intervaltick-mode', amdaPlotObj.PlotObjectConfig.defaultValues.serie.intervaltick.mode);
- this.set('serie-intervaltick-color', amdaPlotObj.PlotObjectConfig.defaultValues.serie.intervaltick.color);
- this.set('serie-intervaltick-symbols-type', amdaPlotObj.PlotObjectConfig.defaultValues.serie.intervaltick.symbols.type);
- this.set('serie-intervaltick-symbols-size', amdaPlotObj.PlotObjectConfig.defaultValues.serie.intervaltick.symbols.size);
- this.set('serie-intervaltick-symbols-color', amdaPlotObj.PlotObjectConfig.defaultValues.serie.intervaltick.symbols.color);
- this.set('serie-intervaltick-font-activated', false);
- this.set('serie-intervaltick-font-name', amdaPlotObj.PlotObjectConfig.defaultValues.serie.intervaltick.font.name);
- this.set('serie-intervaltick-font-size', amdaPlotObj.PlotObjectConfig.defaultValues.serie.intervaltick.font.size);
- this.set('serie-intervaltick-font-bold', false);
- this.set('serie-intervaltick-font-italic', false);
+
+ this.set('serie-intervaltick-activated', false);
+ this.set('serie-intervaltick-mode', amdaPlotObj.PlotObjectConfig.defaultValues.serie.intervaltick.mode);
+ this.set('serie-intervaltick-color', amdaPlotObj.PlotObjectConfig.defaultValues.serie.intervaltick.color);
+ this.set('serie-intervaltick-symbols-type', amdaPlotObj.PlotObjectConfig.defaultValues.serie.intervaltick.symbols.type);
+ this.set('serie-intervaltick-symbols-size', amdaPlotObj.PlotObjectConfig.defaultValues.serie.intervaltick.symbols.size);
+ this.set('serie-intervaltick-symbols-color', amdaPlotObj.PlotObjectConfig.defaultValues.serie.intervaltick.symbols.color);
+ this.set('serie-intervaltick-font-activated', false);
+ this.set('serie-intervaltick-font-name', amdaPlotObj.PlotObjectConfig.defaultValues.serie.intervaltick.font.name);
+ this.set('serie-intervaltick-font-size', amdaPlotObj.PlotObjectConfig.defaultValues.serie.intervaltick.font.size);
+ this.set('serie-intervaltick-font-bold', false);
+ this.set('serie-intervaltick-font-italic', false);
+
+ // filtering
+ this.set( 'filtering-activated', false);
+ this.set('filtering-level', amdaPlotObj.PlotObjectConfig.defaultValues.filtering.level);
},
-
- loadFromData : function(drawData)
+
+ loadFromData: function (drawData)
{
- Ext.Object.each(drawData, function(key, value) {
- if (key == 'type')
- return;
- this.set(key, value);
- }, this);
+ Ext.Object.each(drawData, function (key, value) {
+ if (key == 'type')
+ return;
+ this.set(key, value);
+ }, this);
},
-
- getJsonValues : function()
+
+ getJsonValues: function ()
{
- var serieValues = new Object();
-
- serieValues['serie-yaxis'] = this.get('serie-yaxis');
- serieValues['serie-resolution'] = this.get('serie-resolution');
- serieValues['serie-lines-activated'] = this.get('serie-lines-activated');
- serieValues['serie-lines-style'] = this.get('serie-lines-style');
- serieValues['serie-lines-width'] = this.get('serie-lines-width');
- serieValues['serie-lines-color'] = this.get('serie-lines-color');
- serieValues['serie-symbols-activated'] = this.get('serie-symbols-activated');
- serieValues['serie-symbols-type'] = this.get('serie-symbols-type');
- serieValues['serie-symbols-size'] = this.get('serie-symbols-size');
- serieValues['serie-symbols-color'] = this.get('serie-symbols-color');
- serieValues['serie-colored-param'] = this.get('serie-colored-param');
- serieValues['serie-value-min'] = this.get('serie-value-min');
- serieValues['serie-value-max'] = this.get('serie-value-max');
-
- serieValues['serie-timetick-activated'] = this.get('serie-timetick-activated');
- serieValues['serie-timetick-type'] = this.get('serie-timetick-type');
- serieValues['serie-timetick-step'] = this.get('serie-timetick-step');
- serieValues['serie-timetick-nbmajor'] = this.get('serie-timetick-nbmajor');
- serieValues['serie-timetick-nbminor'] = this.get('serie-timetick-nbminor');
- serieValues['serie-timetick-color'] = this.get('serie-timetick-color');
- serieValues['serie-timetick-symbols-type'] = this.get('serie-timetick-symbols-type');
- serieValues['serie-timetick-symbols-size'] = this.get('serie-timetick-symbols-size');
- serieValues['serie-timetick-symbols-color'] = this.get('serie-timetick-symbols-color');
- serieValues['serie-timetick-firstsymbols-activated'] = this.get('serie-timetick-firstsymbols-activated');
- serieValues['serie-timetick-firstsymbols-type'] = this.get('serie-timetick-firstsymbols-type');
- serieValues['serie-timetick-firstsymbols-size'] = this.get('serie-timetick-firstsymbols-size');
- serieValues['serie-timetick-firstsymbols-color'] = this.get('serie-timetick-firstsymbols-color');
- serieValues['serie-timetick-font-activated'] = this.get('serie-timetick-font-activated');
- serieValues['serie-timetick-font-name'] = this.get('serie-timetick-font-name');
- serieValues['serie-timetick-font-size'] = this.get('serie-timetick-font-size');
- serieValues['serie-timetick-font-bold'] = this.get('serie-timetick-font-bold');
- serieValues['serie-timetick-font-italic'] = this.get('serie-timetick-font-italic');
-
- serieValues['serie-intervaltick-activated'] = this.get('serie-intervaltick-activated');
- serieValues['serie-intervaltick-mode'] = this.get('serie-intervaltick-mode');
- serieValues['serie-intervaltick-color'] = this.get('serie-intervaltick-color');
- serieValues['serie-intervaltick-symbols-type'] = this.get('serie-intervaltick-symbols-type');
- serieValues['serie-intervaltick-symbols-size'] = this.get('serie-intervaltick-symbols-size');
- serieValues['serie-intervaltick-symbols-color'] = this.get('serie-intervaltick-symbols-color');
- serieValues['serie-intervaltick-font-activated'] = this.get('serie-intervaltick-font-activated');
- serieValues['serie-intervaltick-font-name'] = this.get('serie-intervaltick-font-name');
- serieValues['serie-intervaltick-font-size'] = this.get('serie-intervaltick-font-size');
- serieValues['serie-intervaltick-font-bold'] = this.get('serie-intervaltick-font-bold');
- serieValues['serie-intervaltick-font-italic'] = this.get('serie-intervaltick-font-italic');
-
- return serieValues;
+ var serieValues = new Object();
+
+ serieValues['serie-yaxis'] = this.get('serie-yaxis');
+ serieValues['serie-resolution'] = this.get('serie-resolution');
+ serieValues['serie-lines-activated'] = this.get('serie-lines-activated');
+ serieValues['serie-lines-style'] = this.get('serie-lines-style');
+ serieValues['serie-lines-width'] = this.get('serie-lines-width');
+ serieValues['serie-lines-color'] = this.get('serie-lines-color');
+ serieValues['serie-symbols-activated'] = this.get('serie-symbols-activated');
+ serieValues['serie-symbols-type'] = this.get('serie-symbols-type');
+ serieValues['serie-symbols-size'] = this.get('serie-symbols-size');
+ serieValues['serie-symbols-color'] = this.get('serie-symbols-color');
+ serieValues['serie-colored-param'] = this.get('serie-colored-param');
+ serieValues['serie-value-min'] = this.get('serie-value-min');
+ serieValues['serie-value-max'] = this.get('serie-value-max');
+
+ serieValues['serie-timetick-activated'] = this.get('serie-timetick-activated');
+ serieValues['serie-timetick-type'] = this.get('serie-timetick-type');
+ serieValues['serie-timetick-step'] = this.get('serie-timetick-step');
+ serieValues['serie-timetick-nbmajor'] = this.get('serie-timetick-nbmajor');
+ serieValues['serie-timetick-nbminor'] = this.get('serie-timetick-nbminor');
+ serieValues['serie-timetick-color'] = this.get('serie-timetick-color');
+ serieValues['serie-timetick-symbols-type'] = this.get('serie-timetick-symbols-type');
+ serieValues['serie-timetick-symbols-size'] = this.get('serie-timetick-symbols-size');
+ serieValues['serie-timetick-symbols-color'] = this.get('serie-timetick-symbols-color');
+ serieValues['serie-timetick-firstsymbols-activated'] = this.get('serie-timetick-firstsymbols-activated');
+ serieValues['serie-timetick-firstsymbols-type'] = this.get('serie-timetick-firstsymbols-type');
+ serieValues['serie-timetick-firstsymbols-size'] = this.get('serie-timetick-firstsymbols-size');
+ serieValues['serie-timetick-firstsymbols-color'] = this.get('serie-timetick-firstsymbols-color');
+ serieValues['serie-timetick-font-activated'] = this.get('serie-timetick-font-activated');
+ serieValues['serie-timetick-font-name'] = this.get('serie-timetick-font-name');
+ serieValues['serie-timetick-font-size'] = this.get('serie-timetick-font-size');
+ serieValues['serie-timetick-font-bold'] = this.get('serie-timetick-font-bold');
+ serieValues['serie-timetick-font-italic'] = this.get('serie-timetick-font-italic');
+
+ serieValues['serie-intervaltick-activated'] = this.get('serie-intervaltick-activated');
+ serieValues['serie-intervaltick-mode'] = this.get('serie-intervaltick-mode');
+ serieValues['serie-intervaltick-color'] = this.get('serie-intervaltick-color');
+ serieValues['serie-intervaltick-symbols-type'] = this.get('serie-intervaltick-symbols-type');
+ serieValues['serie-intervaltick-symbols-size'] = this.get('serie-intervaltick-symbols-size');
+ serieValues['serie-intervaltick-symbols-color'] = this.get('serie-intervaltick-symbols-color');
+ serieValues['serie-intervaltick-font-activated'] = this.get('serie-intervaltick-font-activated');
+ serieValues['serie-intervaltick-font-name'] = this.get('serie-intervaltick-font-name');
+ serieValues['serie-intervaltick-font-size'] = this.get('serie-intervaltick-font-size');
+ serieValues['serie-intervaltick-font-bold'] = this.get('serie-intervaltick-font-bold');
+ serieValues['serie-intervaltick-font-italic'] = this.get('serie-intervaltick-font-italic');
+
+ serieValues['filtering-activated'] = this.get('filtering-activated');
+ serieValues['filtering-level'] = this.get('filtering-level');
+
+ return serieValues;
}
});
diff --git a/js/app/models/PlotObjects/PlotObjectConfig.js b/js/app/models/PlotObjects/PlotObjectConfig.js
index 2dea1f2..b119c50 100644
--- a/js/app/models/PlotObjects/PlotObjectConfig.js
+++ b/js/app/models/PlotObjects/PlotObjectConfig.js
@@ -137,7 +137,8 @@ Ext.define('amdaPlotObj.PlotObjectConfig', {
color : 'auto'
}
},
- projection : 'XY'
+ projection : 'XY',
+
},
spectro : {
yAxis : 'y-left',
@@ -200,7 +201,10 @@ Ext.define('amdaPlotObj.PlotObjectConfig', {
type : 'serie-constant',
greaterColor : 'none',
lessColor : 'none'
- }
+ },
+ filtering:{
+ level:1
+ }
},
getValueByKey : function(dataList, key)
@@ -478,6 +482,12 @@ Ext.define('amdaPlotObj.PlotObjectConfig', {
{'key' : 'linear', 'value' : 'Linear'},
{'key' : 'log', 'value' : 'Logarithmic'}
],
+
+ availableFilteringLevel : [
+ {'key' : 1, 'value' : 'Low'},
+ {'key' : 2, 'value' : 'Medium'},
+ {'key' : 3, 'value' : 'Strong'}
+ ],
getParamConfig : function(paramId, onParamConfigLoaded) {
AmdaAction.getParamPlotInit({"paramId" : paramId}, function (result, e) {
diff --git a/js/app/models/RequestParamObject.js b/js/app/models/RequestParamObject.js
index ec70a1f..f1813d9 100644
--- a/js/app/models/RequestParamObject.js
+++ b/js/app/models/RequestParamObject.js
@@ -64,9 +64,6 @@ Ext.define('amdaModel.RequestParamObject', {
{name: 'template_args', type: 'auto', defaultValue: null},
/* ?? */
{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) {
@@ -158,11 +155,7 @@ Ext.define('amdaModel.RequestParamObject', {
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();
Ext.Object.each(this.get('template_args'), function (argKey, argValue) {
diff --git a/js/app/views/PlotComponents/PlotBaseSerieForm.js b/js/app/views/PlotComponents/PlotBaseSerieForm.js
index 621da25..cb76adf 100644
--- a/js/app/views/PlotComponents/PlotBaseSerieForm.js
+++ b/js/app/views/PlotComponents/PlotBaseSerieForm.js
@@ -81,6 +81,11 @@ Ext.define('amdaPlotComp.PlotBaseSerieForm', {
this.addStandardFloat2('serie-value-max', 'Max value', -Number.MAX_VALUE, Number.MAX_VALUE, true)
];
},
+ getFilteringItems: function(){
+ return[
+ this.addStandardCombo('filtering-level', 'Level', amdaPlotObj.PlotObjectConfig.availableFilteringLevel)
+ ];
+ },
getFormItems: function() {
var me = this;
@@ -93,13 +98,14 @@ Ext.define('amdaPlotComp.PlotBaseSerieForm', {
me.object.set('serie-yaxis', value);
me.crtTree.refresh();
}),
- myDesktopApp.addAmdaInfo('MinMaxThreshold','vertical-align:bottom'),
+ myDesktopApp.addAmdaInfo('MinMaxThreshold','vertical-align:bottom'),
this.addStandardFieldSet('Min/Max thresholds', '', this.getValuesRangeItems()),
this.addStandardParamDropTarget('serie-colored-param', 'Colored Parameter'),
this.addStandardFieldSet('Lines', 'serie-lines-activated', this.addStandardLineItems('serie-lines')),
this.addStandardFieldSet('Symbols', 'serie-symbols-activated', this.addStandardSymbolsItems('serie-symbols')),
this.addStandardFieldSet('Time ticks', 'serie-timetick-activated', this.getTimeTickItems()),
- this.addStandardFieldSet('Interval ticks', 'serie-intervaltick-activated', this.getIntervalTickItems())
+ this.addStandardFieldSet('Interval ticks', 'serie-intervaltick-activated', this.getIntervalTickItems()),
+ this.addStandardFieldSet('Filtering', 'filtering-activated', this.getFilteringItems())
];
}
});
--
libgit2 0.21.2