Commit a8da7fc5fc5e352028ba0d418a00fcc3f99e739c
1 parent
cec289da
Exists in
master
and in
82 other branches
ihm plot ok
Showing
4 changed files
with
188 additions
and
170 deletions
Show diff stats
js/app/models/PlotObjects/PlotBaseSerieObject.js
| ... | ... | @@ -11,182 +11,191 @@ |
| 11 | 11 | ****************************************************************************** |
| 12 | 12 | * : :14/09/2015: BRE - file creation |
| 13 | 13 | */ |
| 14 | - | |
| 15 | - | |
| 14 | + | |
| 15 | + | |
| 16 | 16 | Ext.define('amdaPlotObj.PlotBaseSerieObject', { |
| 17 | - extend: 'Ext.data.Model', | |
| 18 | - | |
| 19 | - requires: [ | |
| 20 | - 'amdaPlotObj.PlotObjectConfig' | |
| 21 | - ], | |
| 22 | - | |
| 23 | - fields : [ | |
| 24 | - {name: 'serie-yaxis', type: 'string'}, | |
| 25 | - {name: 'serie-resolution', type: 'int'}, | |
| 26 | - {name: 'serie-lines-activated', type: 'boolean'}, | |
| 27 | - {name: 'serie-lines-style', type: 'string'}, | |
| 28 | - {name: 'serie-lines-width', type: 'float'}, | |
| 29 | - {name: 'serie-lines-color', type: 'string'}, | |
| 30 | - {name: 'serie-symbols-activated', type: 'boolean'}, | |
| 31 | - {name: 'serie-symbols-type', type: 'string'}, | |
| 32 | - {name: 'serie-symbols-size', type: 'float'}, | |
| 33 | - {name: 'serie-symbols-color', type: 'string'}, | |
| 34 | - {name: 'serie-colored-param', type: 'string'}, | |
| 35 | - {name: 'serie-value-min', type: 'float', useNull:true}, | |
| 36 | - {name: 'serie-value-max', type: 'float', useNull:true}, | |
| 37 | - | |
| 38 | - //Time tick | |
| 39 | - {name: 'serie-timetick-activated', type: 'boolean'}, | |
| 40 | - {name: 'serie-timetick-type', type: 'string'}, | |
| 41 | - {name: 'serie-timetick-step', type: 'float'}, | |
| 42 | - {name: 'serie-timetick-nbmajor', type: 'int'}, | |
| 43 | - {name: 'serie-timetick-nbminor', type: 'int'}, | |
| 44 | - {name: 'serie-timetick-color', type: 'string'}, | |
| 45 | - {name: 'serie-timetick-symbols-type', type: 'string'}, | |
| 46 | - {name: 'serie-timetick-symbols-size', type: 'float'}, | |
| 47 | - {name: 'serie-timetick-symbols-color', type: 'string'}, | |
| 48 | - {name: 'serie-timetick-firstsymbols-activated', type: 'boolean'}, | |
| 49 | - {name: 'serie-timetick-firstsymbols-type', type: 'string'}, | |
| 50 | - {name: 'serie-timetick-firstsymbols-size', type: 'float'}, | |
| 51 | - {name: 'serie-timetick-firstsymbols-color', type: 'string'}, | |
| 52 | - {name: 'serie-timetick-font-activated', type: 'boolean'}, | |
| 53 | - {name: 'serie-timetick-font-name', type: 'string'}, | |
| 54 | - {name: 'serie-timetick-font-size', type: 'int'}, | |
| 55 | - {name: 'serie-timetick-font-bold', type: 'boolean'}, | |
| 56 | - {name: 'serie-timetick-font-italic', type: 'boolean'}, | |
| 57 | - | |
| 58 | - //Interval tick | |
| 59 | - {name: 'serie-intervaltick-activated', type: 'boolean'}, | |
| 60 | - {name: 'serie-intervaltick-mode', type: 'string'}, | |
| 61 | - {name: 'serie-intervaltick-color', type: 'string'}, | |
| 62 | - {name: 'serie-intervaltick-symbols-type', type: 'string'}, | |
| 63 | - {name: 'serie-intervaltick-symbols-size', type: 'float'}, | |
| 64 | - {name: 'serie-intervaltick-symbols-color', type: 'string'}, | |
| 65 | - {name: 'serie-intervaltick-font-activated', type: 'boolean'}, | |
| 66 | - {name: 'serie-intervaltick-font-name', type: 'string'}, | |
| 67 | - {name: 'serie-intervaltick-font-size', type: 'int'}, | |
| 68 | - {name: 'serie-intervaltick-font-bold', type: 'boolean'}, | |
| 69 | - {name: 'serie-intervaltick-font-italic', type: 'boolean'}, | |
| 17 | + extend: 'Ext.data.Model', | |
| 18 | + | |
| 19 | + requires: [ | |
| 20 | + 'amdaPlotObj.PlotObjectConfig' | |
| 70 | 21 | ], |
| 71 | - | |
| 72 | - constructor: function(){ | |
| 22 | + | |
| 23 | + fields: [ | |
| 24 | + {name: 'serie-yaxis', type: 'string'}, | |
| 25 | + {name: 'serie-resolution', type: 'int'}, | |
| 26 | + {name: 'serie-lines-activated', type: 'boolean'}, | |
| 27 | + {name: 'serie-lines-style', type: 'string'}, | |
| 28 | + {name: 'serie-lines-width', type: 'float'}, | |
| 29 | + {name: 'serie-lines-color', type: 'string'}, | |
| 30 | + {name: 'serie-symbols-activated', type: 'boolean'}, | |
| 31 | + {name: 'serie-symbols-type', type: 'string'}, | |
| 32 | + {name: 'serie-symbols-size', type: 'float'}, | |
| 33 | + {name: 'serie-symbols-color', type: 'string'}, | |
| 34 | + {name: 'serie-colored-param', type: 'string'}, | |
| 35 | + {name: 'serie-value-min', type: 'float', useNull: true}, | |
| 36 | + {name: 'serie-value-max', type: 'float', useNull: true}, | |
| 37 | + | |
| 38 | + //Time tick | |
| 39 | + {name: 'serie-timetick-activated', type: 'boolean'}, | |
| 40 | + {name: 'serie-timetick-type', type: 'string'}, | |
| 41 | + {name: 'serie-timetick-step', type: 'float'}, | |
| 42 | + {name: 'serie-timetick-nbmajor', type: 'int'}, | |
| 43 | + {name: 'serie-timetick-nbminor', type: 'int'}, | |
| 44 | + {name: 'serie-timetick-color', type: 'string'}, | |
| 45 | + {name: 'serie-timetick-symbols-type', type: 'string'}, | |
| 46 | + {name: 'serie-timetick-symbols-size', type: 'float'}, | |
| 47 | + {name: 'serie-timetick-symbols-color', type: 'string'}, | |
| 48 | + {name: 'serie-timetick-firstsymbols-activated', type: 'boolean'}, | |
| 49 | + {name: 'serie-timetick-firstsymbols-type', type: 'string'}, | |
| 50 | + {name: 'serie-timetick-firstsymbols-size', type: 'float'}, | |
| 51 | + {name: 'serie-timetick-firstsymbols-color', type: 'string'}, | |
| 52 | + {name: 'serie-timetick-font-activated', type: 'boolean'}, | |
| 53 | + {name: 'serie-timetick-font-name', type: 'string'}, | |
| 54 | + {name: 'serie-timetick-font-size', type: 'int'}, | |
| 55 | + {name: 'serie-timetick-font-bold', type: 'boolean'}, | |
| 56 | + {name: 'serie-timetick-font-italic', type: 'boolean'}, | |
| 57 | + | |
| 58 | + //Interval tick | |
| 59 | + {name: 'serie-intervaltick-activated', type: 'boolean'}, | |
| 60 | + {name: 'serie-intervaltick-mode', type: 'string'}, | |
| 61 | + {name: 'serie-intervaltick-color', type: 'string'}, | |
| 62 | + {name: 'serie-intervaltick-symbols-type', type: 'string'}, | |
| 63 | + {name: 'serie-intervaltick-symbols-size', type: 'float'}, | |
| 64 | + {name: 'serie-intervaltick-symbols-color', type: 'string'}, | |
| 65 | + {name: 'serie-intervaltick-font-activated', type: 'boolean'}, | |
| 66 | + {name: 'serie-intervaltick-font-name', type: 'string'}, | |
| 67 | + {name: 'serie-intervaltick-font-size', type: 'int'}, | |
| 68 | + {name: 'serie-intervaltick-font-bold', type: 'boolean'}, | |
| 69 | + {name: 'serie-intervaltick-font-italic', type: 'boolean'}, | |
| 70 | + //Filtering | |
| 71 | + {name: 'filtering-activated', type: 'boolean'}, | |
| 72 | + {name:'filtering-level', type:'int'} | |
| 73 | + ], | |
| 74 | + | |
| 75 | + constructor: function () { | |
| 73 | 76 | var me = this; |
| 74 | 77 | me.callParent(arguments); |
| 75 | 78 | if ((arguments.length > 0) && arguments[0]) |
| 76 | 79 | { |
| 77 | - } | |
| 78 | - else | |
| 80 | + } else | |
| 79 | 81 | { |
| 80 | - //new object, set default fields values | |
| 81 | - me.setDefaultValues(); | |
| 82 | + //new object, set default fields values | |
| 83 | + me.setDefaultValues(); | |
| 82 | 84 | } |
| 83 | 85 | this.dirty = false; |
| 84 | 86 | }, |
| 85 | - | |
| 86 | - setDefaultValues: function() | |
| 87 | + | |
| 88 | + setDefaultValues: function () | |
| 87 | 89 | { |
| 88 | - this.set('serie-yaxis', amdaPlotObj.PlotObjectConfig.defaultValues.serie.yAxis); | |
| 89 | - this.set('serie-resolution', amdaPlotObj.PlotObjectConfig.defaultValues.serie.resolution); | |
| 90 | - this.set('serie-lines-activated', true); | |
| 91 | - this.set('serie-lines-style', amdaPlotObj.PlotObjectConfig.defaultValues.serie.lines.style); | |
| 92 | - this.set('serie-lines-width', amdaPlotObj.PlotObjectConfig.defaultValues.serie.lines.width); | |
| 93 | - this.set('serie-lines-color', amdaPlotObj.PlotObjectConfig.defaultValues.serie.lines.color); | |
| 94 | - this.set('serie-symbols-activated', false); | |
| 95 | - this.set('serie-symbols-type', amdaPlotObj.PlotObjectConfig.defaultValues.serie.symbols.type); | |
| 96 | - this.set('serie-symbols-size', amdaPlotObj.PlotObjectConfig.defaultValues.serie.symbols.size); | |
| 97 | - this.set('serie-symbols-color', amdaPlotObj.PlotObjectConfig.defaultValues.serie.symbols.color); | |
| 98 | - this.set('serie-colored-param', ''); | |
| 99 | - | |
| 100 | - this.set('serie-timetick-activated', false); | |
| 101 | - this.set('serie-timetick-type', amdaPlotObj.PlotObjectConfig.defaultValues.serie.timetick.type); | |
| 102 | - this.set('serie-timetick-step', amdaPlotObj.PlotObjectConfig.defaultValues.serie.timetick.step); | |
| 103 | - this.set('serie-timetick-nbmajor', amdaPlotObj.PlotObjectConfig.defaultValues.serie.timetick.nbmajor); | |
| 104 | - this.set('serie-timetick-nbminor', amdaPlotObj.PlotObjectConfig.defaultValues.serie.timetick.nbminor); | |
| 105 | - this.set('serie-timetick-color', amdaPlotObj.PlotObjectConfig.defaultValues.serie.timetick.color); | |
| 106 | - this.set('serie-timetick-symbols-type', amdaPlotObj.PlotObjectConfig.defaultValues.serie.timetick.symbols.type); | |
| 107 | - this.set('serie-timetick-symbols-size', amdaPlotObj.PlotObjectConfig.defaultValues.serie.timetick.symbols.size); | |
| 108 | - this.set('serie-timetick-symbols-color', amdaPlotObj.PlotObjectConfig.defaultValues.serie.timetick.symbols.color); | |
| 109 | - this.set('serie-timetick-firstsymbols-activated', true); | |
| 110 | - this.set('serie-timetick-firstsymbols-type', amdaPlotObj.PlotObjectConfig.defaultValues.serie.timetick.firstsymbols.type); | |
| 111 | - this.set('serie-timetick-firstsymbols-size', amdaPlotObj.PlotObjectConfig.defaultValues.serie.timetick.firstsymbols.size); | |
| 112 | - this.set('serie-timetick-firstsymbols-color', amdaPlotObj.PlotObjectConfig.defaultValues.serie.timetick.firstsymbols.color); | |
| 113 | - this.set('serie-timetick-font-activated', false); | |
| 90 | + this.set('serie-yaxis', amdaPlotObj.PlotObjectConfig.defaultValues.serie.yAxis); | |
| 91 | + this.set('serie-resolution', amdaPlotObj.PlotObjectConfig.defaultValues.serie.resolution); | |
| 92 | + this.set('serie-lines-activated', true); | |
| 93 | + this.set('serie-lines-style', amdaPlotObj.PlotObjectConfig.defaultValues.serie.lines.style); | |
| 94 | + this.set('serie-lines-width', amdaPlotObj.PlotObjectConfig.defaultValues.serie.lines.width); | |
| 95 | + this.set('serie-lines-color', amdaPlotObj.PlotObjectConfig.defaultValues.serie.lines.color); | |
| 96 | + this.set('serie-symbols-activated', false); | |
| 97 | + this.set('serie-symbols-type', amdaPlotObj.PlotObjectConfig.defaultValues.serie.symbols.type); | |
| 98 | + this.set('serie-symbols-size', amdaPlotObj.PlotObjectConfig.defaultValues.serie.symbols.size); | |
| 99 | + this.set('serie-symbols-color', amdaPlotObj.PlotObjectConfig.defaultValues.serie.symbols.color); | |
| 100 | + this.set('serie-colored-param', ''); | |
| 101 | + | |
| 102 | + this.set('serie-timetick-activated', false); | |
| 103 | + this.set('serie-timetick-type', amdaPlotObj.PlotObjectConfig.defaultValues.serie.timetick.type); | |
| 104 | + this.set('serie-timetick-step', amdaPlotObj.PlotObjectConfig.defaultValues.serie.timetick.step); | |
| 105 | + this.set('serie-timetick-nbmajor', amdaPlotObj.PlotObjectConfig.defaultValues.serie.timetick.nbmajor); | |
| 106 | + this.set('serie-timetick-nbminor', amdaPlotObj.PlotObjectConfig.defaultValues.serie.timetick.nbminor); | |
| 107 | + this.set('serie-timetick-color', amdaPlotObj.PlotObjectConfig.defaultValues.serie.timetick.color); | |
| 108 | + this.set('serie-timetick-symbols-type', amdaPlotObj.PlotObjectConfig.defaultValues.serie.timetick.symbols.type); | |
| 109 | + this.set('serie-timetick-symbols-size', amdaPlotObj.PlotObjectConfig.defaultValues.serie.timetick.symbols.size); | |
| 110 | + this.set('serie-timetick-symbols-color', amdaPlotObj.PlotObjectConfig.defaultValues.serie.timetick.symbols.color); | |
| 111 | + this.set('serie-timetick-firstsymbols-activated', true); | |
| 112 | + this.set('serie-timetick-firstsymbols-type', amdaPlotObj.PlotObjectConfig.defaultValues.serie.timetick.firstsymbols.type); | |
| 113 | + this.set('serie-timetick-firstsymbols-size', amdaPlotObj.PlotObjectConfig.defaultValues.serie.timetick.firstsymbols.size); | |
| 114 | + this.set('serie-timetick-firstsymbols-color', amdaPlotObj.PlotObjectConfig.defaultValues.serie.timetick.firstsymbols.color); | |
| 115 | + this.set('serie-timetick-font-activated', false); | |
| 114 | 116 | this.set('serie-timetick-font-name', amdaPlotObj.PlotObjectConfig.defaultValues.serie.timetick.font.name); |
| 115 | 117 | this.set('serie-timetick-font-size', amdaPlotObj.PlotObjectConfig.defaultValues.serie.timetick.font.size); |
| 116 | 118 | this.set('serie-timetick-font-bold', false); |
| 117 | 119 | this.set('serie-timetick-font-italic', false); |
| 118 | - | |
| 119 | - this.set('serie-intervaltick-activated', false); | |
| 120 | - this.set('serie-intervaltick-mode', amdaPlotObj.PlotObjectConfig.defaultValues.serie.intervaltick.mode); | |
| 121 | - this.set('serie-intervaltick-color', amdaPlotObj.PlotObjectConfig.defaultValues.serie.intervaltick.color); | |
| 122 | - this.set('serie-intervaltick-symbols-type', amdaPlotObj.PlotObjectConfig.defaultValues.serie.intervaltick.symbols.type); | |
| 123 | - this.set('serie-intervaltick-symbols-size', amdaPlotObj.PlotObjectConfig.defaultValues.serie.intervaltick.symbols.size); | |
| 124 | - this.set('serie-intervaltick-symbols-color', amdaPlotObj.PlotObjectConfig.defaultValues.serie.intervaltick.symbols.color); | |
| 125 | - this.set('serie-intervaltick-font-activated', false); | |
| 126 | - this.set('serie-intervaltick-font-name', amdaPlotObj.PlotObjectConfig.defaultValues.serie.intervaltick.font.name); | |
| 127 | - this.set('serie-intervaltick-font-size', amdaPlotObj.PlotObjectConfig.defaultValues.serie.intervaltick.font.size); | |
| 128 | - this.set('serie-intervaltick-font-bold', false); | |
| 129 | - this.set('serie-intervaltick-font-italic', false); | |
| 120 | + | |
| 121 | + this.set('serie-intervaltick-activated', false); | |
| 122 | + this.set('serie-intervaltick-mode', amdaPlotObj.PlotObjectConfig.defaultValues.serie.intervaltick.mode); | |
| 123 | + this.set('serie-intervaltick-color', amdaPlotObj.PlotObjectConfig.defaultValues.serie.intervaltick.color); | |
| 124 | + this.set('serie-intervaltick-symbols-type', amdaPlotObj.PlotObjectConfig.defaultValues.serie.intervaltick.symbols.type); | |
| 125 | + this.set('serie-intervaltick-symbols-size', amdaPlotObj.PlotObjectConfig.defaultValues.serie.intervaltick.symbols.size); | |
| 126 | + this.set('serie-intervaltick-symbols-color', amdaPlotObj.PlotObjectConfig.defaultValues.serie.intervaltick.symbols.color); | |
| 127 | + this.set('serie-intervaltick-font-activated', false); | |
| 128 | + this.set('serie-intervaltick-font-name', amdaPlotObj.PlotObjectConfig.defaultValues.serie.intervaltick.font.name); | |
| 129 | + this.set('serie-intervaltick-font-size', amdaPlotObj.PlotObjectConfig.defaultValues.serie.intervaltick.font.size); | |
| 130 | + this.set('serie-intervaltick-font-bold', false); | |
| 131 | + this.set('serie-intervaltick-font-italic', false); | |
| 132 | + | |
| 133 | + // filtering | |
| 134 | + this.set( 'filtering-activated', false); | |
| 135 | + this.set('filtering-level', amdaPlotObj.PlotObjectConfig.defaultValues.filtering.level); | |
| 130 | 136 | }, |
| 131 | - | |
| 132 | - loadFromData : function(drawData) | |
| 137 | + | |
| 138 | + loadFromData: function (drawData) | |
| 133 | 139 | { |
| 134 | - Ext.Object.each(drawData, function(key, value) { | |
| 135 | - if (key == 'type') | |
| 136 | - return; | |
| 137 | - this.set(key, value); | |
| 138 | - }, this); | |
| 140 | + Ext.Object.each(drawData, function (key, value) { | |
| 141 | + if (key == 'type') | |
| 142 | + return; | |
| 143 | + this.set(key, value); | |
| 144 | + }, this); | |
| 139 | 145 | }, |
| 140 | - | |
| 141 | - getJsonValues : function() | |
| 146 | + | |
| 147 | + getJsonValues: function () | |
| 142 | 148 | { |
| 143 | - var serieValues = new Object(); | |
| 144 | - | |
| 145 | - serieValues['serie-yaxis'] = this.get('serie-yaxis'); | |
| 146 | - serieValues['serie-resolution'] = this.get('serie-resolution'); | |
| 147 | - serieValues['serie-lines-activated'] = this.get('serie-lines-activated'); | |
| 148 | - serieValues['serie-lines-style'] = this.get('serie-lines-style'); | |
| 149 | - serieValues['serie-lines-width'] = this.get('serie-lines-width'); | |
| 150 | - serieValues['serie-lines-color'] = this.get('serie-lines-color'); | |
| 151 | - serieValues['serie-symbols-activated'] = this.get('serie-symbols-activated'); | |
| 152 | - serieValues['serie-symbols-type'] = this.get('serie-symbols-type'); | |
| 153 | - serieValues['serie-symbols-size'] = this.get('serie-symbols-size'); | |
| 154 | - serieValues['serie-symbols-color'] = this.get('serie-symbols-color'); | |
| 155 | - serieValues['serie-colored-param'] = this.get('serie-colored-param'); | |
| 156 | - serieValues['serie-value-min'] = this.get('serie-value-min'); | |
| 157 | - serieValues['serie-value-max'] = this.get('serie-value-max'); | |
| 158 | - | |
| 159 | - serieValues['serie-timetick-activated'] = this.get('serie-timetick-activated'); | |
| 160 | - serieValues['serie-timetick-type'] = this.get('serie-timetick-type'); | |
| 161 | - serieValues['serie-timetick-step'] = this.get('serie-timetick-step'); | |
| 162 | - serieValues['serie-timetick-nbmajor'] = this.get('serie-timetick-nbmajor'); | |
| 163 | - serieValues['serie-timetick-nbminor'] = this.get('serie-timetick-nbminor'); | |
| 164 | - serieValues['serie-timetick-color'] = this.get('serie-timetick-color'); | |
| 165 | - serieValues['serie-timetick-symbols-type'] = this.get('serie-timetick-symbols-type'); | |
| 166 | - serieValues['serie-timetick-symbols-size'] = this.get('serie-timetick-symbols-size'); | |
| 167 | - serieValues['serie-timetick-symbols-color'] = this.get('serie-timetick-symbols-color'); | |
| 168 | - serieValues['serie-timetick-firstsymbols-activated'] = this.get('serie-timetick-firstsymbols-activated'); | |
| 169 | - serieValues['serie-timetick-firstsymbols-type'] = this.get('serie-timetick-firstsymbols-type'); | |
| 170 | - serieValues['serie-timetick-firstsymbols-size'] = this.get('serie-timetick-firstsymbols-size'); | |
| 171 | - serieValues['serie-timetick-firstsymbols-color'] = this.get('serie-timetick-firstsymbols-color'); | |
| 172 | - serieValues['serie-timetick-font-activated'] = this.get('serie-timetick-font-activated'); | |
| 173 | - serieValues['serie-timetick-font-name'] = this.get('serie-timetick-font-name'); | |
| 174 | - serieValues['serie-timetick-font-size'] = this.get('serie-timetick-font-size'); | |
| 175 | - serieValues['serie-timetick-font-bold'] = this.get('serie-timetick-font-bold'); | |
| 176 | - serieValues['serie-timetick-font-italic'] = this.get('serie-timetick-font-italic'); | |
| 177 | - | |
| 178 | - serieValues['serie-intervaltick-activated'] = this.get('serie-intervaltick-activated'); | |
| 179 | - serieValues['serie-intervaltick-mode'] = this.get('serie-intervaltick-mode'); | |
| 180 | - serieValues['serie-intervaltick-color'] = this.get('serie-intervaltick-color'); | |
| 181 | - serieValues['serie-intervaltick-symbols-type'] = this.get('serie-intervaltick-symbols-type'); | |
| 182 | - serieValues['serie-intervaltick-symbols-size'] = this.get('serie-intervaltick-symbols-size'); | |
| 183 | - serieValues['serie-intervaltick-symbols-color'] = this.get('serie-intervaltick-symbols-color'); | |
| 184 | - serieValues['serie-intervaltick-font-activated'] = this.get('serie-intervaltick-font-activated'); | |
| 185 | - serieValues['serie-intervaltick-font-name'] = this.get('serie-intervaltick-font-name'); | |
| 186 | - serieValues['serie-intervaltick-font-size'] = this.get('serie-intervaltick-font-size'); | |
| 187 | - serieValues['serie-intervaltick-font-bold'] = this.get('serie-intervaltick-font-bold'); | |
| 188 | - serieValues['serie-intervaltick-font-italic'] = this.get('serie-intervaltick-font-italic'); | |
| 189 | - | |
| 190 | - return serieValues; | |
| 149 | + var serieValues = new Object(); | |
| 150 | + | |
| 151 | + serieValues['serie-yaxis'] = this.get('serie-yaxis'); | |
| 152 | + serieValues['serie-resolution'] = this.get('serie-resolution'); | |
| 153 | + serieValues['serie-lines-activated'] = this.get('serie-lines-activated'); | |
| 154 | + serieValues['serie-lines-style'] = this.get('serie-lines-style'); | |
| 155 | + serieValues['serie-lines-width'] = this.get('serie-lines-width'); | |
| 156 | + serieValues['serie-lines-color'] = this.get('serie-lines-color'); | |
| 157 | + serieValues['serie-symbols-activated'] = this.get('serie-symbols-activated'); | |
| 158 | + serieValues['serie-symbols-type'] = this.get('serie-symbols-type'); | |
| 159 | + serieValues['serie-symbols-size'] = this.get('serie-symbols-size'); | |
| 160 | + serieValues['serie-symbols-color'] = this.get('serie-symbols-color'); | |
| 161 | + serieValues['serie-colored-param'] = this.get('serie-colored-param'); | |
| 162 | + serieValues['serie-value-min'] = this.get('serie-value-min'); | |
| 163 | + serieValues['serie-value-max'] = this.get('serie-value-max'); | |
| 164 | + | |
| 165 | + serieValues['serie-timetick-activated'] = this.get('serie-timetick-activated'); | |
| 166 | + serieValues['serie-timetick-type'] = this.get('serie-timetick-type'); | |
| 167 | + serieValues['serie-timetick-step'] = this.get('serie-timetick-step'); | |
| 168 | + serieValues['serie-timetick-nbmajor'] = this.get('serie-timetick-nbmajor'); | |
| 169 | + serieValues['serie-timetick-nbminor'] = this.get('serie-timetick-nbminor'); | |
| 170 | + serieValues['serie-timetick-color'] = this.get('serie-timetick-color'); | |
| 171 | + serieValues['serie-timetick-symbols-type'] = this.get('serie-timetick-symbols-type'); | |
| 172 | + serieValues['serie-timetick-symbols-size'] = this.get('serie-timetick-symbols-size'); | |
| 173 | + serieValues['serie-timetick-symbols-color'] = this.get('serie-timetick-symbols-color'); | |
| 174 | + serieValues['serie-timetick-firstsymbols-activated'] = this.get('serie-timetick-firstsymbols-activated'); | |
| 175 | + serieValues['serie-timetick-firstsymbols-type'] = this.get('serie-timetick-firstsymbols-type'); | |
| 176 | + serieValues['serie-timetick-firstsymbols-size'] = this.get('serie-timetick-firstsymbols-size'); | |
| 177 | + serieValues['serie-timetick-firstsymbols-color'] = this.get('serie-timetick-firstsymbols-color'); | |
| 178 | + serieValues['serie-timetick-font-activated'] = this.get('serie-timetick-font-activated'); | |
| 179 | + serieValues['serie-timetick-font-name'] = this.get('serie-timetick-font-name'); | |
| 180 | + serieValues['serie-timetick-font-size'] = this.get('serie-timetick-font-size'); | |
| 181 | + serieValues['serie-timetick-font-bold'] = this.get('serie-timetick-font-bold'); | |
| 182 | + serieValues['serie-timetick-font-italic'] = this.get('serie-timetick-font-italic'); | |
| 183 | + | |
| 184 | + serieValues['serie-intervaltick-activated'] = this.get('serie-intervaltick-activated'); | |
| 185 | + serieValues['serie-intervaltick-mode'] = this.get('serie-intervaltick-mode'); | |
| 186 | + serieValues['serie-intervaltick-color'] = this.get('serie-intervaltick-color'); | |
| 187 | + serieValues['serie-intervaltick-symbols-type'] = this.get('serie-intervaltick-symbols-type'); | |
| 188 | + serieValues['serie-intervaltick-symbols-size'] = this.get('serie-intervaltick-symbols-size'); | |
| 189 | + serieValues['serie-intervaltick-symbols-color'] = this.get('serie-intervaltick-symbols-color'); | |
| 190 | + serieValues['serie-intervaltick-font-activated'] = this.get('serie-intervaltick-font-activated'); | |
| 191 | + serieValues['serie-intervaltick-font-name'] = this.get('serie-intervaltick-font-name'); | |
| 192 | + serieValues['serie-intervaltick-font-size'] = this.get('serie-intervaltick-font-size'); | |
| 193 | + serieValues['serie-intervaltick-font-bold'] = this.get('serie-intervaltick-font-bold'); | |
| 194 | + serieValues['serie-intervaltick-font-italic'] = this.get('serie-intervaltick-font-italic'); | |
| 195 | + | |
| 196 | + serieValues['filtering-activated'] = this.get('filtering-activated'); | |
| 197 | + serieValues['filtering-level'] = this.get('filtering-level'); | |
| 198 | + | |
| 199 | + return serieValues; | |
| 191 | 200 | } |
| 192 | 201 | }); |
| ... | ... |
js/app/models/PlotObjects/PlotObjectConfig.js
| ... | ... | @@ -137,7 +137,8 @@ Ext.define('amdaPlotObj.PlotObjectConfig', { |
| 137 | 137 | color : 'auto' |
| 138 | 138 | } |
| 139 | 139 | }, |
| 140 | - projection : 'XY' | |
| 140 | + projection : 'XY', | |
| 141 | + | |
| 141 | 142 | }, |
| 142 | 143 | spectro : { |
| 143 | 144 | yAxis : 'y-left', |
| ... | ... | @@ -200,7 +201,10 @@ Ext.define('amdaPlotObj.PlotObjectConfig', { |
| 200 | 201 | type : 'serie-constant', |
| 201 | 202 | greaterColor : 'none', |
| 202 | 203 | lessColor : 'none' |
| 203 | - } | |
| 204 | + }, | |
| 205 | + filtering:{ | |
| 206 | + level:1 | |
| 207 | + } | |
| 204 | 208 | }, |
| 205 | 209 | |
| 206 | 210 | getValueByKey : function(dataList, key) |
| ... | ... | @@ -478,6 +482,12 @@ Ext.define('amdaPlotObj.PlotObjectConfig', { |
| 478 | 482 | {'key' : 'linear', 'value' : 'Linear'}, |
| 479 | 483 | {'key' : 'log', 'value' : 'Logarithmic'} |
| 480 | 484 | ], |
| 485 | + | |
| 486 | + availableFilteringLevel : [ | |
| 487 | + {'key' : 1, 'value' : 'Low'}, | |
| 488 | + {'key' : 2, 'value' : 'Medium'}, | |
| 489 | + {'key' : 3, 'value' : 'Strong'} | |
| 490 | + ], | |
| 481 | 491 | |
| 482 | 492 | getParamConfig : function(paramId, onParamConfigLoaded) { |
| 483 | 493 | AmdaAction.getParamPlotInit({"paramId" : paramId}, function (result, e) { |
| ... | ... |
js/app/models/RequestParamObject.js
| ... | ... | @@ -64,9 +64,6 @@ Ext.define('amdaModel.RequestParamObject', { |
| 64 | 64 | {name: 'template_args', type: 'auto', defaultValue: null}, |
| 65 | 65 | /* ?? */ |
| 66 | 66 | {name: 'plotonly', type: 'bool', defaultValue: false}, |
| 67 | - {name:'filter_spikes', type:'bool', defaultValue: true}, | |
| 68 | - {name: 'filter_spikes_factor', type: 'float', defaultValue: 5}, | |
| 69 | - {name: 'filter_spikes_nPoints', type: 'int', defaultValue: 100} | |
| 70 | 67 | ], |
| 71 | 68 | |
| 72 | 69 | getDimSum : function(dim) { |
| ... | ... | @@ -158,11 +155,7 @@ Ext.define('amdaModel.RequestParamObject', { |
| 158 | 155 | |
| 159 | 156 | paramValues['type'] = this.get('type'); |
| 160 | 157 | paramValues['is-init'] = this.get('is-init'); |
| 161 | - | |
| 162 | - paramValues['filter_spikes'] = this.get('filter_spikes'); | |
| 163 | - paramValues['filter_spikes_factor'] = this.get('filter_spikes_factor'); | |
| 164 | - paramValues['filter_spikes_nPoints'] = this.get('filter_spikes_nPoints'); | |
| 165 | - | |
| 158 | + | |
| 166 | 159 | if (this.get('template_args') != null) { |
| 167 | 160 | paramValues['template_args'] = new Object(); |
| 168 | 161 | Ext.Object.each(this.get('template_args'), function (argKey, argValue) { |
| ... | ... |
js/app/views/PlotComponents/PlotBaseSerieForm.js
| ... | ... | @@ -81,6 +81,11 @@ Ext.define('amdaPlotComp.PlotBaseSerieForm', { |
| 81 | 81 | this.addStandardFloat2('serie-value-max', 'Max value', -Number.MAX_VALUE, Number.MAX_VALUE, true) |
| 82 | 82 | ]; |
| 83 | 83 | }, |
| 84 | + getFilteringItems: function(){ | |
| 85 | + return[ | |
| 86 | + this.addStandardCombo('filtering-level', 'Level', amdaPlotObj.PlotObjectConfig.availableFilteringLevel) | |
| 87 | + ]; | |
| 88 | + }, | |
| 84 | 89 | |
| 85 | 90 | getFormItems: function() { |
| 86 | 91 | var me = this; |
| ... | ... | @@ -93,13 +98,14 @@ Ext.define('amdaPlotComp.PlotBaseSerieForm', { |
| 93 | 98 | me.object.set('serie-yaxis', value); |
| 94 | 99 | me.crtTree.refresh(); |
| 95 | 100 | }), |
| 96 | - myDesktopApp.addAmdaInfo('MinMaxThreshold','vertical-align:bottom'), | |
| 101 | + myDesktopApp.addAmdaInfo('MinMaxThreshold','vertical-align:bottom'), | |
| 97 | 102 | this.addStandardFieldSet('Min/Max thresholds', '', this.getValuesRangeItems()), |
| 98 | 103 | this.addStandardParamDropTarget('serie-colored-param', 'Colored Parameter'), |
| 99 | 104 | this.addStandardFieldSet('Lines', 'serie-lines-activated', this.addStandardLineItems('serie-lines')), |
| 100 | 105 | this.addStandardFieldSet('Symbols', 'serie-symbols-activated', this.addStandardSymbolsItems('serie-symbols')), |
| 101 | 106 | this.addStandardFieldSet('Time ticks', 'serie-timetick-activated', this.getTimeTickItems()), |
| 102 | - this.addStandardFieldSet('Interval ticks', 'serie-intervaltick-activated', this.getIntervalTickItems()) | |
| 107 | + this.addStandardFieldSet('Interval ticks', 'serie-intervaltick-activated', this.getIntervalTickItems()), | |
| 108 | + this.addStandardFieldSet('Filtering', 'filtering-activated', this.getFilteringItems()) | |
| 103 | 109 | ]; |
| 104 | 110 | } |
| 105 | 111 | }); |
| ... | ... |