CDPP / AMDA_IHM

Commit a56f041d1ac47859047c522b83a5db56826064c1

Authored by Elena.Budnik
1 parent 647d796e
Exists in master and in 108 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, 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-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

bug whne multi panel plot

Showing 2 changed files with 9 additions and 4 deletions   Show diff stats
Inline Side-by-side
js/app/models/PlotObjects/PlotRequestObject.js
  Diff comments   View file @a56f041
@@ -31,7 +31,8 @@ Ext.define('amdaPlotObj.PlotRequestObject', { @@ -31,7 +31,8 @@ Ext.define('amdaPlotObj.PlotRequestObject', {
31 {name: 'last-plotted-tab', type: 'int', defaultValue: 0}, 31 {name: 'last-plotted-tab', type: 'int', defaultValue: 0},
32 {name: 'last-tab-id', type: 'int', defaultValue: 0}, 32 {name: 'last-tab-id', type: 'int', defaultValue: 0},
33 {name: 'active-tab-id', type: 'int', defaultValue: 1}, 33 {name: 'active-tab-id', type: 'int', defaultValue: 1},
34 - {name: 'all-in-one', type: 'boolean', defaultValue: false} 34 + {name: 'all-in-one', type: 'boolean', defaultValue: false},
  35 + {name: 'is-plot', type: 'boolean', defaultValue: true}
35 ], 36 ],
36 37
37 hasMany: { 38 hasMany: {
@@ -154,8 +155,8 @@ Ext.define('amdaPlotObj.PlotRequestObject', { @@ -154,8 +155,8 @@ Ext.define('amdaPlotObj.PlotRequestObject', {
154 } 155 }
155 156
156 requestValues['tabs'] = []; 157 requestValues['tabs'] = [];
157 -  
158 - if (this.get('all-in-one')) { 158 +
  159 + if (this.get('all-in-one') || this.get('is-plot')) {
159 this.tabs().each(function (tab, index) { 160 this.tabs().each(function (tab, index) {
160 requestValues['tabs'][index] = tab.getJsonValues(); 161 requestValues['tabs'][index] = tab.getJsonValues();
161 }); 162 });
@@ -168,7 +169,7 @@ Ext.define('amdaPlotObj.PlotRequestObject', { @@ -168,7 +169,7 @@ Ext.define('amdaPlotObj.PlotRequestObject', {
168 requestValues['tabs'][0] = tab.getJsonValues(); 169 requestValues['tabs'][0] = tab.getJsonValues();
169 170
170 requestValues['tabs'][0]['id'] = "1"; 171 requestValues['tabs'][0]['id'] = "1";
171 - requestValues['active-tab-id'] = "1"; 172 + requestValues['active-tab-id'] = "1";
172 requestValues['last-tab-id'] = "1"; 173 requestValues['last-tab-id'] = "1";
173 requestValues['last-plotted-tab'] = "0"; 174 requestValues['last-plotted-tab'] = "0";
174 } 175 }
js/app/views/PlotUI.js
  Diff comments   View file @a56f041
@@ -70,6 +70,8 @@ Ext.define('amdaUI.PlotUI', { @@ -70,6 +70,8 @@ Ext.define('amdaUI.PlotUI', {
70 * save method called by Save button to launch the save process 70 * save method called by Save button to launch the save process
71 */ 71 */
72 saveProcess : function(toRename) { 72 saveProcess : function(toRename) {
  73 + this.object.set('is-plot', false);
  74 +
73 var plotModule = myDesktopApp.getLoadedModule(myDesktopApp.dynamicModules.plot.id); 75 var plotModule = myDesktopApp.getLoadedModule(myDesktopApp.dynamicModules.plot.id);
74 if (!plotModule) 76 if (!plotModule)
75 return; 77 return;
@@ -116,7 +118,9 @@ Ext.define('amdaUI.PlotUI', { @@ -116,7 +118,9 @@ Ext.define('amdaUI.PlotUI', {
116 * plot method called by 'Do Plot' button to launch the plot process 118 * plot method called by 'Do Plot' button to launch the plot process
117 */ 119 */
118 doPlot : function(){ 120 doPlot : function(){
  121 +
119 this.updateObject(); 122 this.updateObject();
  123 + this.object.set('is-plot', true);
120 this.object.set('last-plotted-tab', this.plotTabs.getSelectedTabId()); 124 this.object.set('last-plotted-tab', this.plotTabs.getSelectedTabId());
121 var plotModule = myDesktopApp.getLoadedModule(myDesktopApp.dynamicModules.plot.id); 125 var plotModule = myDesktopApp.getLoadedModule(myDesktopApp.dynamicModules.plot.id);
122 if (plotModule) 126 if (plotModule)