CDPP / AMDA_IHM

Commit 2719c3a25a08b36da0001e0129b17ed6fb808c29

Authored by Benjamin Renard
2 parents ba9db22b 86c573e5
Exists in master and in 72 other branches 10098, 10178, 5390, 6629, 7616, 8459, 8528, 9014, 9016Bis, 9084, 9326, 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, amdadev, amdadev_test, anr_tempete, cu2022, density_maps, develop, epn-tap, master_vge, mlplasmas, openam, test-merge

Merge branch 'develop' into amdadev

Showing 3 changed files with 4 additions and 38 deletions   Show diff stats
Inline Side-by-side
js/app/controllers/PlotModule.js
  Diff comments   View file @2719c3a
... ... @@ -216,20 +216,6 @@ Ext.define('amdaDesktop.PlotModule', {
216 216 });
217 217 }
218 218 },
219   - addTT :function(ttName, ttId){
220   - var me = this;
221   - var desktop = this.app.getDesktop();
222   - var win = desktop.getWindow(this.id);
223   - if (win) {
224   - me.getUiContent().addTT(ttName, ttId);
225   - win.show();
226   - }
227   - else {
228   - this.createWindow(function () {
229   - me.getUiContent().addTT(ttName, ttId);
230   - });
231   - }
232   - },
233 219 editPlot : function(plotNode) {
234 220 var me = this;
235 221 var desktop = this.app.getDesktop();
... ...
js/app/models/InteractiveNode.js
  Diff comments   View file @2719c3a
... ... @@ -463,7 +463,7 @@ Ext.define('amdaModel.InteractiveNode', {
463 463 this.generateTT(this);
464 464 break;
465 465 case 'plotTT':
466   - this.ttPlot(this);
  466 + this.createPlot(this);
467 467 break;
468 468 default:
469 469 break;
... ... @@ -817,12 +817,5 @@ Ext.define('amdaModel.InteractiveNode', {
817 817 timeTabNode.editInModule();
818 818 });
819 819 },
820   - ttPlot : function(node) {
821   - // download Module
822   - if (node.get('disable')) return;
823   - myDesktopApp.getLoadedModule(myDesktopApp.dynamicModules.plot.id, true, function (module) {
824   - module.addTT(node.get('text'), node.get('id'));
825   - });
826   - },
827 820  
828 821 });
... ...
js/app/models/TimeTableNode.js
  Diff comments   View file @2719c3a
... ... @@ -102,8 +102,9 @@ Ext.define('amdaModel.TimeTableNode', {
102 102 case 'download':
103 103 this.ttDownload();
104 104 break;
  105 +
105 106 case 'plot':
106   - this.ttPlot(this);
  107 + this.createPlot(this);
107 108 break;
108 109 case 'operations':
109 110 this.ttOperations();
... ... @@ -146,15 +147,7 @@ Ext.define('amdaModel.TimeTableNode', {
146 147 var uidownload = module.getUiContent();
147 148 uidownload.addTTdownload(me.get('text'), me.get('id'));
148 149 });
149   - },
150   - ttPlot : function(node) {
151   - // download Module
152   - if (node.get('disable')) return;
153   - myDesktopApp.getLoadedModule(myDesktopApp.dynamicModules.plot.id, true, function (module) {
154   - module.addTT(node.get('text'), node.get('id'));
155   - });
156   - },
157   -
  150 + },
158 151 ttOperations : function() {
159 152 var me = this;
160 153 myDesktopApp.getLoadedModule(myDesktopApp.dynamicModules.tt_op.id, true, function (module) {
... ... @@ -175,12 +168,6 @@ Ext.define('amdaModel.TimeTableNode', {
175 168 item.ttDownload();
176 169 })
177 170 },
178   - plotMulti: function(){
179   - var selection = this.myGetOwnerTree().getSelectionModel().selected.items;
180   - Ext.Array.each(selection,function(item,index,allItems){
181   - item.ttPlot();
182   - })
183   - },
184 171  
185 172 operationsMulti: function(){
186 173 var selection = this.myGetOwnerTree().getSelectionModel().selected.items;
... ...