Fix plot reload

Benjamin Renard
1 parent 2048f5bc
Showing 5 changed files with 25 additions and 3 deletions Show diff stats
js/app/models/InteractiveNode.js
js/app/models/PlotObjects/PlotRequestObject.js
js/app/views/PlotComponents/PlotTabContent.js
js/app/views/PlotComponents/PlotTabPanel.js
js/app/views/PlotUI.js
@@ -210,7 +210,12 @@ Ext.define(&#39;amdaModel.InteractiveNode&#39;, {
 					// 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 {
@@ -237,6 +237,7 @@ Ext.define(&#39;amdaPlotObj.PlotRequestObject&#39;, {
     	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');
@@ -58,13 +58,14 @@ Ext.define(&#39;amdaPlotComp.PlotTabContent&#39;, {
     },
     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(&#39;amdaPlotComp.PlotTabContent&#39;, {
     saveProcess : function(toRename) {
         if (toRename) {
-            this.plotNode.update();
+            this.plotNode.update({plot: true});
         }
         else {
             if (this.plotNode.get('object').get('id') != '') {
@@ -35,6 +35,17 @@ Ext.define(&#39;amdaPlotComp.PlotTabPanel&#39;, {
             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)
     {
@@ -73,6 +73,10 @@ Ext.define(&#39;amdaUI.PlotUI&#39;, {
     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