Commit 58c420326f31c28bdd42995be457c234b51f65a3

Authored by Benjamin Renard
1 parent 255b183d

Fix

js/app/models/PlotObjects/PlotIntervalsObject.js
... ... @@ -22,6 +22,7 @@ Ext.define('amdaPlotObj.PlotIntervalsObject', {
22 22  
23 23 fields: [
24 24 { name: 'intervals-color', type: 'string', defaultValue: "none" },
  25 + { name: 'legend-text-activated', type: 'boolean', defaultValue: true},
25 26 { name: 'legend-text-value', type: 'string' },
26 27 { name: 'legend-text-position', type: 'string', defaultValue: "top" },
27 28 { name: 'legend-text-color', type: 'string' },
... ... @@ -50,6 +51,7 @@ Ext.define('amdaPlotObj.PlotIntervalsObject', {
50 51 setDefaultValues: function()
51 52 {
52 53 this.set('intervals-color', amdaPlotObj.PlotObjectConfig.defaultValues.intervals.color);
  54 + this.set('legend-text-activated', true);
53 55 this.set('legend-text-value', '');
54 56 this.set('legend-text-position', amdaPlotObj.PlotObjectConfig.defaultValues.legends.text.position);
55 57 this.set('legend-text-color', amdaPlotObj.PlotObjectConfig.defaultValues.legends.text.color);
... ... @@ -66,6 +68,7 @@ Ext.define('amdaPlotObj.PlotIntervalsObject', {
66 68 {
67 69 var intervalsValues = new Object();
68 70 intervalsValues['intervals-color'] = this.get('intervals-color');
  71 + intervalsValues['legend-text-activated'] = this.get('legend-text-activated');
69 72 intervalsValues['legend-text-value'] = this.get('legend-text-value');
70 73 intervalsValues['legend-text-position'] = this.get('legend-text-position');
71 74 intervalsValues['legend-text-color'] = this.get('legend-text-color');
... ...
js/app/models/PlotObjects/PlotObjectConfig.js
... ... @@ -148,7 +148,7 @@ Ext.define('amdaPlotObj.PlotObjectConfig', {
148 148 resolution: 3000
149 149 },
150 150 intervals: {
151   - color: "none"
  151 + color: "#FF0000"
152 152 },
153 153 statusbar: {
154 154 color: "none"
... ...
js/app/views/PlotComponents/PlotIntervalsForm.js
... ... @@ -24,7 +24,7 @@ Ext.define('amdaPlotComp.PlotIntervalsForm', {
24 24  
25 25 return [
26 26 this.addColorsPicker('intervals-color', 'Color', amdaPlotObj.PlotObjectConfig.availableColorsNew, 'none'),
27   - this.addStandardFieldSet('Legend', 'legend-text-font-activated', legendItems)
  27 + this.addStandardFieldSet('Legend', 'legend-text-activated', legendItems)
28 28 ];
29 29 }
30 30 });
... ...