diff --git a/js/app/models/PlotObjects/PlotPanelObject.js b/js/app/models/PlotObjects/PlotPanelObject.js index f92eeae..f329106 100644 --- a/js/app/models/PlotObjects/PlotPanelObject.js +++ b/js/app/models/PlotObjects/PlotPanelObject.js @@ -278,15 +278,14 @@ Ext.define('amdaPlotObj.PlotPanelObject', { } }, - createNewParam: function(paramId, paramComponents, onAfterCreate) { + createNewParam: function(paramId, paramComponents, isVector, onAfterCreate) { this.set('last-param-id', this.get('last-param-id') + 1); var emptyPanel = (this.params().getCount() == 0); var recs = this.params().add({id : this.get('last-param-id')}); - recs[0].set('paramid', paramId); - + if (paramComponents) { if (paramComponents['index1']) { recs[0].set('dim1-is-range', false); @@ -301,11 +300,17 @@ Ext.define('amdaPlotObj.PlotPanelObject', { recs[0].set('dim2-index', paramComponents['index2']); } } - - var me = this; + + // activate legend if vector & TimePlot + if ( isVector && this.get('panel-plot-type') == 'timePlot' ) { + this.loadSeriesLegend(); + this.get('panel-legend-series').set('legend-series-activated',true); + } + + var me = this; amdaPlotObj.PlotObjectConfig.getParamConfig(paramId, function (success, data) { var availableDrawingObjects = null; - + //Change type only if the panel is empty! if (success) { if (emptyPanel) @@ -328,6 +333,7 @@ Ext.define('amdaPlotObj.PlotPanelObject', { recs[0].changeDrawingType(availableDrawingObjects[0].key, data ? data.draw : null); if (success && emptyPanel) { + if (data.additionalObjects && data.additionalObjects.curves) { Ext.each(data.additionalObjects.curves, function (curveData) { var newCurve = me.createNewCurve(); diff --git a/js/app/views/PlotComponents/PlotTree.js b/js/app/views/PlotComponents/PlotTree.js index df9be1f..5afa20a 100644 --- a/js/app/views/PlotComponents/PlotTree.js +++ b/js/app/views/PlotComponents/PlotTree.js @@ -602,7 +602,7 @@ Ext.define('amdaPlotComp.PlotTree', { return false; }, - dropParamToCreate : function(targetNode, position, paramId, paramComponents) + dropParamToCreate : function(targetNode, position, paramId, paramComponents, isVector) { var panelObject = null; if (targetNode == null) @@ -636,7 +636,7 @@ Ext.define('amdaPlotComp.PlotTree', { //Create param object var me = this; - panelObject.createNewParam(paramId, paramComponents, function (newParamObject) { + panelObject.createNewParam(paramId, paramComponents, isVector, function (newParamObject) { //Rebuild params node me.buildPanelsNode(newParamObject.getId()); //BRE newParamObject @@ -664,6 +664,7 @@ Ext.define('amdaPlotComp.PlotTree', { if (record.get('alias') != "" ) this.dropParamToCreate(targetNode, position, "#"+record.get('alias')); else { + var isVector = record.get('iconCls') == 'icon-vector'; var component_info = record.get('component_info'); var param_id = record.get('id'); var components = null; @@ -676,7 +677,7 @@ Ext.define('amdaPlotComp.PlotTree', { if (component_info.index2) components['index2'] = component_info.index2; } - this.dropParamToCreate(targetNode, position, param_id, components); + this.dropParamToCreate(targetNode, position, param_id, components, isVector); } return true; case 'amdaModel.AliasNode' : -- libgit2 0.21.2