CDPP / AMDA_IHM

Commit c45e3428419f02e856bec08b6785d15d26f1463e

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

Set adapted size for plot

Showing 1 changed file with 4 additions and 5 deletions   Show diff stats
Inline Side-by-side
js/app/controllers/InteractivePlotMgr.js
  Diff comments   View file @c45e342
@@ -25,7 +25,6 @@ Ext.define('amdaDesktop.InteractivePlotMgr', { @@ -25,7 +25,6 @@ Ext.define('amdaDesktop.InteractivePlotMgr', {
25 multiSelector: false, 25 multiSelector: false,
26 26
27 maxWinNumber : 5, 27 maxWinNumber : 5,
28 - //original image values : 700, 987; 987, 700  
29 imgOffset : { x : 70, y : 85 }, 28 imgOffset : { x : 70, y : 85 },
30 winSize : { 29 winSize : {
31 landscape : { width : 0, height : 0 }, 30 landscape : { width : 0, height : 0 },
@@ -34,8 +33,8 @@ Ext.define('amdaDesktop.InteractivePlotMgr', { @@ -34,8 +33,8 @@ Ext.define('amdaDesktop.InteractivePlotMgr', {
34 }, 33 },
35 34
36 imgSize : { 35 imgSize : {
37 - landscape : { width : 987, height : 700 },  
38 - portrait : { width : 700, height : 987 } 36 + landscape : { width : 1052, height : 744 },
  37 + portrait : { width : 744, height : 1052 }
39 }, 38 },
40 39
41 maxWinNumber : 5, 40 maxWinNumber : 5,
@@ -240,8 +239,8 @@ Ext.define('amdaDesktop.InteractivePlotMgr', { @@ -240,8 +239,8 @@ Ext.define('amdaDesktop.InteractivePlotMgr', {
240 var sizeImg = Ext.clone(size); 239 var sizeImg = Ext.clone(size);
241 var interactivePlotMgr = myDesktopApp.getLoadedModule(myDesktopApp.dynamicModules.interactive_plot.id); 240 var interactivePlotMgr = myDesktopApp.getLoadedModule(myDesktopApp.dynamicModules.interactive_plot.id);
242 if (interactivePlotMgr) 241 if (interactivePlotMgr)
243 - panelResult.panelImage.setSize(sizeImg.width-interactivePlotMgr.imgOffset.x,  
244 - sizeImg.height-interactivePlotMgr.imgOffset.y); 242 + panelResult.panelImage.setSize(sizeImg.width-amdaDesktop.InteractivePlotMgr.imgOffset.x,
  243 + sizeImg.height-amdaDesktop.InteractivePlotMgr.imgOffset.y);
245 } 244 }
246 245
247 panelResult.panelImage.setSrc('data/'+sessionID +'/RES/'+resultId+'/'+ outputName +'.png'); 246 panelResult.panelImage.setSrc('data/'+sessionID +'/RES/'+resultId+'/'+ outputName +'.png');