Improve MultiPlotUI (#8314)

Benjamin Renard
1 parent 9a89081f
Showing 5 changed files with 37 additions and 7 deletions Show diff stats
js/app/controllers/PlotModule.js
js/app/views/MultiPlotUI.js
js/app/views/PlotComponents/PlotTabContent.js
js/app/views/PlotComponents/PlotTabPanel.js
js/app/views/PlotUI.js
@@ -270,11 +270,13 @@ Ext.define(&#39;amdaDesktop.PlotModule&#39;, {
                         listeners: {
                             beforeclose: function(win,opt) {
                                 me.multiPlotWin = null;
+                                me.getUiContent().enableSinglePlot(true);
                             }
                         }
 		});
 	}
  
+        this.getUiContent().enableSinglePlot(false);
 	this.multiPlotWin.show();
  
     },
@@ -283,6 +285,7 @@ Ext.define(&#39;amdaDesktop.PlotModule&#39;, {
         if (this.multiPlotWin) {
             this.multiPlotWin.items.items[0].refreshMultiPlot();
         }
+        this.getUiContent().enableSinglePlot(!this.isMultiPlot());
     },
  
     isMultiPlot : function() {
@@ -14,7 +14,6 @@ Ext.define(&#39;amdaUI.MultiPlotUI&#39;, {
     plotWin: null,
  
     timeSelector: null,
-    newInteractiveSessionCheck: null, 
     plotSelector: null,
  
     constructor: function(config) {
@@ -54,6 +53,17 @@ Ext.define(&#39;amdaUI.MultiPlotUI&#39;, {
             return false;
         }
  
+        // At least one plot must be selected
+        var nbSelected = 0;
+        this.plotSelector.items.each(function(item) {
+            if (item.checked)
+                ++nbSelected;
+        });
+        if (nbSelected == 0) {
+            myDesktopApp.errorMsg('At least one Plot must be selected');
+            return false;
+        }
+
 	// Execute multiplot request
 	var plotModule = myDesktopApp.getLoadedModule(myDesktopApp.dynamicModules.plot.id);
 	plotModule.linkedNode.execute();
@@ -63,16 +73,14 @@ Ext.define(&#39;amdaUI.MultiPlotUI&#39;, {
         var me = this;
  
         this.timeSelector = new amdaUI.TimeSelectorUI( { id: 'multiplot-time-selector', border : false, collapsible: false, height: 180} );
-	this.newInteractiveSessionCheck =  Ext.create('Ext.form.Checkbox', {
-            xtype: 'checkbox',
-            boxLabel: 'New Interactive Session for Selected Plot Requests'
-	});
         this.plotSelector = Ext.create('Ext.form.CheckboxGroup', {
             xtype: 'checkboxgroup',
             flex: 1,
             columns: 3,
             minHeight: 40,
-            autoScroll: true
+            autoScroll: true,
+            fieldLabel: 'Select plots to synchronize',
+            labelAlign: 'top'
         });
         var myConf = {
             layout: {
@@ -82,7 +90,6 @@ Ext.define(&#39;amdaUI.MultiPlotUI&#39;, {
             },
             items: [
                 this.plotSelector,
-                this.newInteractiveSessionCheck,
                 this.timeSelector
             ],
             listeners: {
@@ -195,6 +195,10 @@ Ext.define(&#39;amdaPlotComp.PlotTabContent&#39;, {
         this.plotNode = plotNode;
     },
  
+    enableTimeSelection : function(enable) {
+        this.timeSelector.setDisabled(!enable);
+    },
+
     init : function(config) {
         this.setPlotNode(config.plotNode);
         this.tabIndex = config.tabIndex;
@@ -212,6 +212,14 @@ Ext.define(&#39;amdaPlotComp.PlotTabPanel&#39;, {
         var plotModule = myDesktopApp.getLoadedModule(myDesktopApp.dynamicModules.plot.id);
         plotModule.refreshMultiPlot();
     },
+
+    enableTimeSelection: function(enable)
+    {
+        for (i = 0; i < this.items.getCount(); ++i)
+        {
+            this.items.getAt(i).items.getAt(0).enableTimeSelection(enable);
+        }
+    },
  
     init : function(config) {
         var me = this;
@@ -147,6 +147,13 @@ Ext.define(&#39;amdaUI.PlotUI&#39;, {
                 plotTab.savePlot();
         }
     },
+
+    enableSinglePlot : function(enable) {
+        var plotButton = this.queryById('single-plot-button');
+        plotButton.setDisabled(!enable);
+        plotButton.setTooltip(enable ? 'Plot request' : 'Multiplot is enabled');
+        this.plotTabs.enableTimeSelection(enable);
+    },
  
     init : function(config) {
         this.plotTabs = new amdaPlotComp.PlotTabPanel({plotUI : this});
@@ -165,6 +172,7 @@ Ext.define(&#39;amdaUI.PlotUI&#39;, {
                 {
                     xtype: 'button',
                     text: 'Plot',
+                    id: 'single-plot-button',
                     scope: this,
                     handler: function(button) {
                         this.doPlot();