diff --git a/js/app/models/PlotObjects/PlotIntervalsObject.js b/js/app/models/PlotObjects/PlotIntervalsObject.js index 1e40b82..6cc629a 100644 --- a/js/app/models/PlotObjects/PlotIntervalsObject.js +++ b/js/app/models/PlotObjects/PlotIntervalsObject.js @@ -20,7 +20,8 @@ Ext.define('amdaPlotObj.PlotIntervalsObject', { 'amdaPlotObj.PlotObjectConfig' ], - fields : [ + fields: [ + { name: 'intervals-color', type: 'string', defaultValue: "none", }, ], constructor: function(){ @@ -39,12 +40,14 @@ Ext.define('amdaPlotObj.PlotIntervalsObject', { setDefaultValues: function() { + this.set('intervals-color', amdaPlotObj.PlotObjectConfig.defaultValues.intervals.color); }, getJsonValues : function() { var intervalsValues = new Object(); - + intervalsValues['intervals-color'] = this.get('intervals-color'); + return intervalsValues; } }); diff --git a/js/app/models/PlotObjects/PlotObjectConfig.js b/js/app/models/PlotObjects/PlotObjectConfig.js index 712b4fa..068461b 100644 --- a/js/app/models/PlotObjects/PlotObjectConfig.js +++ b/js/app/models/PlotObjects/PlotObjectConfig.js @@ -147,6 +147,12 @@ Ext.define('amdaPlotObj.PlotObjectConfig', { yAxis: 'y-right', resolution: 3000 }, + intervals: { + color: "none" + }, + statusbar: { + color: "none" + }, legends: { series: { type: 'text-only', diff --git a/js/app/models/PlotObjects/PlotStatusBarObject.js b/js/app/models/PlotObjects/PlotStatusBarObject.js index 9e58b4d..8914a98 100644 --- a/js/app/models/PlotObjects/PlotStatusBarObject.js +++ b/js/app/models/PlotObjects/PlotStatusBarObject.js @@ -1,11 +1,11 @@ /** * Project : AMDA-NG - * Name : PlotTickBarObject.js - * @class amdaPlotObj.PlotTickBarObject + * Name : PlotStatusBarObject.js + * @class amdaPlotObj.PlotStatusBarObject * @extends Ext.data.Model * @brief Plot Tick Bar Business Object Definition * @author Benjamin Renard - * @version $Id: PlotTickBarObject.js benjamin $ + * @version $Id: PlotStatusBarObject.js benjamin $ ****************************************************************************** * FT Id : Date : Name - Description ****************************************************************************** @@ -13,14 +13,15 @@ */ -Ext.define('amdaPlotObj.PlotTickBarObject', { +Ext.define('amdaPlotObj.PlotStatusBarObject', { extend: 'Ext.data.Model', requires: [ 'amdaPlotObj.PlotObjectConfig' ], - fields : [ + fields: [ + { name: 'statusbar-color', type: 'string', defaultValue: "none", }, ], constructor: function(){ @@ -39,12 +40,14 @@ Ext.define('amdaPlotObj.PlotTickBarObject', { setDefaultValues: function() { + this.set('statusbar-color', amdaPlotObj.PlotObjectConfig.defaultValues.statusbar.color); }, getJsonValues : function() { - var tickBarValues = new Object(); + var statusBarValues = new Object(); + statusBarValues['statusbar-color'] = this.get('statusbar-color'); - return tickBarValues; + return statusBarValues; } }); \ No newline at end of file diff --git a/js/app/models/PlotObjects/PlotTickBarObject.js b/js/app/models/PlotObjects/PlotTickBarObject.js index 2e4079d..5aee972 100644 --- a/js/app/models/PlotObjects/PlotTickBarObject.js +++ b/js/app/models/PlotObjects/PlotTickBarObject.js @@ -1,11 +1,11 @@ /** * Project : AMDA-NG - * Name : PlotStatusBarObject.js - * @class amdaPlotObj.PlotStatusBarObject + * Name : PlotTickBarObject.js + * @class amdaPlotObj.PlotTickBarObject * @extends Ext.data.Model * @brief Plot Status Bar Business Object Definition * @author Benjamin Renard - * @version $Id: PlotStatusBarObject.js benjamin $ + * @version $Id: PlotTickBarObject.js benjamin $ ****************************************************************************** * FT Id : Date : Name - Description ****************************************************************************** @@ -13,7 +13,7 @@ */ -Ext.define('amdaPlotObj.PlotStatusBarObject', { +Ext.define('amdaPlotObj.PlotTickBarObject', { extend: 'Ext.data.Model', requires: [ @@ -43,8 +43,8 @@ Ext.define('amdaPlotObj.PlotStatusBarObject', { getJsonValues : function() { - var statusBarValues = new Object(); + var tickBarValues = new Object(); - return statusBarValues; + return tickBarValues; } }); \ No newline at end of file diff --git a/js/app/views/PlotComponents/PlotIntervalsForm.js b/js/app/views/PlotComponents/PlotIntervalsForm.js index 90679a8..68c1dd7 100644 --- a/js/app/views/PlotComponents/PlotIntervalsForm.js +++ b/js/app/views/PlotComponents/PlotIntervalsForm.js @@ -17,7 +17,7 @@ Ext.define('amdaPlotComp.PlotIntervalsForm', { }, getFormItems: function() { - return [ + return [this.addColorsPicker('intervals-color', 'Color', amdaPlotObj.PlotObjectConfig.availableColorsNew, 'none') ]; } }); diff --git a/js/app/views/PlotComponents/PlotStatusBarForm.js b/js/app/views/PlotComponents/PlotStatusBarForm.js index 8ab82d5..96922d8 100644 --- a/js/app/views/PlotComponents/PlotStatusBarForm.js +++ b/js/app/views/PlotComponents/PlotStatusBarForm.js @@ -17,7 +17,7 @@ Ext.define('amdaPlotComp.PlotStatusBarForm', { }, getFormItems: function() { - return [ + return [this.addColorsPicker('statusbar-color', 'Color', amdaPlotObj.PlotObjectConfig.availableColorsNew, 'none') ]; } }); \ No newline at end of file -- libgit2 0.21.2