CDPP / AMDA_IHM

Commit 8b1dd4780bb849f590101c9b1a87bc41904dd383

Authored by Benjamin Renard
1 parent 25c9cc2a
Exists in master and in 107 other branches 10098, 10178, 5390, 6629, 6728, 6920, 7494, 7497, 7616, 8459, 8528, 8928, 9014, 9016Bis, 9017, 9049, 9084, 9259, 9326, 9345, 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, akkodis/amdadev, alias, amdadev, amdadev_test, anr_tempete, catalog-histo, create-user, cu2022, density_maps, develop, epn-tap, expression-parser-bre, frames-transformation, hapi, homePage, master_vge, minimize, mlplasmas, multiplot, new-save-plot-request, openam, plot-request, plot-tt-catalog, remoteData, rm_5118, rm_5776, rm_6912, rm_6912_bis, rm_7926, rm_8932, save-other-requests, save-plot, save-plot-request, special-params, sum-components-indexes, test-merge, ws_get_catalog

Add the possibility to define a resolution for each parameters of a plot request (#4784)

Showing 3 changed files with 16 additions and 2 deletions   Show diff stats
Inline Side-by-side
js/app/models/PlotObjects/PlotBaseSerieObject.js
  Diff comments   View file @8b1dd47
... ... @@ -22,6 +22,7 @@ Ext.define('amdaPlotObj.PlotBaseSerieObject', {
22 22  
23 23 fields : [
24 24 {name: 'serie-yaxis', type: 'string'},
  25 + {name: 'serie-resolution', type: 'int'},
25 26 {name: 'serie-lines-activated', type: 'boolean'},
26 27 {name: 'serie-lines-style', type: 'string'},
27 28 {name: 'serie-lines-width', type: 'float'},
... ... @@ -85,6 +86,7 @@ Ext.define('amdaPlotObj.PlotBaseSerieObject', {
85 86 setDefaultValues: function()
86 87 {
87 88 this.set('serie-yaxis', amdaPlotObj.PlotObjectConfig.defaultValues.serie.yAxis);
  89 + this.set('serie-resolution', amdaPlotObj.PlotObjectConfig.defaultValues.serie.resolution);
88 90 this.set('serie-lines-activated', true);
89 91 this.set('serie-lines-style', amdaPlotObj.PlotObjectConfig.defaultValues.serie.lines.style);
90 92 this.set('serie-lines-width', amdaPlotObj.PlotObjectConfig.defaultValues.serie.lines.width);
... ... @@ -141,6 +143,7 @@ Ext.define('amdaPlotObj.PlotBaseSerieObject', {
141 143 var serieValues = new Object();
142 144  
143 145 serieValues['serie-yaxis'] = this.get('serie-yaxis');
  146 + serieValues['serie-resolution'] = this.get('serie-resolution');
144 147 serieValues['serie-lines-activated'] = this.get('serie-lines-activated');
145 148 serieValues['serie-lines-style'] = this.get('serie-lines-style');
146 149 serieValues['serie-lines-width'] = this.get('serie-lines-width');
... ... @@ -186,4 +189,4 @@ Ext.define('amdaPlotObj.PlotBaseSerieObject', {
186 189  
187 190 return serieValues;
188 191 }
189   -});
190 192 \ No newline at end of file
  193 +});
... ...
js/app/models/PlotObjects/PlotObjectConfig.js
  Diff comments   View file @8b1dd47
... ... @@ -83,6 +83,7 @@ Ext.define('amdaPlotObj.PlotObjectConfig', {
83 83 },
84 84 serie : {
85 85 yAxis : 'y-left',
  86 + resolution : 3000,
86 87 lines : {
87 88 style : 'plain',
88 89 width : 1,
... ... @@ -293,7 +294,14 @@ Ext.define('amdaPlotObj.PlotObjectConfig', {
293 294 availableYAxes : [
294 295 {'key' : 'y-left', 'value' : 'Left'},
295 296 {'key' : 'y-right', 'value' : 'Right'}
296   - ],
  297 + ],
  298 +
  299 + availableResolutions : [
  300 + {'key' : 3000, 'value' : '3000'},
  301 + {'key' : 10000, 'value' : '10000'},
  302 + {'key' : 50000, 'value' : '50000'},
  303 + {'key' : 100000, 'value' : '100000'}
  304 + ],
297 305  
298 306 availableLinesStyles : [
299 307 {'key' : 'plain', 'value' : 'Plain'},
... ...
js/app/views/PlotComponents/PlotBaseSerieForm.js
  Diff comments   View file @8b1dd47
... ... @@ -86,6 +86,9 @@ Ext.define('amdaPlotComp.PlotBaseSerieForm', {
86 86 var me = this;
87 87  
88 88 return [
  89 + this.addStandardCombo('serie-resolution', 'Resolution', amdaPlotObj.PlotObjectConfig.availableResolutions, function(name, value, oldValue) {
  90 + me.object.set('serie-resolution', value);
  91 + }),
89 92 this.addStandardCombo('serie-yaxis', 'Y axis', amdaPlotObj.PlotObjectConfig.availableYAxes, function(name, value, oldValue) {
90 93 me.object.set('serie-yaxis', value);
91 94 me.crtTree.refresh();
... ...