Commit 23cf3fbbc5915020d58798fc32d3f75014663bda
1 parent
3f809629
Exists in
amdadev
and in
2 other branches
#9629 - Done
Showing
4 changed files
with
28 additions
and
0 deletions
Show diff stats
generic_data/defaultValues.json
generic_data/defaultValuesLinks.json
| ... | ... | @@ -151,6 +151,16 @@ |
| 151 | 151 | "type":"colorpicker", |
| 152 | 152 | "store":null |
| 153 | 153 | }, |
| 154 | + "plot.serie.timetick.lastsymbols.type": | |
| 155 | + { | |
| 156 | + "type":"combobox", | |
| 157 | + "store":"availableSymbolsTypes" | |
| 158 | + }, | |
| 159 | + "plot.serie.timetick.lastsymbols.color": | |
| 160 | + { | |
| 161 | + "type":"colorpicker", | |
| 162 | + "store":null | |
| 163 | + }, | |
| 154 | 164 | "plot.serie.timetick.font.name": |
| 155 | 165 | { |
| 156 | 166 | "type":"combobox", | ... | ... |
js/app/models/PlotObjects/PlotBaseSerieObject.js
| ... | ... | @@ -45,6 +45,10 @@ Ext.define('amdaPlotObj.PlotBaseSerieObject', { |
| 45 | 45 | {name: 'serie-timetick-firstsymbols-type', type: 'string'}, |
| 46 | 46 | {name: 'serie-timetick-firstsymbols-size', type: 'float'}, |
| 47 | 47 | {name: 'serie-timetick-firstsymbols-color', type: 'string'}, |
| 48 | + {name: 'serie-timetick-lastsymbols-activated', type: 'boolean'}, | |
| 49 | + {name: 'serie-timetick-lastsymbols-type', type: 'string'}, | |
| 50 | + {name: 'serie-timetick-lastsymbols-size', type: 'float'}, | |
| 51 | + {name: 'serie-timetick-lastsymbols-color', type: 'string'}, | |
| 48 | 52 | {name: 'serie-timetick-font-activated', type: 'boolean'}, |
| 49 | 53 | {name: 'serie-timetick-font-name', type: 'string'}, |
| 50 | 54 | {name: 'serie-timetick-font-size', type: 'int'}, |
| ... | ... | @@ -110,6 +114,10 @@ Ext.define('amdaPlotObj.PlotBaseSerieObject', { |
| 110 | 114 | this.set('serie-timetick-firstsymbols-type', amdaDefaultValues.plot.serie.timetick.firstsymbols.type); |
| 111 | 115 | this.set('serie-timetick-firstsymbols-size', amdaDefaultValues.plot.serie.timetick.firstsymbols.size); |
| 112 | 116 | this.set('serie-timetick-firstsymbols-color', amdaDefaultValues.plot.serie.timetick.firstsymbols.color); |
| 117 | + this.set('serie-timetick-lastsymbols-activated', true); | |
| 118 | + this.set('serie-timetick-lastsymbols-type', amdaDefaultValues.plot.serie.timetick.lastsymbols.type); | |
| 119 | + this.set('serie-timetick-lastsymbols-size', amdaDefaultValues.plot.serie.timetick.lastsymbols.size); | |
| 120 | + this.set('serie-timetick-lastsymbols-color', amdaDefaultValues.plot.serie.timetick.lastsymbols.color); | |
| 113 | 121 | this.set('serie-timetick-font-activated', false); |
| 114 | 122 | this.set('serie-timetick-font-name', amdaDefaultValues.plot.serie.timetick.font.name); |
| 115 | 123 | this.set('serie-timetick-font-size', amdaDefaultValues.plot.serie.timetick.font.size); |
| ... | ... | @@ -175,6 +183,10 @@ Ext.define('amdaPlotObj.PlotBaseSerieObject', { |
| 175 | 183 | serieValues['serie-timetick-firstsymbols-type'] = this.get('serie-timetick-firstsymbols-type'); |
| 176 | 184 | serieValues['serie-timetick-firstsymbols-size'] = this.get('serie-timetick-firstsymbols-size'); |
| 177 | 185 | serieValues['serie-timetick-firstsymbols-color'] = this.get('serie-timetick-firstsymbols-color'); |
| 186 | + serieValues['serie-timetick-lastsymbols-activated'] = this.get('serie-timetick-lastsymbols-activated'); | |
| 187 | + serieValues['serie-timetick-lastsymbols-type'] = this.get('serie-timetick-lastsymbols-type'); | |
| 188 | + serieValues['serie-timetick-lastsymbols-size'] = this.get('serie-timetick-lastsymbols-size'); | |
| 189 | + serieValues['serie-timetick-lastsymbols-color'] = this.get('serie-timetick-lastsymbols-color'); | |
| 178 | 190 | serieValues['serie-timetick-font-activated'] = this.get('serie-timetick-font-activated'); |
| 179 | 191 | serieValues['serie-timetick-font-name'] = this.get('serie-timetick-font-name'); |
| 180 | 192 | serieValues['serie-timetick-font-size'] = this.get('serie-timetick-font-size'); | ... | ... |
js/app/views/PlotComponents/PlotBaseSerieForm.js
| ... | ... | @@ -62,6 +62,7 @@ Ext.define('amdaPlotComp.PlotBaseSerieForm', { |
| 62 | 62 | this.addColorsPicker('serie-timetick-color', 'Color', amdaDefaultConfigs.availableColorsNew), |
| 63 | 63 | this.addStandardFieldSet('Symbols', '', this.addStandardSymbolsItems('serie-timetick-symbols')), |
| 64 | 64 | this.addStandardFieldSet('First symbol', 'serie-timetick-firstsymbols-activated', this.addStandardSymbolsItems('serie-timetick-firstsymbols')), |
| 65 | + this.addStandardFieldSet('Last symbol', 'serie-timetick-lastsymbols-activated', this.addStandardSymbolsItems('serie-timetick-lastsymbols')), | |
| 65 | 66 | this.addStandardFont('serie-timetick-font') |
| 66 | 67 | ]; |
| 67 | 68 | }, | ... | ... |