CDPP / AMDA_IHM

Commit 63c16a6cc749a93983a0456f104f253e774de782

Authored by Benjamin Renard
1 parent ed51c2cd
Exists in master and in 96 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, amdadev, amdadev_test, anr_tempete, create-user, cu2022, density_maps, develop, epn-tap, expression-parser-bre, frames-transformation, hapi, master_vge, mlplasmas, multiplot, new-save-plot-request, openam, remoteData, rm_6912, rm_6912_bis, rm_7926, rm_8932, save-other-requests, special-params, test-merge, ws_get_catalog

Fix plot request duplication

Showing 2 changed files with 12 additions and 3 deletions   Show diff stats
Inline Side-by-side
js/app/models/PlotObjects/MultiplotRequestObject.js
  Diff comments   View file @63c16a6
... ... @@ -57,7 +57,9 @@ Ext.define('amdaPlotObj.MultiplotRequestObject', {
57 57 newPlotNode = Ext.create('amdaModel.PlotNode', {
58 58 leaf : true
59 59 });
60   - newPlotNode.set('object', plotNode.get('object'));
  60 + var data = Ext.apply({}, plotNode.get('object').getData(), plotNode.get('object').getAssociatedData());
  61 + newPlotNode.set('object', Ext.create('amdaPlotObj.PlotRequestObject', data));
  62 + plotNode.get('object').reject();
61 63 me.plots().remove(plotNode);
62 64 me.plots().insert(index, [newPlotNode]);
63 65 return false;
... ...
js/app/views/PlotComponents/PlotTabContent.js
  Diff comments   View file @63c16a6
... ... @@ -61,13 +61,13 @@ Ext.define('amdaPlotComp.PlotTabContent', {
61 61 savePlot : function() {
62 62 var me = this;
63 63  
64   - this.updateTimeObject();
65 64 var object = this.plotNode.get('object');
66 65 if (!object)
67 66 return;
68 67  
69 68 if ((object.get('id') != '') && (this.plotNode.get('text') == object.get('name'))) {
70 69 //update existing request
  70 + this.updateTimeObject();
71 71 this.plotNode.update({plot: true, callback: function() {
72 72 me.plotTabPanel.updatePlotTabs();
73 73 }});
... ... @@ -111,6 +111,7 @@ Ext.define('amdaPlotComp.PlotTabContent', {
111 111 saveProcess : function(toRename) {
112 112 var me = this;
113 113 if (toRename) {
  114 + this.updateTimeObject();
114 115 this.plotNode.update({plot: true, callback: function() {
115 116 me.plotTabPanel.updatePlotTabs();
116 117 }});
... ... @@ -123,12 +124,17 @@ Ext.define('amdaPlotComp.PlotTabContent', {
123 124 return;
124 125 var newPlotNode = plotModule.linkedNode.get('object').duplicatePlot(this.plotNode);
125 126 if (newPlotNode) {
  127 + var oldPlotNode = this.plotNode;
126 128 this.plotNode = newPlotNode;
127   - this.updateUI();
  129 + this.updateTimeObject();
  130 + oldPlotNode.reject();
128 131 }
129 132 }
  133 + this.updateTimeObject();
130 134 this.plotNode.create({callback: function() {
  135 + me.plotNode.commit();
131 136 me.plotTabPanel.updatePlotTabs();
  137 + me.updateUI();
132 138 }});
133 139 }
134 140 },
... ... @@ -136,6 +142,7 @@ Ext.define('amdaPlotComp.PlotTabContent', {
136 142 updateUI : function() {
137 143 this.plotOutput.setObject(this.plotNode.get('object'));
138 144 this.timeSelector.intervalSel.setInterval(this.plotNode.get('object').get('startDate'), this.plotNode.get('object').get('stopDate'));
  145 + this.timeSelector.intervalSel.updateStop();
139 146 this.timeSelector.setTTTab(this.plotNode.get('object').get('timeTables'));
140 147 this.treePlot.buildTree(this.plotNode.get('object'));
141 148 },
... ...