diff --git a/js/app/models/PlotObjects/PlotHistogram2DSerieObject.js b/js/app/models/PlotObjects/PlotHistogram2DSerieObject.js index 3032d33..f8cae43 100644 --- a/js/app/models/PlotObjects/PlotHistogram2DSerieObject.js +++ b/js/app/models/PlotObjects/PlotHistogram2DSerieObject.js @@ -18,10 +18,6 @@ Ext.define('amdaPlotObj.PlotHistogram2DSerieObject', { requires: ['amdaPlotObj.PlotAxisObject'], fields : [ {name: 'serie-xaxis-param', type: 'string'}, - {name: 'histo2d-xmin', type:'float', useNull:true}, - {name: 'histo2d-xmax', type:'float', useNull:true}, - {name: 'histo2d-ymin', type:'float', useNull:true}, - {name: 'histo2d-ymax', type:'float', useNull:true}, {name: 'serie-resampling-mode', type: 'string'}, {name: 'histo2d-function', type: 'string'}, {name: 'histotype-param', type: 'string' }, @@ -53,10 +49,6 @@ Ext.define('amdaPlotObj.PlotHistogram2DSerieObject', { { var serieValues = this.callParent(arguments); serieValues['serie-xaxis-param'] = this.get('serie-xaxis-param'); - serieValues['histo2d-xmin'] = this.get('histo2d-xmin'); - serieValues['histo2d-xmax'] = this.get('histo2d-xmax'); - serieValues['histo2d-ymin'] = this.get('histo2d-ymin'); - serieValues['histo2d-ymax'] = this.get('histo2d-ymax'); serieValues['serie-resampling-mode'] = this.get('serie-resampling-mode'); serieValues['histo2d-function'] = this.get('histo2d-function'); serieValues['histotype-param'] = this.get('histotype-param'); diff --git a/js/app/models/PlotObjects/PlotTreeNode.js b/js/app/models/PlotObjects/PlotTreeNode.js index 3d3d31a..d58f037 100644 --- a/js/app/models/PlotObjects/PlotTreeNode.js +++ b/js/app/models/PlotObjects/PlotTreeNode.js @@ -273,6 +273,8 @@ Ext.define('amdaPlotObj.PlotParamTreeNode', { type: 'param', removable: true, + + panelObject: null, getAdditionalText: function() { diff --git a/js/app/views/PlotComponents/PlotBaseSerieForm.js b/js/app/views/PlotComponents/PlotBaseSerieForm.js index df4256d..4190d91 100644 --- a/js/app/views/PlotComponents/PlotBaseSerieForm.js +++ b/js/app/views/PlotComponents/PlotBaseSerieForm.js @@ -16,7 +16,7 @@ Ext.define('amdaPlotComp.PlotBaseSerieForm', { this.loadRecord(this.object); this.updateOptions(this.crtTree.getSelectedPlotType()); }, - + updateOptions: function(plotType) { var isScatter = (plotType == 'xyPlot'); diff --git a/js/app/views/PlotComponents/PlotElementPanel.js b/js/app/views/PlotComponents/PlotElementPanel.js index 858d18f..9bc1f40 100644 --- a/js/app/views/PlotComponents/PlotElementPanel.js +++ b/js/app/views/PlotComponents/PlotElementPanel.js @@ -40,7 +40,7 @@ Ext.define('amdaPlotComp.PlotElementPanel', { elementForm.crtTree = tree; if (elementForm.setObject) elementForm.setObject(object); - if (elementForm.setParentObject) + if (elementForm.setParentObject) elementForm.setParentObject(parentObject); }); }, diff --git a/js/app/views/PlotComponents/PlotHistogram2DSerieForm.js b/js/app/views/PlotComponents/PlotHistogram2DSerieForm.js index 1d2bafa..184f69d 100644 --- a/js/app/views/PlotComponents/PlotHistogram2DSerieForm.js +++ b/js/app/views/PlotComponents/PlotHistogram2DSerieForm.js @@ -14,7 +14,12 @@ Ext.define('amdaPlotComp.PlotHistogram2DSerieForm', { setObject: function (object) { this.callParent(arguments); this.updateOptions(this.object.get('histo2d-function')); - }, + }, + + setParentObject: function (parentObject) { + this.callParent(arguments); + this.updateAxesRanges(); + }, updateOptions: function(functionType) { var isDensity = (functionType == 'density'); @@ -22,6 +27,16 @@ Ext.define('amdaPlotComp.PlotHistogram2DSerieForm', { var zParamField = this.getForm().findField('histotype-param'); zParamField.setVisible(!isDensity) }, + + updateAxesRanges: function() { + var xAxisObj = this.parentObject.axes().getById('xaxis_id'); + var yAxisObj = this.parentObject.axes().getById('y-left'); + this.getForm().findField('histo2d-xmin').setValue(xAxisObj.get('axis-range-min')); + this.getForm().findField('histo2d-xmax').setValue(xAxisObj.get('axis-range-max')); + this.getForm().findField('histo2d-ymin').setValue(yAxisObj.get('axis-range-min')); + this.getForm().findField('histo2d-ymax').setValue(yAxisObj.get('axis-range-max')); + }, + getRangeForms: function(){ var me = this; return { @@ -48,14 +63,22 @@ Ext.define('amdaPlotComp.PlotHistogram2DSerieForm', { items: [{ items:[ - me.addStandardFloat2('histo2d-xmin', 'X Min'), - me.addStandardFloat2('histo2d-xmax', 'X Max'), + me.addStandardFloat2('histo2d-xmin', 'X Min', -Number.MAX_VALUE, Number.MAX_VALUE, false, false, function(name, newValue, oldValue){ + me.parentObject.axes().getById('xaxis_id').set('axis-range-min', newValue); + }), + me.addStandardFloat2('histo2d-xmax', 'X Max', -Number.MAX_VALUE, Number.MAX_VALUE, false, false, function(name, newValue, oldValue){ + me.parentObject.axes().getById('xaxis_id').set('axis-range-max', newValue); + }), ] }, { items:[ - me.addStandardFloat2('histo2d-ymin', 'Y Min'), - me.addStandardFloat2('histo2d-ymax', 'Y Max'), + me.addStandardFloat2('histo2d-ymin', 'Y Min', -Number.MAX_VALUE, Number.MAX_VALUE, false, false, function(name, newValue, oldValue){ + me.parentObject.axes().getById('y-left').set('axis-range-min', newValue); + }), + me.addStandardFloat2('histo2d-ymax', 'Y Max', -Number.MAX_VALUE, Number.MAX_VALUE, false, false, function(name, newValue, oldValue){ + me.parentObject.axes().getById('y-left').set('axis-range-max', newValue); + }), ], }] }; @@ -64,7 +87,6 @@ Ext.define('amdaPlotComp.PlotHistogram2DSerieForm', { getFormItems: function() { var me = this; - var histogram2DItems = [ this.addStandardParamDropTarget('serie-xaxis-param', 'X Parameter', function(name, value, oldValue) { me.object.set('serie-xaxis-param', value); diff --git a/js/app/views/PlotComponents/PlotParamForm.js b/js/app/views/PlotComponents/PlotParamForm.js index 9042c6a..43d7b6f 100644 --- a/js/app/views/PlotComponents/PlotParamForm.js +++ b/js/app/views/PlotComponents/PlotParamForm.js @@ -118,6 +118,8 @@ Ext.define('amdaPlotComp.PlotParamForm', { drawingOptionsForm.crtTree = this.crtTree; if (drawingOptionsForm.setObject) drawingOptionsForm.setObject(this.object); + if (drawingOptionsForm.setParentObject) + drawingOptionsForm.setParentObject(this.parentObject); if (this.paramArgs && paramId) this.paramArgs.editParameter(this.object, this, function (uiScope) { uiScope.crtTree.refresh(); -- libgit2 0.21.2