Commit b0a1c31bd047330e42e24db67564c8470ae51ca3

Authored by Benjamin Renard
1 parent c9db9962

Remove multi-plot options

js/app/controllers/PlotModule.js
... ... @@ -196,15 +196,6 @@ Ext.define('amdaDesktop.PlotModule', {
196 196 }
197 197 },
198 198  
199   - getInteractiveMultiPlotState : function() {
200   - var state = {};
201   - this.plotResultWindowsManager.each(function (key, value, length) {
202   - if (value.getPanelResult)
203   - state[value.getPanelResult().tabId] = value.getPanelResult().getInteractiveMultiPlotState();
204   - });
205   - return state;
206   - },
207   -
208 199 getWindowResult: function(winResultId){
209 200 if (!this.plotResultWindowsManager.get(winResultId)) return null;
210 201 return this.plotResultWindowsManager.get(winResultId);
... ...
js/app/models/PlotObjects/PlotRequestObject.js
... ... @@ -35,7 +35,6 @@ Ext.define('amdaPlotObj.PlotRequestObject', {
35 35 {name: 'one-file-per-interval', type: 'boolean'},
36 36  
37 37 {name: 'tree-full-view', type: 'boolean'},
38   - {name: 'multi-plot-linked', type: 'boolean'},
39 38 {name: 'page-node-state', type: 'int', defaultValue: 2}, //0 : collapsed, 1 : expanded, 2 : not set
40 39 {name: 'panels-node-state', type: 'int', defaultValue: 2}, //0 : collapsed, 1 : expanded, 2 : not set
41 40  
... ... @@ -165,8 +164,6 @@ Ext.define('amdaPlotObj.PlotRequestObject', {
165 164  
166 165 this.set('tree-full-view', amdaPlotObj.PlotObjectConfig.defaultValues.tree.fullView);
167 166  
168   - this.set('multi-plot-linked', false);
169   -
170 167 this.set('page-title-text', '');
171 168 this.set('page-title-color', amdaPlotObj.PlotObjectConfig.defaultValues.page.title.color);
172 169 this.set('page-title-position', amdaPlotObj.PlotObjectConfig.defaultValues.page.title.position);
... ... @@ -243,7 +240,6 @@ Ext.define('amdaPlotObj.PlotRequestObject', {
243 240 requestValues['one-file-per-interval'] = this.get('one-file-per-interval');
244 241  
245 242 requestValues['tree-full-view'] = this.get('tree-full-view');
246   - requestValues['multi-plot-linked'] = this.get('multi-plot-linked');
247 243 requestValues['page-node-state'] = this.get('page-node-state');
248 244 requestValues['panels-node-state'] = this.get('panels-node-state');
249 245  
... ...
js/app/views/PlotComponents/PlotTree.js
... ... @@ -63,7 +63,6 @@ Ext.define('amdaPlotComp.PlotTree', {
63 63 this.suspendLayouts();
64 64 this.buildPanelsNode();
65 65 this.simplifiedViewCombo.setValue(this.tabObject.get('tree-full-view'));
66   - this.linkToMultiPlotCombo.setValue(this.tabObject.get('multi-plot-linked'));
67 66 this.resumeLayouts(true);
68 67 },
69 68  
... ... @@ -887,21 +886,6 @@ Ext.define('amdaPlotComp.PlotTree', {
887 886 }
888 887 });
889 888  
890   - this.linkToMultiPlotCombo = Ext.create('Ext.form.field.Checkbox', {
891   - xtype: 'checkbox',
892   - boxLabel: 'Link to MultiPlot',
893   - disabled: true,
894   - listeners: {
895   - change: function(combo, newValue, oldValue, eOpts) {
896   - if (this.tabObject)
897   - {
898   - this.tabObject.set('multi-plot-linked', newValue);
899   - }
900   - },
901   - scope: this
902   - }
903   - });
904   -
905 889 var myConf = {
906 890 store: store,
907 891 rootVisible: false,
... ... @@ -955,8 +939,6 @@ Ext.define('amdaPlotComp.PlotTree', {
955 939 scope: this
956 940 },
957 941 '-', '->',
958   - this.linkToMultiPlotCombo,
959   - ' ',
960 942 this.simplifiedViewCombo
961 943 ]
962 944 };
... ...
js/app/views/PlotTabResultUI.js
... ... @@ -23,7 +23,6 @@ Ext.define('amdaUI.PlotTabResultUI', {
23 23 panelImage : null,
24 24 crtContext : null,
25 25 tabId : '',
26   - multiPlotCheck : null,
27 26 navToolBar : null,
28 27 isTTNavBar : false,
29 28 crtTTFileIndex : 0,
... ... @@ -55,12 +54,6 @@ Ext.define('amdaUI.PlotTabResultUI', {
55 54 return 'data/'+sessionID +'/RES/'+resultFolder+ '/' + plotFile;
56 55 },
57 56  
58   - getInteractiveMultiPlotState: function() {
59   - if (!this.multiPlotCheck)
60   - return false;
61   - return this.multiPlotCheck.getValue();
62   - },
63   -
64 57 toPixelOnSourceImage : function(value) {
65 58 return value*100/this.sliderPage.getValue();
66 59 },
... ... @@ -388,13 +381,6 @@ Ext.define('amdaUI.PlotTabResultUI', {
388 381  
389 382 this.updateTimeTableInfo();
390 383  
391   - if (this.multiPlotCheck)
392   - {
393   - this.disableSynchronize = true;
394   - this.multiPlotCheck.setValue(configResult.multiplot);
395   - this.disableSynchronize = false;
396   - }
397   -
398 384 this.panelImage.setSrc(this.getImageUrl(configResult.folder, configResult.plotFile));
399 385  
400 386 var size = this.getImageSize();
... ... @@ -425,9 +411,8 @@ Ext.define('amdaUI.PlotTabResultUI', {
425 411 loadMask.show(true);
426 412  
427 413 var plotModule = myDesktopApp.getLoadedModule(myDesktopApp.dynamicModules.plot.id);
428   - var multiPlotState = plotModule.getInteractiveMultiPlotState();
429 414  
430   - AmdaAction.interactivePlot(obj, multiPlotState, function (result, e) {
  415 + AmdaAction.interactivePlot(obj, function (result, e) {
431 416 loadMask.hide();
432 417 var t = e.getTransaction();
433 418 if (e.status)
... ... @@ -456,28 +441,12 @@ Ext.define('amdaUI.PlotTabResultUI', {
456 441 if (this.navToolBar)
457 442 this.navToolBar.removeAll(true);
458 443  
459   - this.multiPlotCheck = Ext.create('Ext.form.field.Checkbox', {
460   - boxLabel : 'Linked to Multi Plot',
461   - scope: this,
462   - handler: function(check, checked) {
463   - if (!this.disableSynchronize)
464   - this.callInteractivePlot({'action' : 'synchronize', 'tabId' : this.tabId});
465   - },
466   - scope: this
467   - });
468   -
469 444 var commonItemsCfg = [
470 445 '-',
471 446 {
472 447 xtype: 'tbspacer',
473 448 width: 20
474 449 },
475   - this.multiPlotCheck,
476   - {
477   - xtype: 'tbspacer',
478   - width: 2
479   - },
480   - '-',
481 450 '->',
482 451 {
483 452 text: 'Get HST Data',
... ... @@ -700,13 +669,6 @@ Ext.define('amdaUI.PlotTabResultUI', {
700 669  
701 670 this.updateTimeTableInfo();
702 671  
703   - if (this.multiPlotCheck)
704   - {
705   - this.disableSynchronize = true;
706   - this.multiPlotCheck.setValue(configResult.multiplot);
707   - this.disableSynchronize = false;
708   - }
709   -
710 672 var plotResultTabPanelConfig = {
711 673 preventHeader : true,
712 674 autoScroll: true,
... ...