CDPP / AMDA_IHM

Commit b292239c55f673026c232eb05031145ea0b3f99b

Authored by Benjamin Renard
2 parents 6d768658 6932cb17
Exists in master and in 2 other branches SpeasyGet, amdadev

Merge branch 'FER_9629' into amdadev

Showing 4 changed files with 59 additions and 3 deletions   Show diff stats
Inline Side-by-side
generic_data/defaultValues.json
  Diff comments   View file @b292239
... ... @@ -95,6 +95,11 @@
95 95 "size":4,
96 96 "color":"#00FF00"
97 97 },
  98 + "lastsymbols":{
  99 + "type":"triangle",
  100 + "size":4,
  101 + "color":"#0000FF"
  102 + },
98 103 "font":{
99 104 "name":"sans-serif",
100 105 "size":8
... ... @@ -108,6 +113,11 @@
108 113 "size":10,
109 114 "color":"#FF0000"
110 115 },
  116 + "lastsymbols":{
  117 + "type":"triangle",
  118 + "size":4,
  119 + "color":"#0000FF"
  120 + },
111 121 "font":{
112 122 "name":"sans-serif",
113 123 "size":8
... ...
generic_data/defaultValuesLinks.json
  Diff comments   View file @b292239
... ... @@ -151,6 +151,16 @@
151 151 "type":"colorpicker",
152 152 "store":null
153 153 },
  154 + "plot.serie.timetick.lastsymbols.type":
  155 + {
  156 + "type":"combobox",
  157 + "store":"availableSymbolsTypes"
  158 + },
  159 + "plot.serie.timetick.lastsymbols.color":
  160 + {
  161 + "type":"colorpicker",
  162 + "store":null
  163 + },
154 164 "plot.serie.timetick.font.name":
155 165 {
156 166 "type":"combobox",
... ... @@ -171,6 +181,16 @@
171 181 "type":"colorpicker",
172 182 "store":null
173 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 + },
174 194 "plot.serie.intervaltick.font.name":
175 195 {
176 196 "type":"combobox",
... ...
js/app/models/PlotObjects/PlotBaseSerieObject.js
  Diff comments   View file @b292239
... ... @@ -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'},
... ... @@ -45,6 +45,10 @@ Ext.define('amdaPlotObj.PlotBaseSerieObject', {
45 45 {name: 'serie-timetick-firstsymbols-type', type: 'string'},
46 46 {name: 'serie-timetick-firstsymbols-size', type: 'float'},
47 47 {name: 'serie-timetick-firstsymbols-color', type: 'string'},
  48 + {name: 'serie-timetick-lastsymbols-activated', type: 'boolean'},
  49 + {name: 'serie-timetick-lastsymbols-type', type: 'string'},
  50 + {name: 'serie-timetick-lastsymbols-size', type: 'float'},
  51 + {name: 'serie-timetick-lastsymbols-color', type: 'string'},
48 52 {name: 'serie-timetick-font-activated', type: 'boolean'},
49 53 {name: 'serie-timetick-font-name', type: 'string'},
50 54 {name: 'serie-timetick-font-size', type: 'int'},
... ... @@ -58,6 +62,10 @@ Ext.define('amdaPlotObj.PlotBaseSerieObject', {
58 62 {name: 'serie-intervaltick-symbols-type', type: 'string'},
59 63 {name: 'serie-intervaltick-symbols-size', type: 'float'},
60 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'},
61 69 {name: 'serie-intervaltick-font-activated', type: 'boolean'},
62 70 {name: 'serie-intervaltick-font-name', type: 'string'},
63 71 {name: 'serie-intervaltick-font-size', type: 'int'},
... ... @@ -110,6 +118,10 @@ Ext.define('amdaPlotObj.PlotBaseSerieObject', {
110 118 this.set('serie-timetick-firstsymbols-type', amdaDefaultValues.plot.serie.timetick.firstsymbols.type);
111 119 this.set('serie-timetick-firstsymbols-size', amdaDefaultValues.plot.serie.timetick.firstsymbols.size);
112 120 this.set('serie-timetick-firstsymbols-color', amdaDefaultValues.plot.serie.timetick.firstsymbols.color);
  121 + this.set('serie-timetick-lastsymbols-activated', false);
  122 + this.set('serie-timetick-lastsymbols-type', amdaDefaultValues.plot.serie.timetick.lastsymbols.type);
  123 + this.set('serie-timetick-lastsymbols-size', amdaDefaultValues.plot.serie.timetick.lastsymbols.size);
  124 + this.set('serie-timetick-lastsymbols-color', amdaDefaultValues.plot.serie.timetick.lastsymbols.color);
113 125 this.set('serie-timetick-font-activated', false);
114 126 this.set('serie-timetick-font-name', amdaDefaultValues.plot.serie.timetick.font.name);
115 127 this.set('serie-timetick-font-size', amdaDefaultValues.plot.serie.timetick.font.size);
... ... @@ -122,6 +134,10 @@ Ext.define('amdaPlotObj.PlotBaseSerieObject', {
122 134 this.set('serie-intervaltick-symbols-type', amdaDefaultValues.plot.serie.intervaltick.symbols.type);
123 135 this.set('serie-intervaltick-symbols-size', amdaDefaultValues.plot.serie.intervaltick.symbols.size);
124 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);
125 141 this.set('serie-intervaltick-font-activated', false);
126 142 this.set('serie-intervaltick-font-name', amdaDefaultValues.plot.serie.intervaltick.font.name);
127 143 this.set('serie-intervaltick-font-size', amdaDefaultValues.plot.serie.intervaltick.font.size);
... ... @@ -175,6 +191,10 @@ Ext.define('amdaPlotObj.PlotBaseSerieObject', {
175 191 serieValues['serie-timetick-firstsymbols-type'] = this.get('serie-timetick-firstsymbols-type');
176 192 serieValues['serie-timetick-firstsymbols-size'] = this.get('serie-timetick-firstsymbols-size');
177 193 serieValues['serie-timetick-firstsymbols-color'] = this.get('serie-timetick-firstsymbols-color');
  194 + serieValues['serie-timetick-lastsymbols-activated'] = this.get('serie-timetick-lastsymbols-activated');
  195 + serieValues['serie-timetick-lastsymbols-type'] = this.get('serie-timetick-lastsymbols-type');
  196 + serieValues['serie-timetick-lastsymbols-size'] = this.get('serie-timetick-lastsymbols-size');
  197 + serieValues['serie-timetick-lastsymbols-color'] = this.get('serie-timetick-lastsymbols-color');
178 198 serieValues['serie-timetick-font-activated'] = this.get('serie-timetick-font-activated');
179 199 serieValues['serie-timetick-font-name'] = this.get('serie-timetick-font-name');
180 200 serieValues['serie-timetick-font-size'] = this.get('serie-timetick-font-size');
... ... @@ -187,6 +207,10 @@ Ext.define('amdaPlotObj.PlotBaseSerieObject', {
187 207 serieValues['serie-intervaltick-symbols-type'] = this.get('serie-intervaltick-symbols-type');
188 208 serieValues['serie-intervaltick-symbols-size'] = this.get('serie-intervaltick-symbols-size');
189 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');
190 214 serieValues['serie-intervaltick-font-activated'] = this.get('serie-intervaltick-font-activated');
191 215 serieValues['serie-intervaltick-font-name'] = this.get('serie-intervaltick-font-name');
192 216 serieValues['serie-intervaltick-font-size'] = this.get('serie-intervaltick-font-size');
... ...
js/app/views/PlotComponents/PlotBaseSerieForm.js
  Diff comments   View file @b292239
... ... @@ -62,6 +62,7 @@ Ext.define('amdaPlotComp.PlotBaseSerieForm', {
62 62 this.addColorsPicker('serie-timetick-color', 'Color', amdaDefaultConfigs.availableColorsNew),
63 63 this.addStandardFieldSet('Symbols', '', this.addStandardSymbolsItems('serie-timetick-symbols')),
64 64 this.addStandardFieldSet('First symbol', 'serie-timetick-firstsymbols-activated', this.addStandardSymbolsItems('serie-timetick-firstsymbols')),
  65 + this.addStandardFieldSet('Last symbol', 'serie-timetick-lastsymbols-activated', this.addStandardSymbolsItems('serie-timetick-lastsymbols')),
65 66 this.addStandardFont('serie-timetick-font')
66 67 ];
67 68 },
... ... @@ -73,6 +74,7 @@ Ext.define('amdaPlotComp.PlotBaseSerieForm', {
73 74 this.addStandardCombo('serie-intervaltick-mode', 'Mode', amdaDefaultConfigs.availableIntervalTickModes),
74 75 this.addColorsPicker('serie-intervaltick-color', 'Color', amdaDefaultConfigs.availableColorsNew),
75 76 this.addStandardFieldSet('Symbols', '', this.addStandardSymbolsItems('serie-intervaltick-symbols')),
  77 + this.addStandardFieldSet('Last symbol', 'serie-intervaltick-lastsymbols-activated', this.addStandardSymbolsItems('serie-intervaltick-lastsymbols')),
76 78 this.addStandardFont('serie-intervaltick-font')
77 79 ];
78 80 },
... ... @@ -106,8 +108,8 @@ Ext.define('amdaPlotComp.PlotBaseSerieForm', {
106 108 this.addStandardFieldSet('Lines', 'serie-lines-activated', this.addStandardLineItems('serie-lines')),
107 109 this.addStandardFieldSet('Symbols', 'serie-symbols-activated', this.addStandardSymbolsItems('serie-symbols')),
108 110 this.addStandardFieldSet('Time ticks', 'serie-timetick-activated', this.getTimeTickItems()),
109   - this.addStandardFieldSet('Interval ticks', 'serie-intervaltick-activated', this.getIntervalTickItems()),
110   - 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())
111 113 ];
112 114 }
113 115 });
... ...