CDPP / AMDA_IHM

Commit ddfe608e92c8c2860636cc8235c0b886c33a9c88

Authored by Elena.Budnik
1 parent 4873699c
Exists in master and in 111 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, alias, amdadev, amdadev_test, anr_tempete, catalog-histo, create-user, cu2022, data-activities, density_maps, develop, epn-tap, expression-parser-bre, frames-transformation, hapi, homePage, install-rework, livraison-akka, master_vge, minimize, mlplasmas, multiplot, new-save-plot-request, openam, plot-request, plot-request-update, 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, shared-objects-updater, special-params, sum-components-indexes, test-merge, ws_get_catalog

redmine #4814

Showing 1 changed file with 8 additions and 4 deletions   Show diff stats
Inline Side-by-side
js/app/models/PlotObjects/PlotPanelObject.js
  Diff comments   View file @ddfe608
... ... @@ -140,6 +140,8 @@ Ext.define('amdaPlotObj.PlotPanelObject', {
140 140 }
141 141 ],
142 142  
  143 + isComponent : false,
  144 +
143 145 constructor: function(){
144 146 var me = this;
145 147 me.callParent(arguments);
... ... @@ -285,9 +287,10 @@ Ext.define('amdaPlotObj.PlotPanelObject', {
285 287  
286 288 var recs = this.params().add({id : this.get('last-param-id')});
287 289 recs[0].set('paramid', paramId);
288   -
  290 +
289 291 if (paramComponents) {
290 292 if (paramComponents['index1']) {
  293 + this.isComponent = true;
291 294 recs[0].set('dim1-is-range', false);
292 295 recs[0].set('dim1-min-range', 0.);
293 296 recs[0].set('dim1-max-range', 0.);
... ... @@ -310,12 +313,13 @@ Ext.define('amdaPlotObj.PlotPanelObject', {
310 313 var me = this;
311 314 amdaPlotObj.PlotObjectConfig.getParamConfig(paramId, function (success, data) {
312 315 var availableDrawingObjects = null;
313   -
  316 +
314 317 //Change type only if the panel is empty!
315 318 if (success) {
316   - if (emptyPanel)
  319 + if (emptyPanel && !me.isComponent)
317 320 me.changePlotType(data.panel.plotType);
318   - if (data.draw) {
  321 +
  322 + if (data.draw && !me.isComponent) {
319 323 availableDrawingObjects = recs[0].getAvailableDrawingObjectByPlotType(me.get('panel-plot-type'));
320 324  
321 325 Ext.each(availableDrawingObjects, function (drawingObj) {
... ...