Commit db902412818b66f02ef3aacda882ab0b4cac0c0d
1 parent
e3dab642
Exists in
master
and in
107 other branches
2d spectra init
Showing
2 changed files
with
20 additions
and
4 deletions
Show diff stats
js/app/models/PlotObjects/PlotPanelObject.js
| ... | ... | @@ -305,9 +305,9 @@ Ext.define('amdaPlotObj.PlotPanelObject', { |
| 305 | 305 | } |
| 306 | 306 | } |
| 307 | 307 | |
| 308 | - if (is2d) | |
| 309 | - recs[0].set('dim2-index','0'); | |
| 310 | - | |
| 308 | + // if (is2d) { | |
| 309 | + // recs[0].set('dim2-index','0'); | |
| 310 | + // } | |
| 311 | 311 | // activate legend if vector & TimePlot |
| 312 | 312 | if ( isVector && this.get('panel-plot-type') == 'timePlot' ) { |
| 313 | 313 | this.loadSeriesLegend(); |
| ... | ... |
js/app/views/ParamArgumentsUI.js
| ... | ... | @@ -20,6 +20,7 @@ Ext.define('amdaUI.ParamArgumentsUI', { |
| 20 | 20 | onModifyHeight: null, |
| 21 | 21 | pluginOwner: null, |
| 22 | 22 | isFirstMsg : true, |
| 23 | + isInit : false, | |
| 23 | 24 | // -1 -> unknown, 0 -> scalar, 1 -> Tab1D, 2 -> Tab2D |
| 24 | 25 | paramType: 0, |
| 25 | 26 | |
| ... | ... | @@ -40,6 +41,9 @@ Ext.define('amdaUI.ParamArgumentsUI', { |
| 40 | 41 | }, |
| 41 | 42 | |
| 42 | 43 | editParameter: function(paramRequestObject, uiScope, onReady) { |
| 44 | + if (paramRequestObject.get('type') === 0) | |
| 45 | + this.isInit = true; | |
| 46 | + | |
| 43 | 47 | this.paramRequestObject = paramRequestObject; |
| 44 | 48 | var me = this; |
| 45 | 49 | me.mask(); |
| ... | ... | @@ -230,10 +234,16 @@ Ext.define('amdaUI.ParamArgumentsUI', { |
| 230 | 234 | argId: relatedDim, |
| 231 | 235 | hidden: (relatedTable ? relatedTable.variable : false), |
| 232 | 236 | listeners: { |
| 237 | + afterrender: function(combo) { | |
| 238 | + if (relatedDim == 'dim2' && !relatedTable.variable && this.isInit) { | |
| 239 | + combo.setValue('0'); | |
| 240 | + this.isInit = false; | |
| 241 | + } | |
| 242 | + }, | |
| 233 | 243 | change: function(field, newValue, oldValue, eOpts) { |
| 234 | 244 | if (this.paramRequestObject.get('type') == '2' && this.isFirstMsg) |
| 235 | 245 | { |
| 236 | - if (field.argId == 'dim2' && newValue == '*') { | |
| 246 | + if (relatedDim == 'dim2' && newValue == '*') { | |
| 237 | 247 | var previousCombo = field.previousSibling(); |
| 238 | 248 | |
| 239 | 249 | if (previousCombo instanceof Ext.form.FieldSet) |
| ... | ... | @@ -305,6 +315,12 @@ Ext.define('amdaUI.ParamArgumentsUI', { |
| 305 | 315 | }, |
| 306 | 316 | items: rangeItems, |
| 307 | 317 | listeners: { |
| 318 | + afterrender: function(fieldset) { | |
| 319 | + if (relatedDim == 'dim2' && relatedTable.variable && this.isInit) { | |
| 320 | + fieldset.checkboxCmp.setValue('true'); | |
| 321 | + this.isInit = false; | |
| 322 | + } | |
| 323 | + }, | |
| 308 | 324 | expand: function(fieldset, eOpts) { |
| 309 | 325 | if (relatedTable.variable) { |
| 310 | 326 | if (Ext.Object.isEmpty(relatedTable.minmax)) { |
| ... | ... |