diff --git a/js/app/controllers/PlotModule.js b/js/app/controllers/PlotModule.js index 4adc620..6350e5f 100644 --- a/js/app/controllers/PlotModule.js +++ b/js/app/controllers/PlotModule.js @@ -196,15 +196,6 @@ Ext.define('amdaDesktop.PlotModule', { } }, - getInteractiveMultiPlotState : function() { - var state = {}; - this.plotResultWindowsManager.each(function (key, value, length) { - if (value.getPanelResult) - state[value.getPanelResult().tabId] = value.getPanelResult().getInteractiveMultiPlotState(); - }); - return state; - }, - getWindowResult: function(winResultId){ if (!this.plotResultWindowsManager.get(winResultId)) return null; return this.plotResultWindowsManager.get(winResultId); diff --git a/js/app/models/PlotObjects/PlotRequestObject.js b/js/app/models/PlotObjects/PlotRequestObject.js index 1b5192b..7fa4cc1 100644 --- a/js/app/models/PlotObjects/PlotRequestObject.js +++ b/js/app/models/PlotObjects/PlotRequestObject.js @@ -35,7 +35,6 @@ Ext.define('amdaPlotObj.PlotRequestObject', { {name: 'one-file-per-interval', type: 'boolean'}, {name: 'tree-full-view', type: 'boolean'}, - {name: 'multi-plot-linked', type: 'boolean'}, {name: 'page-node-state', type: 'int', defaultValue: 2}, //0 : collapsed, 1 : expanded, 2 : not set {name: 'panels-node-state', type: 'int', defaultValue: 2}, //0 : collapsed, 1 : expanded, 2 : not set @@ -165,8 +164,6 @@ Ext.define('amdaPlotObj.PlotRequestObject', { this.set('tree-full-view', amdaPlotObj.PlotObjectConfig.defaultValues.tree.fullView); - this.set('multi-plot-linked', false); - this.set('page-title-text', ''); this.set('page-title-color', amdaPlotObj.PlotObjectConfig.defaultValues.page.title.color); this.set('page-title-position', amdaPlotObj.PlotObjectConfig.defaultValues.page.title.position); @@ -243,7 +240,6 @@ Ext.define('amdaPlotObj.PlotRequestObject', { requestValues['one-file-per-interval'] = this.get('one-file-per-interval'); requestValues['tree-full-view'] = this.get('tree-full-view'); - requestValues['multi-plot-linked'] = this.get('multi-plot-linked'); requestValues['page-node-state'] = this.get('page-node-state'); requestValues['panels-node-state'] = this.get('panels-node-state'); diff --git a/js/app/views/PlotComponents/PlotTree.js b/js/app/views/PlotComponents/PlotTree.js index 8d919e4..8cf4fa8 100644 --- a/js/app/views/PlotComponents/PlotTree.js +++ b/js/app/views/PlotComponents/PlotTree.js @@ -63,7 +63,6 @@ Ext.define('amdaPlotComp.PlotTree', { this.suspendLayouts(); this.buildPanelsNode(); this.simplifiedViewCombo.setValue(this.tabObject.get('tree-full-view')); - this.linkToMultiPlotCombo.setValue(this.tabObject.get('multi-plot-linked')); this.resumeLayouts(true); }, @@ -887,21 +886,6 @@ Ext.define('amdaPlotComp.PlotTree', { } }); - this.linkToMultiPlotCombo = Ext.create('Ext.form.field.Checkbox', { - xtype: 'checkbox', - boxLabel: 'Link to MultiPlot', - disabled: true, - listeners: { - change: function(combo, newValue, oldValue, eOpts) { - if (this.tabObject) - { - this.tabObject.set('multi-plot-linked', newValue); - } - }, - scope: this - } - }); - var myConf = { store: store, rootVisible: false, @@ -955,8 +939,6 @@ Ext.define('amdaPlotComp.PlotTree', { scope: this }, '-', '->', - this.linkToMultiPlotCombo, - ' ', this.simplifiedViewCombo ] }; diff --git a/js/app/views/PlotTabResultUI.js b/js/app/views/PlotTabResultUI.js index b226f57..a2313ad 100644 --- a/js/app/views/PlotTabResultUI.js +++ b/js/app/views/PlotTabResultUI.js @@ -23,7 +23,6 @@ Ext.define('amdaUI.PlotTabResultUI', { panelImage : null, crtContext : null, tabId : '', - multiPlotCheck : null, navToolBar : null, isTTNavBar : false, crtTTFileIndex : 0, @@ -55,12 +54,6 @@ Ext.define('amdaUI.PlotTabResultUI', { return 'data/'+sessionID +'/RES/'+resultFolder+ '/' + plotFile; }, - getInteractiveMultiPlotState: function() { - if (!this.multiPlotCheck) - return false; - return this.multiPlotCheck.getValue(); - }, - toPixelOnSourceImage : function(value) { return value*100/this.sliderPage.getValue(); }, @@ -388,13 +381,6 @@ Ext.define('amdaUI.PlotTabResultUI', { this.updateTimeTableInfo(); - if (this.multiPlotCheck) - { - this.disableSynchronize = true; - this.multiPlotCheck.setValue(configResult.multiplot); - this.disableSynchronize = false; - } - this.panelImage.setSrc(this.getImageUrl(configResult.folder, configResult.plotFile)); var size = this.getImageSize(); @@ -425,9 +411,8 @@ Ext.define('amdaUI.PlotTabResultUI', { loadMask.show(true); var plotModule = myDesktopApp.getLoadedModule(myDesktopApp.dynamicModules.plot.id); - var multiPlotState = plotModule.getInteractiveMultiPlotState(); - AmdaAction.interactivePlot(obj, multiPlotState, function (result, e) { + AmdaAction.interactivePlot(obj, function (result, e) { loadMask.hide(); var t = e.getTransaction(); if (e.status) @@ -456,28 +441,12 @@ Ext.define('amdaUI.PlotTabResultUI', { if (this.navToolBar) this.navToolBar.removeAll(true); - this.multiPlotCheck = Ext.create('Ext.form.field.Checkbox', { - boxLabel : 'Linked to Multi Plot', - scope: this, - handler: function(check, checked) { - if (!this.disableSynchronize) - this.callInteractivePlot({'action' : 'synchronize', 'tabId' : this.tabId}); - }, - scope: this - }); - var commonItemsCfg = [ '-', { xtype: 'tbspacer', width: 20 }, - this.multiPlotCheck, - { - xtype: 'tbspacer', - width: 2 - }, - '-', '->', { text: 'Get HST Data', @@ -700,13 +669,6 @@ Ext.define('amdaUI.PlotTabResultUI', { this.updateTimeTableInfo(); - if (this.multiPlotCheck) - { - this.disableSynchronize = true; - this.multiPlotCheck.setValue(configResult.multiplot); - this.disableSynchronize = false; - } - var plotResultTabPanelConfig = { preventHeader : true, autoScroll: true, -- libgit2 0.21.2