diff --git a/js/app/models/InteractiveNode.js b/js/app/models/InteractiveNode.js index d012bb7..06f20bb 100644 --- a/js/app/models/InteractiveNode.js +++ b/js/app/models/InteractiveNode.js @@ -210,7 +210,12 @@ Ext.define('amdaModel.InteractiveNode', { // reload object into the view of corresponding Module var me = this; myDesktopApp.getLoadedModule(this.get('moduleId'), true, function (module) { - module.getUiContent().setObject(me.get('object')); + if (!opt || !opt.plot) { + module.getUiContent().setObject(me.get('object')); + } + else { + module.getUiContent().reloadPlot(me); + } }); } else { diff --git a/js/app/models/PlotObjects/PlotRequestObject.js b/js/app/models/PlotObjects/PlotRequestObject.js index dddb0f5..b5ed4ce 100644 --- a/js/app/models/PlotObjects/PlotRequestObject.js +++ b/js/app/models/PlotObjects/PlotRequestObject.js @@ -237,6 +237,7 @@ Ext.define('amdaPlotObj.PlotRequestObject', { requestValues['id'] = this.get('id'); requestValues['tab-index'] = this.get('tab-index'); requestValues['tab-title'] = this.get('tab-title'); + requestValues['name'] = this.get('name'); requestValues['file-format'] = this.get('file-format'); requestValues['file-output'] = this.get('file-output'); diff --git a/js/app/views/PlotComponents/PlotTabContent.js b/js/app/views/PlotComponents/PlotTabContent.js index b681b6f..15556f3 100644 --- a/js/app/views/PlotComponents/PlotTabContent.js +++ b/js/app/views/PlotComponents/PlotTabContent.js @@ -58,13 +58,14 @@ Ext.define('amdaPlotComp.PlotTabContent', { }, savePlot : function() { + 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.plotNode.update(); + this.plotNode.update({plot: true}); return; } @@ -105,7 +106,7 @@ Ext.define('amdaPlotComp.PlotTabContent', { saveProcess : function(toRename) { if (toRename) { - this.plotNode.update(); + this.plotNode.update({plot: true}); } else { if (this.plotNode.get('object').get('id') != '') { diff --git a/js/app/views/PlotComponents/PlotTabPanel.js b/js/app/views/PlotComponents/PlotTabPanel.js index f280965..9e01550 100644 --- a/js/app/views/PlotComponents/PlotTabPanel.js +++ b/js/app/views/PlotComponents/PlotTabPanel.js @@ -35,6 +35,17 @@ Ext.define('amdaPlotComp.PlotTabPanel', { this.addPlotNode(rec, index == 0); }, this); }, + + reloadPlot : function(plotNode) { + for (i = 0; i < this.items.getCount(); ++i) + { + var tabItem = this.items.getAt(i); + var tabContent = tabItem.items.getAt(0); + if (plotNode == tabContent.plotNode) { + tabContent.updateUI(); + } + } + }, addPlotNode: function(plotNode, selectTab) { diff --git a/js/app/views/PlotUI.js b/js/app/views/PlotUI.js index 68c5734..58153fe 100644 --- a/js/app/views/PlotUI.js +++ b/js/app/views/PlotUI.js @@ -73,6 +73,10 @@ Ext.define('amdaUI.PlotUI', { editPlot : function(plotNode) { this.plotTabs.addPlotNode(plotNode, true); }, + + reloadPlot : function(plotNode) { + this.plotTabs.reloadPlot(plotNode); + }, /** * plot method called by 'Do Plot' button to launch the plot process -- libgit2 0.21.2