diff --git a/js/app/models/PlotObjects/MultiplotRequestObject.js b/js/app/models/PlotObjects/MultiplotRequestObject.js index a80f240..38b6b0c 100644 --- a/js/app/models/PlotObjects/MultiplotRequestObject.js +++ b/js/app/models/PlotObjects/MultiplotRequestObject.js @@ -57,7 +57,9 @@ Ext.define('amdaPlotObj.MultiplotRequestObject', { newPlotNode = Ext.create('amdaModel.PlotNode', { leaf : true }); - newPlotNode.set('object', plotNode.get('object')); + var data = Ext.apply({}, plotNode.get('object').getData(), plotNode.get('object').getAssociatedData()); + newPlotNode.set('object', Ext.create('amdaPlotObj.PlotRequestObject', data)); + plotNode.get('object').reject(); me.plots().remove(plotNode); me.plots().insert(index, [newPlotNode]); return false; diff --git a/js/app/views/PlotComponents/PlotTabContent.js b/js/app/views/PlotComponents/PlotTabContent.js index 97967a5..ff6fe88 100644 --- a/js/app/views/PlotComponents/PlotTabContent.js +++ b/js/app/views/PlotComponents/PlotTabContent.js @@ -61,13 +61,13 @@ Ext.define('amdaPlotComp.PlotTabContent', { savePlot : function() { var me = this; - this.updateTimeObject(); var object = this.plotNode.get('object'); if (!object) return; if ((object.get('id') != '') && (this.plotNode.get('text') == object.get('name'))) { //update existing request + this.updateTimeObject(); this.plotNode.update({plot: true, callback: function() { me.plotTabPanel.updatePlotTabs(); }}); @@ -111,6 +111,7 @@ Ext.define('amdaPlotComp.PlotTabContent', { saveProcess : function(toRename) { var me = this; if (toRename) { + this.updateTimeObject(); this.plotNode.update({plot: true, callback: function() { me.plotTabPanel.updatePlotTabs(); }}); @@ -123,12 +124,17 @@ Ext.define('amdaPlotComp.PlotTabContent', { return; var newPlotNode = plotModule.linkedNode.get('object').duplicatePlot(this.plotNode); if (newPlotNode) { + var oldPlotNode = this.plotNode; this.plotNode = newPlotNode; - this.updateUI(); + this.updateTimeObject(); + oldPlotNode.reject(); } } + this.updateTimeObject(); this.plotNode.create({callback: function() { + me.plotNode.commit(); me.plotTabPanel.updatePlotTabs(); + me.updateUI(); }}); } }, @@ -136,6 +142,7 @@ Ext.define('amdaPlotComp.PlotTabContent', { updateUI : function() { this.plotOutput.setObject(this.plotNode.get('object')); this.timeSelector.intervalSel.setInterval(this.plotNode.get('object').get('startDate'), this.plotNode.get('object').get('stopDate')); + this.timeSelector.intervalSel.updateStop(); this.timeSelector.setTTTab(this.plotNode.get('object').get('timeTables')); this.treePlot.buildTree(this.plotNode.get('object')); }, -- libgit2 0.21.2