Commit 3f34cc5267beb64d7702a3b1361c7603af8ff867
1 parent
f29c5e66
Exists in
master
and in
109 other branches
PlotOnly for GetData from Plot Module
Showing
4 changed files
with
14 additions
and
7 deletions
Show diff stats
js/app/models/DownloadNode.js
... | ... | @@ -92,8 +92,12 @@ Ext.define('amdaModel.DownloadNode', { |
92 | 92 | myParam['dim2-max-range'] = param.get('dim2-max-range'), |
93 | 93 | myParam['dim2-index'] = param.get('dim2-index'), |
94 | 94 | myParam.template_args = param.get('template_args'); |
95 | - myValues.list[i] = myParam; | |
96 | - ++i; | |
95 | + if (!param.get('plotonly')) { | |
96 | + myValues.list[i] = myParam; | |
97 | + ++i; | |
98 | + } | |
99 | + else | |
100 | + alert('Parameter '+ myParam.paramid + ' is PlotOnly'); | |
97 | 101 | }); |
98 | 102 | }); |
99 | 103 | if (tab.get('multi-plot-linked')) |
... | ... |
js/app/models/PlotObjects/PlotPanelObject.js
... | ... | @@ -280,13 +280,14 @@ Ext.define('amdaPlotObj.PlotPanelObject', { |
280 | 280 | } |
281 | 281 | }, |
282 | 282 | |
283 | - createNewParam: function(paramId, paramComponents, isVector, onAfterCreate) { | |
283 | + createNewParam: function(paramId, paramComponents, isVector, plotOnly, onAfterCreate) { | |
284 | 284 | this.set('last-param-id', this.get('last-param-id') + 1); |
285 | 285 | |
286 | 286 | var emptyPanel = (this.params().getCount() == 0); |
287 | 287 | |
288 | 288 | var recs = this.params().add({id : this.get('last-param-id')}); |
289 | 289 | recs[0].set('paramid', paramId); |
290 | + recs[0].set('plotonly', plotOnly); | |
290 | 291 | |
291 | 292 | if (paramComponents) { |
292 | 293 | if (paramComponents['index1']) { |
... | ... |
js/app/models/RequestParamObject.js
... | ... | @@ -30,7 +30,8 @@ Ext.define('amdaModel.RequestParamObject', { |
30 | 30 | {name: 'dim2-min-range', type: 'float', defaultValue: 0.}, |
31 | 31 | {name: 'dim2-max-range', type: 'float', defaultValue: 0.}, |
32 | 32 | {name: 'dim2-index', type: 'string', defaultValue: '*'}, |
33 | - {name: 'template_args', type: 'auto', defaultValue: null} | |
33 | + {name: 'template_args', type: 'auto', defaultValue: null}, | |
34 | + {name: 'plotonly', type: 'bool', defaultValue: false} | |
34 | 35 | ], |
35 | 36 | |
36 | 37 | getParamFullName : function() { |
... | ... |
js/app/views/PlotComponents/PlotTree.js
... | ... | @@ -602,7 +602,7 @@ Ext.define('amdaPlotComp.PlotTree', { |
602 | 602 | return false; |
603 | 603 | }, |
604 | 604 | |
605 | - dropParamToCreate : function(targetNode, position, paramId, paramComponents, isVector) | |
605 | + dropParamToCreate : function(targetNode, position, paramId, paramComponents, isVector, plotOnly) | |
606 | 606 | { |
607 | 607 | var panelObject = null; |
608 | 608 | if (targetNode == null) |
... | ... | @@ -636,7 +636,7 @@ Ext.define('amdaPlotComp.PlotTree', { |
636 | 636 | |
637 | 637 | //Create param object |
638 | 638 | var me = this; |
639 | - panelObject.createNewParam(paramId, paramComponents, isVector, function (newParamObject) { | |
639 | + panelObject.createNewParam(paramId, paramComponents, isVector, plotOnly, function (newParamObject) { | |
640 | 640 | //Rebuild params node |
641 | 641 | me.buildPanelsNode(newParamObject.getId()); |
642 | 642 | //BRE newParamObject |
... | ... | @@ -667,6 +667,7 @@ Ext.define('amdaPlotComp.PlotTree', { |
667 | 667 | var isVector = record.get('iconCls') == 'icon-vector'; |
668 | 668 | var component_info = record.get('component_info'); |
669 | 669 | var param_id = record.get('id'); |
670 | + var plot_only = record.get('notyet'); | |
670 | 671 | var components = null; |
671 | 672 | if (component_info && component_info.parentId) { |
672 | 673 | //It's a component |
... | ... | @@ -677,7 +678,7 @@ Ext.define('amdaPlotComp.PlotTree', { |
677 | 678 | if (component_info.index2) |
678 | 679 | components['index2'] = component_info.index2; |
679 | 680 | } |
680 | - this.dropParamToCreate(targetNode, position, param_id, components, isVector); | |
681 | + this.dropParamToCreate(targetNode, position, param_id, components, isVector, plot_only); | |
681 | 682 | } |
682 | 683 | return true; |
683 | 684 | case 'amdaModel.AliasNode' : |
... | ... |