diff --git a/generic_data/defaultValues.json b/generic_data/defaultValues.json index c71db80..71195db 100644 --- a/generic_data/defaultValues.json +++ b/generic_data/defaultValues.json @@ -113,6 +113,11 @@ "size":10, "color":"#FF0000" }, + "lastsymbols":{ + "type":"triangle", + "size":4, + "color":"#0000FF" + }, "font":{ "name":"sans-serif", "size":8 diff --git a/generic_data/defaultValuesLinks.json b/generic_data/defaultValuesLinks.json index 757c5cd..c38d52a 100644 --- a/generic_data/defaultValuesLinks.json +++ b/generic_data/defaultValuesLinks.json @@ -181,6 +181,16 @@ "type":"colorpicker", "store":null }, + "plot.serie.intervaltick.lastsymbols.type": + { + "type":"combobox", + "store":"availableSymbolsTypes" + }, + "plot.serie.intervaltick.lastsymbols.color": + { + "type":"colorpicker", + "store":null + }, "plot.serie.intervaltick.font.name": { "type":"combobox", diff --git a/js/app/models/PlotObjects/PlotBaseSerieObject.js b/js/app/models/PlotObjects/PlotBaseSerieObject.js index 635ac03..1e85e6f 100644 --- a/js/app/models/PlotObjects/PlotBaseSerieObject.js +++ b/js/app/models/PlotObjects/PlotBaseSerieObject.js @@ -23,7 +23,7 @@ Ext.define('amdaPlotObj.PlotBaseSerieObject', { {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-activated', type: 'boolean'}, {name: 'serie-symbols-type', type: 'string'}, {name: 'serie-symbols-size', type: 'float'}, {name: 'serie-symbols-color', type: 'string'}, @@ -62,6 +62,10 @@ Ext.define('amdaPlotObj.PlotBaseSerieObject', { {name: 'serie-intervaltick-symbols-type', type: 'string'}, {name: 'serie-intervaltick-symbols-size', type: 'float'}, {name: 'serie-intervaltick-symbols-color', type: 'string'}, + {name: 'serie-intervaltick-lastsymbols-activated', type: 'boolean'}, + {name: 'serie-intervaltick-lastsymbols-type', type: 'string'}, + {name: 'serie-intervaltick-lastsymbols-size', type: 'float'}, + {name: 'serie-intervaltick-lastsymbols-color', type: 'string'}, {name: 'serie-intervaltick-font-activated', type: 'boolean'}, {name: 'serie-intervaltick-font-name', type: 'string'}, {name: 'serie-intervaltick-font-size', type: 'int'}, @@ -114,7 +118,7 @@ Ext.define('amdaPlotObj.PlotBaseSerieObject', { this.set('serie-timetick-firstsymbols-type', amdaDefaultValues.plot.serie.timetick.firstsymbols.type); this.set('serie-timetick-firstsymbols-size', amdaDefaultValues.plot.serie.timetick.firstsymbols.size); this.set('serie-timetick-firstsymbols-color', amdaDefaultValues.plot.serie.timetick.firstsymbols.color); - this.set('serie-timetick-lastsymbols-activated', true); + this.set('serie-timetick-lastsymbols-activated', false); this.set('serie-timetick-lastsymbols-type', amdaDefaultValues.plot.serie.timetick.lastsymbols.type); this.set('serie-timetick-lastsymbols-size', amdaDefaultValues.plot.serie.timetick.lastsymbols.size); this.set('serie-timetick-lastsymbols-color', amdaDefaultValues.plot.serie.timetick.lastsymbols.color); @@ -130,6 +134,10 @@ Ext.define('amdaPlotObj.PlotBaseSerieObject', { this.set('serie-intervaltick-symbols-type', amdaDefaultValues.plot.serie.intervaltick.symbols.type); this.set('serie-intervaltick-symbols-size', amdaDefaultValues.plot.serie.intervaltick.symbols.size); this.set('serie-intervaltick-symbols-color', amdaDefaultValues.plot.serie.intervaltick.symbols.color); + this.set('serie-intervaltick-lastsymbols-activated', false); + this.set('serie-intervaltick-lastsymbols-type', amdaDefaultValues.plot.serie.intervaltick.lastsymbols.type); + this.set('serie-intervaltick-lastsymbols-size', amdaDefaultValues.plot.serie.intervaltick.lastsymbols.size); + this.set('serie-intervaltick-lastsymbols-color', amdaDefaultValues.plot.serie.intervaltick.lastsymbols.color); this.set('serie-intervaltick-font-activated', false); this.set('serie-intervaltick-font-name', amdaDefaultValues.plot.serie.intervaltick.font.name); this.set('serie-intervaltick-font-size', amdaDefaultValues.plot.serie.intervaltick.font.size); @@ -199,6 +207,10 @@ Ext.define('amdaPlotObj.PlotBaseSerieObject', { 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-lastsymbols-activated'] = this.get('serie-intervaltick-lastsymbols-activated'); + serieValues['serie-intervaltick-lastsymbols-type'] = this.get('serie-intervaltick-lastsymbols-type'); + serieValues['serie-intervaltick-lastsymbols-size'] = this.get('serie-intervaltick-lastsymbols-size'); + serieValues['serie-intervaltick-lastsymbols-color'] = this.get('serie-intervaltick-lastsymbols-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'); diff --git a/js/app/views/PlotComponents/PlotBaseSerieForm.js b/js/app/views/PlotComponents/PlotBaseSerieForm.js index ead0b4f..46ec613 100644 --- a/js/app/views/PlotComponents/PlotBaseSerieForm.js +++ b/js/app/views/PlotComponents/PlotBaseSerieForm.js @@ -74,6 +74,7 @@ Ext.define('amdaPlotComp.PlotBaseSerieForm', { this.addStandardCombo('serie-intervaltick-mode', 'Mode', amdaDefaultConfigs.availableIntervalTickModes), this.addColorsPicker('serie-intervaltick-color', 'Color', amdaDefaultConfigs.availableColorsNew), this.addStandardFieldSet('Symbols', '', this.addStandardSymbolsItems('serie-intervaltick-symbols')), + this.addStandardFieldSet('Last symbol', 'serie-intervaltick-lastsymbols-activated', this.addStandardSymbolsItems('serie-intervaltick-lastsymbols')), this.addStandardFont('serie-intervaltick-font') ]; }, @@ -107,8 +108,8 @@ Ext.define('amdaPlotComp.PlotBaseSerieForm', { 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('Spike Filtering ( ! Experimental ! )', 'filtering-activated', this.getFilteringItems()) + this.addStandardFieldSet('Interval ticks', 'serie-intervaltick-activated', this.getIntervalTickItems()), + this.addStandardFieldSet('Spike Filtering ( ! Experimental ! )', 'filtering-activated', this.getFilteringItems()) ]; } }); -- libgit2 0.21.2