diff --git a/generic_data/defaultValues.json b/generic_data/defaultValues.json
index 64b7317..bfc6eac 100644
--- a/generic_data/defaultValues.json
+++ b/generic_data/defaultValues.json
@@ -129,12 +129,14 @@
},
"histogram2D":{
"histo2DFunction":"density",
+ "histo2DyAxis":"y-left",
"xbinnumber":100,
"ybinnumber":100,
"smoothfactor":1
},
"histogram1D":{
"histo1DFunction":"density",
+ "histo1DyAxis":"y-left",
"xbinnumber":100,
"histo1DStyle":"bar",
"color":"#FF0000"
diff --git a/generic_data/defaultValuesLinks.json b/generic_data/defaultValuesLinks.json
index f1b30c5..29157dc 100644
--- a/generic_data/defaultValuesLinks.json
+++ b/generic_data/defaultValuesLinks.json
@@ -231,6 +231,11 @@
"type":"combobox",
"store":"availableHistogram2DFunctions"
},
+ "plot.histogram2D.histo2DyAxis":
+ {
+ "type":"combobox",
+ "store":"availableYAxes"
+ },
"plot.histogram1D.histo1DFunction":
{
"type":"combobox",
@@ -240,6 +245,11 @@
{
"type":"combobox",
"store":"availableHistogram1DStyles"
+ },
+ "plot.histogram1D.histo1DyAxis":
+ {
+ "type":"combobox",
+ "store":"availableYAxes"
},
"plot.sauvaud.yAxis":
{
diff --git a/js/app/models/PlotObjects/PlotHistogram1DSerieObject.js b/js/app/models/PlotObjects/PlotHistogram1DSerieObject.js
index 4820926..d366a3b 100644
--- a/js/app/models/PlotObjects/PlotHistogram1DSerieObject.js
+++ b/js/app/models/PlotObjects/PlotHistogram1DSerieObject.js
@@ -19,6 +19,7 @@ Ext.define('amdaPlotObj.PlotHistogram1DSerieObject', {
fields : [
// {name: 'serie-xaxis-param', type: 'string'},
// {name: 'serie-resampling-mode', type: 'string'},
+ {name: 'histo1d-yaxis', type: 'string'},
{name: 'histo1d-function', type: 'string'},
{name: 'histotype-param', type: 'string' },
{name: 'histo1d-xbinnumber', type: 'int'},
@@ -35,6 +36,7 @@ Ext.define('amdaPlotObj.PlotHistogram1DSerieObject', {
{
// this.set('serie-xaxis-param', '');
// this.set('serie-resampling-mode', amdaDefaultValues.plot.serie.resamplingMode);
+ this.set('histo1d-yaxis', amdaDefaultValues.plot.histogram1D.histo1DyAxis);
this.set('histo1d-function', amdaDefaultValues.plot.histogram1D.histo1DFunction);
this.set('histotype-param', '');
this.set('histo1d-xbinnumber', amdaDefaultValues.plot.histogram1D.xbinnumber);
@@ -49,6 +51,7 @@ Ext.define('amdaPlotObj.PlotHistogram1DSerieObject', {
var serieValues = this.callParent(arguments);
// serieValues['serie-xaxis-param'] = this.get('serie-xaxis-param');
// serieValues['serie-resampling-mode'] = this.get('serie-resampling-mode');
+ serieValues['histo1d-yaxis'] = this.get('histo1d-yaxis');
serieValues['histo1d-function'] = this.get('histo1d-function');
serieValues['histotype-param'] = this.get('histotype-param');
serieValues['histo1d-xbinnumber'] = this.get('histo1d-xbinnumber');
diff --git a/js/app/models/PlotObjects/PlotHistogram2DSerieObject.js b/js/app/models/PlotObjects/PlotHistogram2DSerieObject.js
index 3ff9a6a..9f899b5 100644
--- a/js/app/models/PlotObjects/PlotHistogram2DSerieObject.js
+++ b/js/app/models/PlotObjects/PlotHistogram2DSerieObject.js
@@ -19,6 +19,7 @@ Ext.define('amdaPlotObj.PlotHistogram2DSerieObject', {
fields : [
{name: 'serie-xaxis-param', type: 'string'},
{name: 'serie-resampling-mode', type: 'string'},
+ {name: 'histo2d-yaxis', type: 'string'},
{name: 'histo2d-function', type: 'string'},
{name: 'histotype-param', type: 'string' },
{name: 'histo2d-xbinnumber', type: 'int'},
@@ -36,6 +37,7 @@ Ext.define('amdaPlotObj.PlotHistogram2DSerieObject', {
{
this.set('serie-xaxis-param', '');
this.set('serie-resampling-mode', amdaDefaultValues.plot.serie.resamplingMode);
+ this.set('histo2d-yaxis', amdaDefaultValues.plot.histogram2D.histo2DyAxis);
this.set('histo2d-function', amdaDefaultValues.plot.histogram2D.histo2DFunction);
this.set('histotype-param', '');
this.set('histo2d-xbinnumber', amdaDefaultValues.plot.histogram2D.xbinnumber);
@@ -50,6 +52,7 @@ Ext.define('amdaPlotObj.PlotHistogram2DSerieObject', {
var serieValues = this.callParent(arguments);
serieValues['serie-xaxis-param'] = this.get('serie-xaxis-param');
serieValues['serie-resampling-mode'] = this.get('serie-resampling-mode');
+ serieValues['histo2d-yaxis'] = this.get('histo2d-yaxis');
serieValues['histo2d-function'] = this.get('histo2d-function');
serieValues['histotype-param'] = this.get('histotype-param');
serieValues['histo2d-xbinnumber'] = this.get('histo2d-xbinnumber');
diff --git a/js/app/views/PlotComponents/PlotHistogram1DSerieForm.js b/js/app/views/PlotComponents/PlotHistogram1DSerieForm.js
index 9043f14..eb776d0 100644
--- a/js/app/views/PlotComponents/PlotHistogram1DSerieForm.js
+++ b/js/app/views/PlotComponents/PlotHistogram1DSerieForm.js
@@ -58,7 +58,8 @@ Ext.define('amdaPlotComp.PlotHistogram1DSerieForm', {
frame: true,
//bodyPadding: '5 5 5 5',
items:
- [{
+ [
+ {
items:[
me.addStandardFloat2('histo1d-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);
@@ -79,6 +80,12 @@ Ext.define('amdaPlotComp.PlotHistogram1DSerieForm', {
var me = this;
var histogram1DItems = [
+
+ this.addStandardCombo('histo1d-yaxis', 'Y axis', amdaDefaultConfigs.availableYAxes, function (name, value, oldValue) {
+ me.object.set('histo1d-yaxis', value);
+ me.crtTree.refresh();
+ }),
+
this.addStandardCombo('histo1d-style', 'Drawing Style', amdaDefaultConfigs.availableHistogram1DStyles, function(name, value, oldValue) {
me.object.set('histo1d-style', value);
}),
diff --git a/js/app/views/PlotComponents/PlotHistogram2DSerieForm.js b/js/app/views/PlotComponents/PlotHistogram2DSerieForm.js
index 69d179c..adeb0ae 100644
--- a/js/app/views/PlotComponents/PlotHistogram2DSerieForm.js
+++ b/js/app/views/PlotComponents/PlotHistogram2DSerieForm.js
@@ -95,6 +95,31 @@ Ext.define('amdaPlotComp.PlotHistogram2DSerieForm', {
me.object.set('serie-xaxis-param', value);
me.crtTree.refresh();
}),
+
+ this.addStandardCombo('histo2d-yaxis', 'Y axis', amdaDefaultConfigs.availableYAxes, function (name, value, oldValue) {
+ me.object.set('histo2d-yaxis', value);
+ var yMinForm = me.getForm().findField('histo2d-ymin');
+ var yMaxForm = me.getForm().findField('histo2d-ymax');
+ yMaxForm.on('change', function(name, newValue, oldValue){
+ me.parentObject.axes().getById(value).set('axis-range-max', newValue);
+ if(value === 'y-left')
+ me.parentObject.axes().getById('y-right').set('axis-range-max','');
+ else if (value === 'y-right')
+ me.parentObject.axes().getById('y-left').set('axis-range-max','');
+ });
+ yMinForm.on('change', function(name, newValue, oldValue){
+ me.parentObject.axes().getById(value).set('axis-range-min', newValue);
+ if(value === 'y-left')
+ me.parentObject.axes().getById('y-right').set('axis-range-min','');
+ else if (value === 'y-right')
+ me.parentObject.axes().getById('y-left').set('axis-range-min','');
+ });
+ if(me.parentObject){
+ yMinForm.fireEvent('change', yMinForm, yMinForm.getValue(), yMinForm.getValue());
+ yMaxForm.fireEvent('change', yMaxForm, yMaxForm.getValue(), yMaxForm.getValue());
+ }
+ me.crtTree.refresh();
+ }),
me.getRangeForms(),
this.addStandardCombo('serie-resampling-mode', 'Reference parameter for resampling', amdaDefaultConfigs.availableResamplingModes),
this.addStandardCombo('histo2d-function', 'Function to apply', amdaDefaultConfigs.availableHistogram2DFunctions, function(name, value, oldValue) {
--
libgit2 0.21.2