CDPP / AMDA_IHM

Commit 6932cb17cf6dee55ccd4ecb4514a23a98b051ec6

Authored by Benjamin Renard
1 parent 23cf3fbb
Exists in master and in 3 other branches FER_9629, SpeasyGet, amdadev

Also give the possibility to use a different symbol for last interval tick

Showing 4 changed files with 32 additions and 4 deletions   Show diff stats
Inline Side-by-side
generic_data/defaultValues.json
  Diff comments   View file @6932cb1
... ... @@ -113,6 +113,11 @@
113 113 "size":10,
114 114 "color":"#FF0000"
115 115 },
  116 + "lastsymbols":{
  117 + "type":"triangle",
  118 + "size":4,
  119 + "color":"#0000FF"
  120 + },
116 121 "font":{
117 122 "name":"sans-serif",
118 123 "size":8
... ...
generic_data/defaultValuesLinks.json
  Diff comments   View file @6932cb1
... ... @@ -181,6 +181,16 @@
181 181 "type":"colorpicker",
182 182 "store":null
183 183 },
  184 + "plot.serie.intervaltick.lastsymbols.type":
  185 + {
  186 + "type":"combobox",
  187 + "store":"availableSymbolsTypes"
  188 + },
  189 + "plot.serie.intervaltick.lastsymbols.color":
  190 + {
  191 + "type":"colorpicker",
  192 + "store":null
  193 + },
184 194 "plot.serie.intervaltick.font.name":
185 195 {
186 196 "type":"combobox",
... ...
js/app/models/PlotObjects/PlotBaseSerieObject.js
  Diff comments   View file @6932cb1
... ... @@ -23,7 +23,7 @@ Ext.define('amdaPlotObj.PlotBaseSerieObject', {
23 23 {name: 'serie-lines-style', type: 'string'},
24 24 {name: 'serie-lines-width', type: 'float'},
25 25 {name: 'serie-lines-color', type: 'string'},
26   - {name: 'serie-symbols-activated', type: 'boolean'},
  26 + {name: 'serie-symbols-activated', type: 'boolean'},
27 27 {name: 'serie-symbols-type', type: 'string'},
28 28 {name: 'serie-symbols-size', type: 'float'},
29 29 {name: 'serie-symbols-color', type: 'string'},
... ... @@ -62,6 +62,10 @@ Ext.define('amdaPlotObj.PlotBaseSerieObject', {
62 62 {name: 'serie-intervaltick-symbols-type', type: 'string'},
63 63 {name: 'serie-intervaltick-symbols-size', type: 'float'},
64 64 {name: 'serie-intervaltick-symbols-color', type: 'string'},
  65 + {name: 'serie-intervaltick-lastsymbols-activated', type: 'boolean'},
  66 + {name: 'serie-intervaltick-lastsymbols-type', type: 'string'},
  67 + {name: 'serie-intervaltick-lastsymbols-size', type: 'float'},
  68 + {name: 'serie-intervaltick-lastsymbols-color', type: 'string'},
65 69 {name: 'serie-intervaltick-font-activated', type: 'boolean'},
66 70 {name: 'serie-intervaltick-font-name', type: 'string'},
67 71 {name: 'serie-intervaltick-font-size', type: 'int'},
... ... @@ -114,7 +118,7 @@ Ext.define('amdaPlotObj.PlotBaseSerieObject', {
114 118 this.set('serie-timetick-firstsymbols-type', amdaDefaultValues.plot.serie.timetick.firstsymbols.type);
115 119 this.set('serie-timetick-firstsymbols-size', amdaDefaultValues.plot.serie.timetick.firstsymbols.size);
116 120 this.set('serie-timetick-firstsymbols-color', amdaDefaultValues.plot.serie.timetick.firstsymbols.color);
117   - this.set('serie-timetick-lastsymbols-activated', true);
  121 + this.set('serie-timetick-lastsymbols-activated', false);
118 122 this.set('serie-timetick-lastsymbols-type', amdaDefaultValues.plot.serie.timetick.lastsymbols.type);
119 123 this.set('serie-timetick-lastsymbols-size', amdaDefaultValues.plot.serie.timetick.lastsymbols.size);
120 124 this.set('serie-timetick-lastsymbols-color', amdaDefaultValues.plot.serie.timetick.lastsymbols.color);
... ... @@ -130,6 +134,10 @@ Ext.define('amdaPlotObj.PlotBaseSerieObject', {
130 134 this.set('serie-intervaltick-symbols-type', amdaDefaultValues.plot.serie.intervaltick.symbols.type);
131 135 this.set('serie-intervaltick-symbols-size', amdaDefaultValues.plot.serie.intervaltick.symbols.size);
132 136 this.set('serie-intervaltick-symbols-color', amdaDefaultValues.plot.serie.intervaltick.symbols.color);
  137 + this.set('serie-intervaltick-lastsymbols-activated', false);
  138 + this.set('serie-intervaltick-lastsymbols-type', amdaDefaultValues.plot.serie.intervaltick.lastsymbols.type);
  139 + this.set('serie-intervaltick-lastsymbols-size', amdaDefaultValues.plot.serie.intervaltick.lastsymbols.size);
  140 + this.set('serie-intervaltick-lastsymbols-color', amdaDefaultValues.plot.serie.intervaltick.lastsymbols.color);
133 141 this.set('serie-intervaltick-font-activated', false);
134 142 this.set('serie-intervaltick-font-name', amdaDefaultValues.plot.serie.intervaltick.font.name);
135 143 this.set('serie-intervaltick-font-size', amdaDefaultValues.plot.serie.intervaltick.font.size);
... ... @@ -199,6 +207,10 @@ Ext.define('amdaPlotObj.PlotBaseSerieObject', {
199 207 serieValues['serie-intervaltick-symbols-type'] = this.get('serie-intervaltick-symbols-type');
200 208 serieValues['serie-intervaltick-symbols-size'] = this.get('serie-intervaltick-symbols-size');
201 209 serieValues['serie-intervaltick-symbols-color'] = this.get('serie-intervaltick-symbols-color');
  210 + serieValues['serie-intervaltick-lastsymbols-activated'] = this.get('serie-intervaltick-lastsymbols-activated');
  211 + serieValues['serie-intervaltick-lastsymbols-type'] = this.get('serie-intervaltick-lastsymbols-type');
  212 + serieValues['serie-intervaltick-lastsymbols-size'] = this.get('serie-intervaltick-lastsymbols-size');
  213 + serieValues['serie-intervaltick-lastsymbols-color'] = this.get('serie-intervaltick-lastsymbols-color');
202 214 serieValues['serie-intervaltick-font-activated'] = this.get('serie-intervaltick-font-activated');
203 215 serieValues['serie-intervaltick-font-name'] = this.get('serie-intervaltick-font-name');
204 216 serieValues['serie-intervaltick-font-size'] = this.get('serie-intervaltick-font-size');
... ...
js/app/views/PlotComponents/PlotBaseSerieForm.js
  Diff comments   View file @6932cb1
... ... @@ -74,6 +74,7 @@ Ext.define('amdaPlotComp.PlotBaseSerieForm', {
74 74 this.addStandardCombo('serie-intervaltick-mode', 'Mode', amdaDefaultConfigs.availableIntervalTickModes),
75 75 this.addColorsPicker('serie-intervaltick-color', 'Color', amdaDefaultConfigs.availableColorsNew),
76 76 this.addStandardFieldSet('Symbols', '', this.addStandardSymbolsItems('serie-intervaltick-symbols')),
  77 + this.addStandardFieldSet('Last symbol', 'serie-intervaltick-lastsymbols-activated', this.addStandardSymbolsItems('serie-intervaltick-lastsymbols')),
77 78 this.addStandardFont('serie-intervaltick-font')
78 79 ];
79 80 },
... ... @@ -107,8 +108,8 @@ Ext.define('amdaPlotComp.PlotBaseSerieForm', {
107 108 this.addStandardFieldSet('Lines', 'serie-lines-activated', this.addStandardLineItems('serie-lines')),
108 109 this.addStandardFieldSet('Symbols', 'serie-symbols-activated', this.addStandardSymbolsItems('serie-symbols')),
109 110 this.addStandardFieldSet('Time ticks', 'serie-timetick-activated', this.getTimeTickItems()),
110   - this.addStandardFieldSet('Interval ticks', 'serie-intervaltick-activated', this.getIntervalTickItems()),
111   - this.addStandardFieldSet('Spike Filtering ( ! Experimental ! )', 'filtering-activated', this.getFilteringItems())
  111 + this.addStandardFieldSet('Interval ticks', 'serie-intervaltick-activated', this.getIntervalTickItems()),
  112 + this.addStandardFieldSet('Spike Filtering ( ! Experimental ! )', 'filtering-activated', this.getFilteringItems())
112 113 ];
113 114 }
114 115 });
... ...