CDPP / AMDA_IHM

Commit 509bf9fad4c623d9b790d6f102427ce1c3eca2e2

Authored by Benjamin Renard
1 parent 09eefb2d
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

Replace panel ID by panel index

Showing 3 changed files with 14 additions and 1 deletions   Show diff stats
Inline Side-by-side
js/app/models/PlotObjects/PlotPanelObject.js
  Diff comments   View file @509bf9f
... ... @@ -31,6 +31,7 @@ Ext.define('amdaPlotObj.PlotPanelObject', {
31 31  
32 32 fields : [
33 33 {name: 'id', type: 'string'},
  34 + {name: 'panel-index', type: 'int'},
34 35 {name: 'panel-background-color', type: 'string'},
35 36 {name: 'panel-title-text', type: 'string'},
36 37 {name: 'panel-title-color', type: 'string'},
... ... @@ -502,7 +503,7 @@ Ext.define('amdaPlotObj.PlotPanelObject', {
502 503 getPanelShortInfo : function()
503 504 {
504 505 var type = amdaPlotObj.PlotObjectConfig.getValueByKey(amdaPlotObj.PlotObjectConfig.availablePlotTypes, this.get('panel-plot-type'));
505   - var info = 'Id = '+this.get('id')+', '+type;
  506 + var info = '#'+this.get('panel-index')+', '+type;
506 507 switch (this.get('panel-plot-type'))
507 508 {
508 509 case 'instantPlot' :
... ... @@ -587,6 +588,8 @@ Ext.define('amdaPlotObj.PlotPanelObject', {
587 588  
588 589 panelValues['id'] = this.get('id');
589 590  
  591 + panelValues['panel-index'] = this.get('panel-index');
  592 +
590 593 panelValues['panel-background-color'] = this.get('panel-background-color');
591 594 panelValues['panel-title-text'] = this.get('panel-title-text');
592 595 panelValues['panel-title-color'] = this.get('panel-title-color');
... ...
js/app/models/PlotObjects/PlotTabObject.js
  Diff comments   View file @509bf9f
... ... @@ -88,6 +88,7 @@ Ext.define('amdaPlotObj.PlotTabObject', {
88 88 loadPanels: function(panels)
89 89 {
90 90 this.panels().loadData(panels);
  91 + this.updatePanelIndex();
91 92 },
92 93  
93 94 loadLayoutObject: function(layout)
... ... @@ -102,6 +103,7 @@ Ext.define('amdaPlotObj.PlotTabObject', {
102 103 var recs = this.panels().add({id : this.get('last-panel-id')});
103 104 recs[0].setDefaultValues();
104 105 this.dirty = true;
  106 + this.updatePanelIndex();
105 107 return recs[0];
106 108 },
107 109  
... ... @@ -112,9 +114,16 @@ Ext.define('amdaPlotObj.PlotTabObject', {
112 114 return false;
113 115 this.panels().remove(panelRecord);
114 116 this.dirty = true;
  117 + this.updatePanelIndex();
115 118 return true;
116 119 },
117 120  
  121 + updatePanelIndex: function() {
  122 + this.panels().each(function(panel, index) {
  123 + panel.set('panel-index', index);
  124 + });
  125 + },
  126 +
118 127 createLayoutByType : function(layoutType, data)
119 128 {
120 129 //Create layout object in relation with the type
... ...
js/app/views/PlotComponents/PlotTree.js
  Diff comments   View file @509bf9f
... ... @@ -72,6 +72,7 @@ Ext.define('amdaPlotComp.PlotTree', {
72 72 this.panelsNode.removeAll();
73 73  
74 74 var me = this;
  75 + this.tabObject.updatePanelIndex();
75 76 this.tabObject.panels().each(function (panelObject) {
76 77 me.addPanelNode(panelObject, paramNodeToSelect);
77 78 });
... ...