CDPP / AMDA_IHM

Commit 8dddc557a7a5891ea68e8b2065376b82337917e8

Authored by Benjamin Renard
1 parent 2048f5bc
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 reload

Showing 5 changed files with 25 additions and 3 deletions   Show diff stats
Inline Side-by-side
js/app/models/InteractiveNode.js
  Diff comments   View file @8dddc55
... ... @@ -210,7 +210,12 @@ Ext.define('amdaModel.InteractiveNode', {
210 210 // reload object into the view of corresponding Module
211 211 var me = this;
212 212 myDesktopApp.getLoadedModule(this.get('moduleId'), true, function (module) {
213   - module.getUiContent().setObject(me.get('object'));
  213 + if (!opt || !opt.plot) {
  214 + module.getUiContent().setObject(me.get('object'));
  215 + }
  216 + else {
  217 + module.getUiContent().reloadPlot(me);
  218 + }
214 219 });
215 220 }
216 221 else {
... ...
js/app/models/PlotObjects/PlotRequestObject.js
  Diff comments   View file @8dddc55
... ... @@ -237,6 +237,7 @@ Ext.define('amdaPlotObj.PlotRequestObject', {
237 237 requestValues['id'] = this.get('id');
238 238 requestValues['tab-index'] = this.get('tab-index');
239 239 requestValues['tab-title'] = this.get('tab-title');
  240 + requestValues['name'] = this.get('name');
240 241  
241 242 requestValues['file-format'] = this.get('file-format');
242 243 requestValues['file-output'] = this.get('file-output');
... ...
js/app/views/PlotComponents/PlotTabContent.js
  Diff comments   View file @8dddc55
... ... @@ -58,13 +58,14 @@ Ext.define('amdaPlotComp.PlotTabContent', {
58 58 },
59 59  
60 60 savePlot : function() {
  61 + this.updateTimeObject();
61 62 var object = this.plotNode.get('object');
62 63 if (!object)
63 64 return;
64 65  
65 66 if ((object.get('id') != '') && (this.plotNode.get('text') == object.get('name'))) {
66 67 //update existing request
67   - this.plotNode.update();
  68 + this.plotNode.update({plot: true});
68 69 return;
69 70 }
70 71  
... ... @@ -105,7 +106,7 @@ Ext.define('amdaPlotComp.PlotTabContent', {
105 106  
106 107 saveProcess : function(toRename) {
107 108 if (toRename) {
108   - this.plotNode.update();
  109 + this.plotNode.update({plot: true});
109 110 }
110 111 else {
111 112 if (this.plotNode.get('object').get('id') != '') {
... ...
js/app/views/PlotComponents/PlotTabPanel.js
  Diff comments   View file @8dddc55
... ... @@ -35,6 +35,17 @@ Ext.define('amdaPlotComp.PlotTabPanel', {
35 35 this.addPlotNode(rec, index == 0);
36 36 }, this);
37 37 },
  38 +
  39 + reloadPlot : function(plotNode) {
  40 + for (i = 0; i < this.items.getCount(); ++i)
  41 + {
  42 + var tabItem = this.items.getAt(i);
  43 + var tabContent = tabItem.items.getAt(0);
  44 + if (plotNode == tabContent.plotNode) {
  45 + tabContent.updateUI();
  46 + }
  47 + }
  48 + },
38 49  
39 50 addPlotNode: function(plotNode, selectTab)
40 51 {
... ...
js/app/views/PlotUI.js
  Diff comments   View file @8dddc55
... ... @@ -73,6 +73,10 @@ Ext.define(&#39;amdaUI.PlotUI&#39;, {
73 73 editPlot : function(plotNode) {
74 74 this.plotTabs.addPlotNode(plotNode, true);
75 75 },
  76 +
  77 + reloadPlot : function(plotNode) {
  78 + this.plotTabs.reloadPlot(plotNode);
  79 + },
76 80  
77 81 /**
78 82 * plot method called by 'Do Plot' button to launch the plot process
... ...