Merge branch 'develop' into amdadev

Benjamin Renard
2 parents c6178eae 84a1734b
Showing 8 changed files with 91 additions and 12 deletions Show diff stats
js/app/controllers/PlotModule.js
js/app/models/CatalogNode.js
js/app/models/InteractiveNode.js
js/app/models/TimeTableNode.js
js/app/models/sharedCatalogNode.js
js/app/models/sharedTimeTableNode.js
js/app/views/PlotComponents/PlotTabContent.js
js/app/views/PlotUI.js
@@ -216,7 +216,20 @@ Ext.define(&#39;amdaDesktop.PlotModule&#39;, {
             });
         }
     },
-
+    addTT :function(ttName, ttId){
+         var me = this;
+        var desktop = this.app.getDesktop();
+        var win = desktop.getWindow(this.id);
+        if (win) {
+            me.getUiContent().addTT(ttName, ttId);
+            win.show();
+        }
+        else {
+            this.createWindow(function () {
+                me.getUiContent().addTT(ttName, ttId);
+            });
+        }
+    },
     editPlot : function(plotNode) {
         var me = this;
         var desktop = this.app.getDesktop();
@@ -36,6 +36,10 @@ Ext.define(&#39;amdaModel.CatalogNode&#39;, {
 			text : 'Download '+ this.self.objectName,
 			hidden : true
 		},{
+                                                            fnId : 'leaf-plot',
+                                                            text : 'Plot '+ this.self.objectName,
+                                                            hidden : true
+                                        },{
 			fnId : 'leaf-visu',
 			text : 'Visualize '+ this.self.objectName,
 			hidden : true
@@ -43,6 +47,10 @@ Ext.define(&#39;amdaModel.CatalogNode&#39;, {
 			fnId : 'leaf-generateTT',
 			text : 'Generate Time Table ',
 			hidden : true
+		},{
+			fnId : 'leaf-generateTT',
+			text : 'Generate Time Table ',
+			hidden : true
 		}
             ];
@@ -57,6 +65,9 @@ Ext.define(&#39;amdaModel.CatalogNode&#39;, {
 		},{
 			fnId : 'mult-downloadMulti',
 			text : 'Download selected '+this.self.objectName+'s'
+		},{
+			fnId : 'mult-plotMulti',
+			text : 'Plot selected '+this.self.objectName+'s'
 		}];
 		return menuItems;
@@ -457,11 +457,14 @@ Ext.define(&#39;amdaModel.InteractiveNode&#39;, {
 				this.createDownload(this);
 				break;
 			case 'generateCatalog':
-                                this.generateCatalog(this);
-                                break;
-                        case 'generateTT':
-                                this.generateTT(this);
-                                break;
+                                                                                 this.generateCatalog(this);
+                                                                                break;
+                                                            case 'generateTT':
+                                                                                this.generateTT(this);
+                                                                                break;
+                                                           case 'plotTT':
+                                                                                this.ttPlot(this);
+                                                                                break;
 			default:
 				break;
 		} // switch end
@@ -813,6 +816,13 @@ Ext.define(&#39;amdaModel.InteractiveNode&#39;, {
                         {
                                 timeTabNode.editInModule();
                         });
-        }
+        },
+       ttPlot : function(node) {
+		// download Module	 
+		if (node.get('disable')) return;
+		myDesktopApp.getLoadedModule(myDesktopApp.dynamicModules.plot.id, true, function (module) {
+                                                      module.addTT(node.get('text'), node.get('id'));
+		});
+	},
 });
@@ -38,6 +38,10 @@ Ext.define(&#39;amdaModel.TimeTableNode&#39;, {
             text : 'Download Time Table',
             hidden : true
         },{
+            fnId : 'leaf-plot',
+            text : 'Plot Time Table',
+            hidden : true
+        },{
             fnId : 'leaf-operations',
             text : 'Operations',
             hidden : true
@@ -56,7 +60,10 @@ Ext.define(&#39;amdaModel.TimeTableNode&#39;, {
         {
             fnId : 'mult-downloadMulti',
             text : 'Download selected '+ this.self.objectName + 's'
-        },{
+        }, {
+            fnId : 'mult-plotMulti',
+            text : 'Plot selected '+ this.self.objectName + 's'
+        }, {
             fnId : 'mult-operationsMulti',
             text : 'Operations'
         }];
@@ -95,7 +102,9 @@ Ext.define(&#39;amdaModel.TimeTableNode&#39;, {
 	    case 'download':
 	    	this.ttDownload();
 	    	break;
-	    	
+	    case 'plot':
+	    	this.ttPlot(this);
+	    	break;	
 	    case 'operations':
 	        this.ttOperations();
 	        break;
@@ -111,6 +120,10 @@ Ext.define(&#39;amdaModel.TimeTableNode&#39;, {
 	    case 'downloadMulti':
 	        this.downloadMulti();
 	        break;
+                
+                      case 'plotMulti':
+	        this.plotMulti();
+	        break;
 	    case 'operationsMulti':
 	        this.operationsMulti();
@@ -134,6 +147,13 @@ Ext.define(&#39;amdaModel.TimeTableNode&#39;, {
 			uidownload.addTTdownload(me.get('text'), me.get('id'));
 		});
 	},
+                    ttPlot : function(node) {
+		// download Module	 
+		if (node.get('disable')) return;
+		myDesktopApp.getLoadedModule(myDesktopApp.dynamicModules.plot.id, true, function (module) {
+                                                      module.addTT(node.get('text'), node.get('id'));
+		});
+	},
 	ttOperations : function() {	 
 		var me = this;   
@@ -155,6 +175,12 @@ Ext.define(&#39;amdaModel.TimeTableNode&#39;, {
 			item.ttDownload();
 		})
 	},
+                    plotMulti: function(){
+		var selection = this.myGetOwnerTree().getSelectionModel().selected.items;
+		Ext.Array.each(selection,function(item,index,allItems){
+			item.ttPlot();
+		})
+	},
 	operationsMulti: function(){
 		var selection = this.myGetOwnerTree().getSelectionModel().selected.items;
@@ -33,6 +33,10 @@ Ext.define(&#39;amdaModel.sharedCatalogNode&#39;, {
             text : 'Edit Catalog',
             hidden : true
         },{
+            fnId : 'leaf-plotTT',
+            text : 'Plot Catalog',
+            hidden : true
+        },{
             fnId : 'leaf-generateTT',
             text : 'Generate Time Table ',
             hidden : true
@@ -32,6 +32,10 @@ Ext.define(&#39;amdaModel.sharedTimeTableNode&#39;, {
             text : 'Edit Time Table',
             hidden : true
         },{
+            fnId : 'leaf-plotTT',
+            text : 'Plot Time Table',
+            hidden : true
+        },{
             fnId : 'leaf-generateCatalog',
             text : 'Generate Catalog',
             hidden : true
@@ -41,6 +41,9 @@ Ext.define(&#39;amdaPlotComp.PlotTabContent&#39;, {
         this.timeSelector.intervalSel.setInterval(startDate, stopDate);
     },
+    getTimeSelector: function(){
+        return this.timeSelector;
+    },
     updateTimeObject : function() {
         var timeSource = this.timeSelector.getActiveTimeSource();
@@ -121,9 +121,17 @@ Ext.define(&#39;amdaUI.PlotUI&#39;, {
     },
     addTT : function(newTTName,newTTid,timeSelectorId) {
-        var crtTimeSelector = Ext.getCmp(timeSelectorId);
-        if (crtTimeSelector)
-            crtTimeSelector.addTT(newTTName,newTTid);
+        if(timeSelectorId){
+            var crtTimeSelector = Ext.getCmp(timeSelectorId);
+            if (crtTimeSelector)
+                crtTimeSelector.addTT(newTTName,newTTid);
+        }else{
+            var plotTab = this.plotTabs.getCurrentPlotTabContent();
+            if (plotTab)
+                var crtTimeSelector = plotTab.getTimeSelector();
+            if (crtTimeSelector)
+                crtTimeSelector.addTT(newTTName,newTTid);
+        }
     },
     /**