Merge branch 'Histo1D2D' into amdadev

Benjamin Renard
2 parents 86886da2 c4d04b8c
Showing 5 changed files with 18 additions and 0 deletions Show diff stats
generic_data/defaultValues.json
generic_data/defaultValuesConfig.json
generic_data/defaultValuesLinks.json
js/app/models/PlotObjects/PlotHistogram1DSerieObject.js
js/app/views/PlotComponents/PlotHistogram1DSerieForm.js
@@ -136,6 +136,7 @@
         "histogram1D":{
             "histo1DFunction":"density",
             "xbinnumber":100,
+            "histo1DStyle":"bar",
             "color":"#FF0000"
         },
         "sauvaud":{
@@ -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" }
@@ -236,6 +236,11 @@
         "type":"combobox",
         "store":"availableHistogram1DFunctions"
     }, 
+    "plot.histogram1D.histo1DStyle":
+    {
+        "type":"combobox",
+        "store":"availableHistogram1DStyles"
+    }, 
     "plot.sauvaud.yAxis":
     {
         "type":"combobox",
@@ -21,6 +21,7 @@ Ext.define(&#39;amdaPlotObj.PlotHistogram1DSerieObject&#39;, {
         // {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(&#39;amdaPlotObj.PlotHistogram1DSerieObject&#39;, {
 		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(&#39;amdaPlotObj.PlotHistogram1DSerieObject&#39;, {
     	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');
@@ -73,12 +73,16 @@ Ext.define(&#39;amdaPlotComp.PlotHistogram1DSerieForm&#39;, {
 		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);
 			}),