diff --git a/js/app/models/PlotObjects/PlotPanelObject.js b/js/app/models/PlotObjects/PlotPanelObject.js index 1a7c3e3..d6145bb 100644 --- a/js/app/models/PlotObjects/PlotPanelObject.js +++ b/js/app/models/PlotObjects/PlotPanelObject.js @@ -305,9 +305,9 @@ Ext.define('amdaPlotObj.PlotPanelObject', { } } - if (is2d) - recs[0].set('dim2-index','0'); - + // if (is2d) { + // recs[0].set('dim2-index','0'); + // } // activate legend if vector & TimePlot if ( isVector && this.get('panel-plot-type') == 'timePlot' ) { this.loadSeriesLegend(); diff --git a/js/app/views/ParamArgumentsUI.js b/js/app/views/ParamArgumentsUI.js index 046a806..249f631 100644 --- a/js/app/views/ParamArgumentsUI.js +++ b/js/app/views/ParamArgumentsUI.js @@ -20,6 +20,7 @@ Ext.define('amdaUI.ParamArgumentsUI', { onModifyHeight: null, pluginOwner: null, isFirstMsg : true, + isInit : false, // -1 -> unknown, 0 -> scalar, 1 -> Tab1D, 2 -> Tab2D paramType: 0, @@ -40,6 +41,9 @@ Ext.define('amdaUI.ParamArgumentsUI', { }, editParameter: function(paramRequestObject, uiScope, onReady) { + if (paramRequestObject.get('type') === 0) + this.isInit = true; + this.paramRequestObject = paramRequestObject; var me = this; me.mask(); @@ -230,10 +234,16 @@ Ext.define('amdaUI.ParamArgumentsUI', { argId: relatedDim, hidden: (relatedTable ? relatedTable.variable : false), listeners: { + afterrender: function(combo) { + if (relatedDim == 'dim2' && !relatedTable.variable && this.isInit) { + combo.setValue('0'); + this.isInit = false; + } + }, change: function(field, newValue, oldValue, eOpts) { if (this.paramRequestObject.get('type') == '2' && this.isFirstMsg) { - if (field.argId == 'dim2' && newValue == '*') { + if (relatedDim == 'dim2' && newValue == '*') { var previousCombo = field.previousSibling(); if (previousCombo instanceof Ext.form.FieldSet) @@ -305,6 +315,12 @@ Ext.define('amdaUI.ParamArgumentsUI', { }, items: rangeItems, listeners: { + afterrender: function(fieldset) { + if (relatedDim == 'dim2' && relatedTable.variable && this.isInit) { + fieldset.checkboxCmp.setValue('true'); + this.isInit = false; + } + }, expand: function(fieldset, eOpts) { if (relatedTable.variable) { if (Ext.Object.isEmpty(relatedTable.minmax)) { -- libgit2 0.21.2