CDPP / AMDA_IHM

Commit 92d3a6f13940959e10f6ad7eea25219cc534a51f

Authored by Hacene SI HADJ MOHAND
1 parent ba2fd748
Exists in master and in 68 other branches 10098, 10178, 5390, 6629, 7616, 9014, 9016Bis, 9084, 9326, 9505, 9660, 9750, 9750.bck, 9800, 9980, FER_10285, FER_10400, FER_10435, FER_10557, FER_10663, FER_10765, FER_10828, FER_10828_2, FER_10829, FER_10836, FER_10852, FER_10934, FER_11100, FER_11242, FER_11478, FER_11500, FER_11537, FER_11586, FER_11588, FER_5119, FER_5165, FER_6265, FER_6860, FER_6899, FER_6951, FER_7618, FER_7862, FER_8455, FER_9629, FER_9660, FER_9915, FER_CR41, FER_CR42, FER_CR43, FER_TFCat, Histo1D2D, MAZ_10936, MAZ_11362, MAZ_11427, MAZ_6018, MAZ_9016_New, MAZ_FIX_9016, New_ColorMaps, SpeasyGet, amdadev, amdadev_test, cu2022, density_maps, develop, epn-tap, mlplasmas, openam, test-merge

us ok pour lines color

Showing 2 changed files with 20 additions and 6 deletions   Show diff stats
Inline Side-by-side
js/app/models/PlotObjects/PlotBaseSerieObject.js
  Diff comments   View file @92d3a6f
... ... @@ -25,6 +25,7 @@ Ext.define('amdaPlotObj.PlotBaseSerieObject', {
25 25 {name: 'serie-resolution', type: 'int'},
26 26 {name: 'serie-lines-activated', type: 'boolean'},
27 27 {name: 'serie-lines-color-activated', type: 'boolean'},
  28 + {name: 'serie-lines-color-auto', type: 'boolean'},
28 29 {name: 'serie-lines-style', type: 'string'},
29 30 {name: 'serie-lines-width', type: 'float'},
30 31 {name: 'serie-lines-color', type: 'string'},
... ... @@ -86,6 +87,17 @@ Ext.define('amdaPlotObj.PlotBaseSerieObject', {
86 87 }
87 88 this.dirty = false;
88 89 },
  90 + getDefaultColor:function(name){
  91 + var defaultClors = new Object();
  92 + defaultClors['serie-lines-color'] = amdaPlotObj.PlotObjectConfig.defaultValues.serie.lines.color;
  93 + defaultClors['serie-symbols-color'] = amdaPlotObj.PlotObjectConfig.defaultValues.serie.symbols.color;
  94 + defaultClors['serie-timetick-color'] = amdaPlotObj.PlotObjectConfig.defaultValues.serie.timetick.color;
  95 + defaultClors['serie-timetick-symbols-color'] = amdaPlotObj.PlotObjectConfig.defaultValues.serie.timetick.symbols.color;
  96 + defaultClors['serie-timetick-firstsymbols-color'] = amdaPlotObj.PlotObjectConfig.defaultValues.serie.timetick.firstsymbols.color;
  97 + defaultClors['serie-intervaltick-color'] = amdaPlotObj.PlotObjectConfig.defaultValues.serie.intervaltick.color;
  98 + defaultClors['serie-intervaltick-symbols-color'] = amdaPlotObj.PlotObjectConfig.defaultValues.serie.intervaltick.symbols.color;
  99 + return defaultClors[name];
  100 + },
89 101  
90 102 setDefaultValues: function ()
91 103 {
... ... @@ -97,6 +109,7 @@ Ext.define('amdaPlotObj.PlotBaseSerieObject', {
97 109 this.set('serie-lines-width', amdaPlotObj.PlotObjectConfig.defaultValues.serie.lines.width);
98 110 this.set('serie-lines-color', amdaPlotObj.PlotObjectConfig.defaultValues.serie.lines.color);
99 111 this.set('serie-lines-color-activated', false);
  112 + this.set('serie-lines-color-auto', true);
100 113  
101 114 this.set('serie-symbols-activated', false);
102 115 this.set('serie-symbols-type', amdaPlotObj.PlotObjectConfig.defaultValues.serie.symbols.type);
... ... @@ -162,6 +175,7 @@ Ext.define('amdaPlotObj.PlotBaseSerieObject', {
162 175 serieValues['serie-lines-width'] = this.get('serie-lines-width');
163 176 serieValues['serie-lines-color'] = this.get('serie-lines-color');
164 177 serieValues['serie-lines-color-activated'] = this.get('serie-lines-color-activated');
  178 + serieValues['serie-lines-color-auto'] = this.get('serie-lines-color-auto');
165 179 serieValues['serie-errorbar-lines-rgb'] = this.get('serie-errorbar-lines-rgb');
166 180  
167 181 serieValues['serie-symbols-activated'] = this.get('serie-symbols-activated');
... ...
js/app/models/PlotObjects/PlotSerieObject.js
  Diff comments   View file @92d3a6f
... ... @@ -24,14 +24,14 @@ Ext.define('amdaPlotObj.PlotSerieObject', {
24 24 {name: 'serie-resampling-mode', type: 'string'},
25 25  
26 26 //Only used for timePlot
27   - {name: 'serie-errorbar-activated', type: 'boolean'},
28   - {name: 'serie-errorbar-type', type: 'string'},
29   - {name: 'serie-errorbar-lines-style', type: 'string'},
  27 + {name: 'serie-errorbar-activated', type: 'boolean'},
  28 + {name: 'serie-errorbar-type', type: 'string'},
  29 + {name: 'serie-errorbar-lines-style', type: 'string'},
30 30 {name: 'serie-errorbar-lines-width', type: 'float'},
31 31 {name: 'serie-errorbar-lines-color', type: 'string'},
32   - {name: 'serie-errorbar-minparam', type: 'string'},
33   - {name: 'serie-errorbar-maxparam', type: 'string'},
34   - {name: 'serie-errorbar-deltaparam', type: 'string'}
  32 + {name: 'serie-errorbar-minparam', type: 'string'},
  33 + {name: 'serie-errorbar-maxparam', type: 'string'},
  34 + {name: 'serie-errorbar-deltaparam', type: 'string'}
35 35 ],
36 36  
37 37 constructor: function(){
... ...