CDPP / AMDA_IHM

Commit 9fad58346c31c3ad6fc3311cc83f66105918de28

Authored by Elena.Budnik
1 parent 735c653b
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

redmine #4795

Showing 6 changed files with 95 additions and 93 deletions   Show diff stats
Inline Side-by-side
js/app/models/InteractiveNode.js
  Diff comments   View file @9fad583
... ... @@ -511,10 +511,6 @@ Ext.define('amdaModel.InteractiveNode', {
511 511 module.getUiContent().setTimeFromData(node.getTimeFromNode(node));
512 512 }
513 513 }
514   - if (node.get('needsArgs') && !node.get('isSpectra')) {
515   - module.getUiContent().fireEvent('openParamEditor',node.get('id'));
516   - }
517   - else {
518 514 var paramName;
519 515 var components = null;
520 516 switch (node.$className) {
... ... @@ -533,18 +529,17 @@ Ext.define('amdaModel.InteractiveNode', {
533 529 else
534 530 paramName = node.get('id');
535 531 }
536   - var component_info = node.get('component_info');
537   - if (component_info && component_info.parentId) {
538   - //It's a component
539   - paramName = component_info.parentId;
540   - components = [];
541   - if (component_info.index1)
542   - components['index1'] = component_info.index1;
543   - if (component_info.index2)
544   - components['index2'] = component_info.index2;
545   - }
546   - module.addParam(paramName,true,node.get('needsArgs'),components);
547   - }
  532 +// var component_info = node.get('component_info');
  533 +// if (component_info && component_info.parentId) {
  534 +// //It's a component
  535 +// paramName = component_info.parentId;
  536 +// components = [];
  537 +// if (component_info.index1)
  538 +// components['index1'] = component_info.index1;
  539 +// if (component_info.index2)
  540 +// components['index2'] = component_info.index2;
  541 +// }
  542 + module.addParam(paramName,true,node.get('needsArgs'),components);
548 543 });
549 544 },
550 545  
... ...
js/app/models/LocalParamNode.js
  Diff comments   View file @9fad583
... ... @@ -179,16 +179,16 @@ Ext.define('amdaModel.LocalParamNode',
179 179 paramName = "#"+node.get('alias');
180 180 else
181 181 paramName = node.get('id');
182   - var component_info = node.get('component_info');
183   - if (component_info && component_info.parentId) {
184   - //It's a component
185   - paramName = component_info.parentId;
186   - components = [];
187   - if (component_info.index1)
188   - components['index1'] = component_info.index1;
189   - if (component_info.index2)
190   - components['index2'] = component_info.index2;
191   - }
  182 +// var component_info = node.get('component_info');
  183 +// if (component_info && component_info.parentId) {
  184 +// //It's a component
  185 +// paramName = component_info.parentId;
  186 +// components = [];
  187 +// if (component_info.index1)
  188 +// components['index1'] = component_info.index1;
  189 +// if (component_info.index2)
  190 +// components['index2'] = component_info.index2;
  191 +// }
192 192  
193 193 module.addParam(paramName,true,node.get('needsArgs'),components);
194 194 });
... ...
js/app/models/RemoteSimuParamNode.js
  Diff comments   View file @9fad583
... ... @@ -10,46 +10,52 @@
10 10  
11 11 Ext.define('amdaModel.RemoteSimuParamNode', {
12 12  
13   - extend: 'amdaModel.LocalParamNode',
  13 + extend: 'amdaModel.LocalParamNode',
14 14  
15   - statics:{
16   - nodeType: 'remoteSimuParam'
17   - },
  15 + statics:{
  16 + nodeType: 'remoteSimuParam'
  17 + },
18 18  
19   - requires: 'amdaUI.InteropImpexUI',
20   -
21   - fields: [
22   - {name: 'isRemoteDataSet', type:'boolean', persist: false, defaultValue: true},
23   - {name: 'isSimulation', type:'boolean', defaultValue: true},
24   - {name: 'isAddable', type:'boolean', defaultValue: false},
25   - {name: 'isDeletable', type:'boolean', defaultValue: false},
26   - {name: 'rank', type: 'integer', persist: false, defaultValue: null}
27   - ],
  19 + requires: 'amdaUI.InteropImpexUI',
  20 +
  21 + fields: [
  22 + {name: 'isRemoteDataSet', type:'boolean', persist: false, defaultValue: true},
  23 + {name: 'isSimulation', type:'boolean', defaultValue: true},
  24 + {name: 'isAddable', type:'boolean', defaultValue: false},
  25 + {name: 'isDeletable', type:'boolean', defaultValue: false},
  26 + {name: 'rank', type: 'integer', persist: false, defaultValue: null}
  27 + ],
28 28  
29   - constructor : function(config){
30   - this.callParent(arguments);
31   - if (this.get('isParameter')) this.set('needsArgs',this.get('needsArgs'));
32   - if (this.get('leaf') && this.get('isSpectra')) this.set('iconCls', 'icon-spectra');
33   - if (this.get('disable')) {
34   - this.set('cls', 'icon-disabled');
35   - this.set('allowDrag', false);
36   - }
  29 + constructor : function(config)
  30 + {
  31 + this.callParent(arguments);
  32 +
  33 + if (this.get('isParameter'))
  34 + this.set('needsArgs',this.get('needsArgs'));
  35 + if (this.get('leaf') && this.get('isSpectra'))
  36 + this.set('iconCls', 'icon-spectra');
  37 + if (this.get('disable'))
  38 + {
  39 + this.set('cls', 'icon-disabled');
  40 + this.set('allowDrag', false);
  41 + }
37 42  
38   - if (this.get('rank')) {
39   - var rank = this.get('rank');
40   - if (rank == 1) this.set('iconCls', 'icon-mercury');
41   - if (rank == 2) this.set('iconCls', 'icon-venus');
42   - if (rank == 5) this.set('iconCls', 'icon-earth');
43   - if (rank == 6) this.set('iconCls', 'icon-earth');
44   - if (rank == 7) this.set('iconCls', 'icon-mars');
45   - if (rank == 8) this.set('iconCls', 'icon-jupiter');
46   - if (rank == 9) this.set('iconCls', 'icon-saturn');
47   - if (rank == 93) this.set('iconCls', 'icon-comet');
48   - if (rank == 3) this.set('iconCls', 'icon-sw');
49   - if (rank == 4) this.set('iconCls', 'icon-sw');
50   - if (rank >= 99) this.set('iconCls', 'icon-solarsystem');
51   - }
52   - },
  43 + if (this.get('rank')) {
  44 + var rank = this.get('rank');
  45 +
  46 + if (rank == 1) this.set('iconCls', 'icon-mercury');
  47 + if (rank == 2) this.set('iconCls', 'icon-venus');
  48 + if (rank == 5) this.set('iconCls', 'icon-earth');
  49 + if (rank == 6) this.set('iconCls', 'icon-earth');
  50 + if (rank == 7) this.set('iconCls', 'icon-mars');
  51 + if (rank == 8) this.set('iconCls', 'icon-jupiter');
  52 + if (rank == 9) this.set('iconCls', 'icon-saturn');
  53 + if (rank == 93) this.set('iconCls', 'icon-comet');
  54 + if (rank == 3) this.set('iconCls', 'icon-sw');
  55 + if (rank == 4) this.set('iconCls', 'icon-sw');
  56 + if (rank >= 99) this.set('iconCls', 'icon-solarsystem');
  57 + }
  58 + },
53 59  
54 60  
55 61 allMenuItems : function() {
... ...
js/app/views/DownloadUI.js
  Diff comments   View file @9fad583
... ... @@ -433,16 +433,16 @@ Ext.define('amdaUI.DownloadUI', {
433 433 idToSent = data.records[0].get('id');
434 434 if (data.records[0].get('alias')!= "" )
435 435 idToSent = "#"+data.records[0].get('alias');
436   - var component_info = data.records[0].get('component_info');
437   - if (component_info && component_info.parentId) {
438   - //It's a component
439   - idToSent = component_info.parentId;
440   - components = [];
441   - if (component_info.index1)
442   - components['index1'] = component_info.index1;
443   - if (component_info.index2)
444   - components['index2'] = component_info.index2;
445   - }
  436 +// var component_info = data.records[0].get('component_info');
  437 +// if (component_info && component_info.parentId) {
  438 +// //It's a component
  439 +// idToSent = component_info.parentId;
  440 +// components = [];
  441 +// if (component_info.index1)
  442 +// components['index1'] = component_info.index1;
  443 +// if (component_info.index2)
  444 +// components['index2'] = component_info.index2;
  445 +// }
446 446 break;
447 447 case 'alias' :
448 448 idToSent = "#"+data.records[0].get('text');
... ... @@ -456,7 +456,7 @@ Ext.define('amdaUI.DownloadUI', {
456 456 default :
457 457 return false;
458 458 }
459   - var downModule = myDesktopApp.getLoadedModule(myDesktopApp.dynamicModules.download.id);
  459 + var downModule = myDesktopApp.getLoadedModule(myDesktopApp.dynamicModules.download.id);
460 460 if (downModule)
461 461 downModule.addParam(idToSent,data.records[0].get('leaf'), data.records[0].get('needsArgs'), components);
462 462 return true;
... ...
js/app/views/ParameterUI.js
  Diff comments   View file @9fad583
... ... @@ -314,16 +314,16 @@ Ext.define('amdaUI.ParameterUI', {
314 314 nameToSent = data.records[0].get('id');
315 315 if (data.records[0].get('alias')!= "" )
316 316 var nameToSent = "#"+data.records[0].get('alias');
317   - var component_info = data.records[0].get('component_info');
318   - if (component_info && component_info.parentId) {
319   - //It's a component
320   - nameToSent = component_info.parentId;
321   - components = [];
322   - if (component_info.index1)
323   - components['index1'] = component_info.index1;
324   - if (component_info.index2)
325   - components['index2'] = component_info.index2;
326   - }
  317 +// var component_info = data.records[0].get('component_info');
  318 +// if (component_info && component_info.parentId) {
  319 +// //It's a component
  320 +// nameToSent = component_info.parentId;
  321 +// components = [];
  322 +// if (component_info.index1)
  323 +// components['index1'] = component_info.index1;
  324 +// if (component_info.index2)
  325 +// components['index2'] = component_info.index2;
  326 +// }
327 327 break;
328 328 case 'alias' :
329 329 nameToSent = "#"+data.records[0].get('text');
... ...
js/app/views/SearchUI.js
  Diff comments   View file @9fad583
... ... @@ -356,16 +356,17 @@ Ext.define('amdaUI.SearchUI', {
356 356 nameToSent = data.records[0].get('id');
357 357 if (data.records[0].get('alias')!= "" )
358 358 nameToSent = "#"+data.records[0].get('alias');
359   - var component_info = data.records[0].get('component_info');
360   - if (component_info && component_info.parentId) {
361   - //It's a component
362   - nameToSent = component_info.parentId;
363   - components = [];
364   - if (component_info.index1)
365   - components['index1'] = component_info.index1;
366   - if (component_info.index2)
367   - components['index2'] = component_info.index2;
368   - }
  359 +// var component_info = data.records[0].get('component_info');
  360 +// if (component_info && component_info.parentId) {
  361 +// if ( component_info.index1 && component_info.index2 ){
  362 +// nameToSent = component_info.parentId;
  363 +// components = [];
  364 +// if (component_info.index1)
  365 +// components['index1'] = component_info.index1;
  366 +// if (component_info.index2)
  367 +// components['index2'] = component_info.index2;
  368 +// }
  369 +// }
369 370 break;
370 371 case 'alias' :
371 372 nameToSent = "#"+data.records[0].get('text');
... ...