diff --git a/generic_data/defaultValues.json b/generic_data/defaultValues.json index f7bf6b7..64b7317 100644 --- a/generic_data/defaultValues.json +++ b/generic_data/defaultValues.json @@ -136,6 +136,7 @@ "histogram1D":{ "histo1DFunction":"density", "xbinnumber":100, + "histo1DStyle":"bar", "color":"#FF0000" }, "sauvaud":{ diff --git a/generic_data/defaultValuesConfig.json b/generic_data/defaultValuesConfig.json index 8c5b7fd..ecd29e9 100644 --- a/generic_data/defaultValuesConfig.json +++ b/generic_data/defaultValuesConfig.json @@ -267,6 +267,11 @@ { "key": "normdensity", "value": "Normalised Density" } ], + "availableHistogram1DStyles": [ + { "key": "bar", "value": "Bar-like" }, + { "key": "stares", "value": "Stare-like" } + ], + "availableDimsOnXAxis": [ { "key": "0", "value": "First dimension" }, { "key": "1", "value": "Second dimension" } diff --git a/generic_data/defaultValuesLinks.json b/generic_data/defaultValuesLinks.json index f43fe24..f1b30c5 100644 --- a/generic_data/defaultValuesLinks.json +++ b/generic_data/defaultValuesLinks.json @@ -236,6 +236,11 @@ "type":"combobox", "store":"availableHistogram1DFunctions" }, + "plot.histogram1D.histo1DStyle": + { + "type":"combobox", + "store":"availableHistogram1DStyles" + }, "plot.sauvaud.yAxis": { "type":"combobox", diff --git a/js/app/models/PlotObjects/PlotHistogram1DSerieObject.js b/js/app/models/PlotObjects/PlotHistogram1DSerieObject.js index 55ab3bc..b6e1912 100644 --- a/js/app/models/PlotObjects/PlotHistogram1DSerieObject.js +++ b/js/app/models/PlotObjects/PlotHistogram1DSerieObject.js @@ -21,6 +21,7 @@ Ext.define('amdaPlotObj.PlotHistogram1DSerieObject', { // {name: 'serie-resampling-mode', type: 'string'}, {name: 'histo1d-function', type: 'string'}, {name: 'histo1d-xbinnumber', type: 'int'}, + {name: 'histo1d-style', type: 'string'}, {name: 'histo1d-color', type: 'string', defaultValue: "none"} ], @@ -36,6 +37,7 @@ Ext.define('amdaPlotObj.PlotHistogram1DSerieObject', { this.set('histo1d-function', amdaDefaultValues.plot.histogram1D.histo1DFunction); // this.set('histotype-param', ''); this.set('histo1d-xbinnumber', amdaDefaultValues.plot.histogram1D.xbinnumber); + this.set('histo1d-style', amdaDefaultValues.plot.histogram1D.histo1DStyle); this.set('histo1d-color', amdaDefaultValues.plot.histogram1D.color); this.callParent(arguments); @@ -49,6 +51,7 @@ Ext.define('amdaPlotObj.PlotHistogram1DSerieObject', { serieValues['histo1d-function'] = this.get('histo1d-function'); // serieValues['histotype-param'] = this.get('histotype-param'); serieValues['histo1d-xbinnumber'] = this.get('histo1d-xbinnumber'); + serieValues['histo1d-style'] = this.get('histo1d-style'); serieValues['histo1d-color'] = this.get('histo1d-color'); // serieValues['histo1D-ybinnumber'] = this.get('histo1D-ybinnumber'); // serieValues['histo1D-smoothfactor'] = this.get('histo1D-smoothfactor'); diff --git a/js/app/views/PlotComponents/PlotHistogram1DSerieForm.js b/js/app/views/PlotComponents/PlotHistogram1DSerieForm.js index 4a63828..78a79c3 100644 --- a/js/app/views/PlotComponents/PlotHistogram1DSerieForm.js +++ b/js/app/views/PlotComponents/PlotHistogram1DSerieForm.js @@ -73,12 +73,16 @@ Ext.define('amdaPlotComp.PlotHistogram1DSerieForm', { var me = this; var histogram1DItems = [ + this.addStandardCombo('histo1d-style', 'Drawing Style', amdaDefaultConfigs.availableHistogram1DStyles, function(name, value, oldValue) { + me.object.set('histo1d-style', value); + }), // this.addStandardParamDropTarget('serie-xaxis-param', 'X Parameter', function(name, value, oldValue) { // me.object.set('serie-xaxis-param', value); // me.crtTree.refresh(); // }), me.getRangeForms(), // this.addStandardCombo('serie-resampling-mode', 'Reference parameter for resampling', amdaDefaultConfigs.availableResamplingModes), + this.addStandardCombo('histo1d-function', 'Function to apply', amdaDefaultConfigs.availableHistogram1DFunctions, function(name, value, oldValue) { me.object.set('histo1d-function', value); }), -- libgit2 0.21.2