CDPP / AMDA_IHM

Commit 0314bd3221c8cd50fbb1b79eb93a4fba361cde5f

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

Keep a registry of already loaded parameter info

Showing 2 changed files with 51 additions and 18 deletions   Show diff stats
Inline Side-by-side
js/app/controllers/ExplorerModule.js
  Diff comments   View file @0314bd3
... ... @@ -48,6 +48,8 @@ Ext.define('amdaDesktop.ExplorerModule', {
48 48 filter : null,
49 49 filtersStore : null,
50 50  
  51 + paramInfoRegistry : {},
  52 +
51 53 constructor : function(config){
52 54 this.callParent(arguments);
53 55 if (!this.filtersStore) {
... ... @@ -59,7 +61,6 @@ Ext.define('amdaDesktop.ExplorerModule', {
59 61 }
60 62 },
61 63  
62   -
63 64 createWindow : function() {
64 65 var desktop = this.app.getDesktop();
65 66  
... ... @@ -299,5 +300,13 @@ Ext.define('amdaDesktop.ExplorerModule', {
299 300 Ext.Msg.show({title:'Error System', msg: e.message, icon: Ext.MessageBox.ERROR, buttons: Ext.Msg.OK});
300 301 }
301 302 },this);
  303 + },
  304 +
  305 + getParamInfoInRegistry : function(paramId) {
  306 + return this.paramInfoRegistry[paramId];
  307 + },
  308 +
  309 + addParamInfoInRegistry : function(paramId, paramInfo) {
  310 + this.paramInfoRegistry[paramId] = paramInfo;
302 311 }
303 312 });
... ...
js/app/views/ParamArgumentsUI.js
  Diff comments   View file @0314bd3
... ... @@ -40,6 +40,22 @@ Ext.define('amdaUI.ParamArgumentsUI', {
40 40 var me = this;
41 41 me.mask();
42 42 me.resetArguments();
  43 +
  44 + var explorerModule = myDesktopApp.getLoadedModule(myDesktopApp.dynamicModules.explorer.id);
  45 +
  46 + if (explorerModule) {
  47 + paramInfo = explorerModule.getParamInfoInRegistry(paramId);
  48 + if (paramInfo) {
  49 + //Re-use already loaded param info
  50 + me.rebuildAll(paramInfo, crtArgsValues, uiScope);
  51 + if (onReady)
  52 + onReady(uiScope);
  53 + me.unmask();
  54 + return;
  55 + }
  56 + }
  57 +
  58 + //Ajax request to get parameter info
43 59 AmdaAction.getParamInfo({"paramId" : paramId}, function (result, e) {
44 60 if (e.status === true)
45 61 {
... ... @@ -52,25 +68,12 @@ Ext.define('amdaUI.ParamArgumentsUI', {
52 68 }
53 69 else
54 70 {
55   - //Rebuild arguments selection
56   - me.rebuildArguments(result, uiScope);
  71 + //Store parameter info in registry
  72 + if (explorerModule)
  73 + explorerModule.addParamInfoInRegistry(paramId, result);
57 74  
58   - //Set values
59   - var argsValues = crtArgsValues;
60   - if (!argsValues)
61   - argsValues = {};
62   - if (result.template && result.template.arguments) {
63   - if (!argsValues['template_args'])
64   - argsValues['template_args'] = {};
65   - //Add default template args definition if needed
66   - Ext.Object.each(result.template.arguments, function (argKey, argDef) {
67   - if (!argsValues['template_args'][argKey])
68   - argsValues['template_args'][argKey] = argDef['default'];
69   - }, me);
70   - }
71   - me.setValues(argsValues);
  75 + me.rebuildAll(result, crtArgsValues, uiScope);
72 76  
73   - //Set default values
74 77 if (onReady)
75 78 onReady(uiScope);
76 79 }
... ... @@ -83,6 +86,27 @@ Ext.define('amdaUI.ParamArgumentsUI', {
83 86 });
84 87 },
85 88  
  89 + rebuildAll: function(paramInfoResult, crtArgsValues, uiScope) {
  90 + //Rebuild arguments selection
  91 + this.rebuildArguments(paramInfoResult, uiScope);
  92 +
  93 + //Set values
  94 + var argsValues = crtArgsValues;
  95 + if (!argsValues)
  96 + argsValues = {};
  97 + if (paramInfoResult.template && paramInfoResult.template.arguments) {
  98 + if (!argsValues['template_args'])
  99 + argsValues['template_args'] = {};
  100 +
  101 + //Add default template args definition if needed
  102 + Ext.Object.each(paramInfoResult.template.arguments, function (argKey, argDef) {
  103 + if (!argsValues['template_args'][argKey])
  104 + argsValues['template_args'][argKey] = argDef['default'];
  105 + }, this);
  106 + }
  107 + this.setValues(argsValues);
  108 + },
  109 +
86 110 setValues: function(values) {
87 111 this.items.each(function (item) {
88 112 if (this.regexp_istemplate.test(item.getId())) {
... ...