Merge branch 'master' of https://gitlab.irap.omp.eu/CDPP/AMDA_IHM

elena
2 parents 9d412dda 488b1401
Showing 4 changed files with 34 additions and 8 deletions Show diff stats
js/app/controllers/PlotModule.js
js/app/views/PlotTabResultUI.js
php/classes/AmdaAction.php
php/config.php
@@ -130,6 +130,14 @@ Ext.define(&#39;amdaDesktop.PlotModule&#39;, {
     	});
     },
  
+    getInteractiveMultiPlotState : function() {
+    	var state = {};
+    	this.plotResultWindowsManager.each(function (key, value, length) {
+    		state[value.getPanelResult().tabId] = value.getPanelResult().getInteractiveMultiPlotState();
+    	});
+    	return state;
+    },
+    
     getWindowResult: function(winResultId){
 	    if (!this.plotResultWindowsManager.get(winResultId)) return null;
 	    return this.plotResultWindowsManager.get(winResultId);	    
@@ -30,6 +30,7 @@ Ext.define(&#39;amdaUI.PlotTabResultUI&#39;, {
     navToolBar : null,
     isTTNavBar : false,
     crtTTFileIndex : 0,
+    disableSynchronize: false,
  
     hiddenForm: null,
  
@@ -57,6 +58,10 @@ Ext.define(&#39;amdaUI.PlotTabResultUI&#39;, {
     	return 'data/'+sessionID +'/RES/'+resultFolder+ '/' + plotFile;
     },
  
+    getInteractiveMultiPlotState: function() {
+    	return this.multiPlotCheck.getValue();
+    },
+    
     toPixelOnSourceImage : function(value) {
 		return value*100/this.sliderPage.getValue();
 	},
@@ -350,7 +355,9 @@ Ext.define(&#39;amdaUI.PlotTabResultUI&#39;, {
  
     	this.updateTimeTableInfo();
  
+    	this.disableSynchronize = true;
     	this.multiPlotCheck.setValue(configResult.multiplot);
+    	this.disableSynchronize = false;
  
     	this.panelImage.setSrc(this.getImageUrl(configResult.folder, configResult.plotFile));
  
@@ -380,7 +387,11 @@ Ext.define(&#39;amdaUI.PlotTabResultUI&#39;, {
  
     callInteractivePlot : function(obj) {
     	loadMask.show(true);
-    	AmdaAction.interactivePlot(obj, function (result, e) {
+    	
+    	var plotModule = myDesktopApp.getLoadedModule(myDesktopApp.dynamicModules.plot.id);
+    	var multiPlotState = plotModule.getInteractiveMultiPlotState();
+    	
+    	AmdaAction.interactivePlot(obj, multiPlotState, function (result, e) {
     		loadMask.hide();
     		var t = e.getTransaction();
 			if (e.status) 
@@ -389,9 +400,7 @@ Ext.define(&#39;amdaUI.PlotTabResultUI&#39;, {
 				{
 					if (result.success)
 					{
-						myDesktopApp.getLoadedModule(myDesktopApp.dynamicModules.plot.id, true, function (module) {
-							module.updateInteractiveSession(result, false);    
-						});
+						plotModule.updateInteractiveSession(result, false);
 					}
 					else
 						myDesktopApp.errorMsg('Interactive action error - '+result.message);
@@ -415,7 +424,10 @@ Ext.define(&#39;amdaUI.PlotTabResultUI&#39;, {
     		boxLabel : 'Linked to Multi Plot Mode',
     		scope: this,
         	handler: function(check, checked) {
-        	}
+        		if (!this.disableSynchronize)
+        			this.callInteractivePlot({'action' : 'synchronize', 'tabId' : this.tabId});
+        	},
+        	scope: this
     	});
  
     	var commonItemsCfg = [
@@ -658,7 +670,9 @@ Ext.define(&#39;amdaUI.PlotTabResultUI&#39;, {
  
     	this.updateTimeTableInfo();
  
+    	this.disableSynchronize = true;
     	this.multiPlotCheck.setValue(configResult.multiplot);
+    	this.disableSynchronize = false;
  
     	var plotResultTabPanelConfig = {
     			preventHeader : true,
@@ -1256,10 +1256,14 @@ class AmdaAction {
              return array('success' => true);
         }
  
-        public function interactivePlot($obj)
+        public function interactivePlot($obj, $multiPlotState)
         {
         	require_once(INTEGRATION_SRC_DIR."RequestManager.php");
-        	return $this->executeRequest($obj, FunctionTypeEnumClass::ACTION);
+        	$inputobj = (Object)array(
+        		'action' => $obj,
+        		'multiPlotState' => $multiPlotState
+        	);
+        	return $this->executeRequest($inputobj, FunctionTypeEnumClass::ACTION);
         }
 }
 ?>
@@ -379,7 +379,7 @@ $API = array(
 		'len'=>1
 		),
         'interactivePlot'=>array(
-		'len'=>1
+		'len'=>2
 		)
 		)
       )