Improved combined example, add grouped bars

PhilJay · PhilJay · commit 4826f3be24e2 · 2016-06-10T15:52:17.000+02:00
diff --git a/MPChartExample/src/com/xxmassdeveloper/mpchartexample/CombinedChartActivity.java b/MPChartExample/src/com/xxmassdeveloper/mpchartexample/CombinedChartActivity.java
@@ -132,21 +132,36 @@ private LineData generateLineData() {
 
     private BarData generateBarData() {
 
-        BarData d = new BarData();
-        d.setBarWidth(0.9f);
+        ArrayList<BarEntry> entries1 = new ArrayList<BarEntry>();
+        ArrayList<BarEntry> entries2 = new ArrayList<BarEntry>();
 
-        ArrayList<BarEntry> entries = new ArrayList<BarEntry>();
+        for (int index = 0; index < itemcount; index++) {
+            entries1.add(new BarEntry(0, getRandom(25, 25)));
+            entries2.add(new BarEntry(0, getRandom(25, 25)));
+        }
 
-        for (int index = 0; index < itemcount; index++)
-            entries.add(new BarEntry(index + 0.5f, getRandom(25, 25)));
+        BarDataSet set1 = new BarDataSet(entries1, "Bar 1");
+        set1.setColor(Color.rgb(60, 220, 78));
+        set1.setValueTextColor(Color.rgb(60, 220, 78));
+        set1.setValueTextSize(10f);
+        set1.setAxisDependency(YAxis.AxisDependency.LEFT);
 
-        BarDataSet set = new BarDataSet(entries, "Bar DataSet");
-        set.setColor(Color.rgb(60, 220, 78));
-        set.setValueTextColor(Color.rgb(60, 220, 78));
-        set.setValueTextSize(10f);
-        d.addDataSet(set);
+        BarDataSet set2 = new BarDataSet(entries2, "Bar 2");
+        set2.setColor(Color.rgb(61, 165, 255));
+        set2.setValueTextColor(Color.rgb(61, 165, 255));
+        set2.setValueTextSize(10f);
+        set2.setAxisDependency(YAxis.AxisDependency.LEFT);
 
-        set.setAxisDependency(YAxis.AxisDependency.LEFT);
+        float groupSpace = 0.06f;
+        float barSpace = 0.02f; // x2 dataset
+        float barWidth = 0.45f; // x2 dataset
+        // (0.45 + 0.02) * 2 + 0.06 = 1.00 -> interval per "group"
+
+        BarData d = new BarData(set1, set2);
+        d.setBarWidth(barWidth);
+
+        // make this BarData object grouped
+        d.groupBars(0, groupSpace, barSpace); // start at x = 0
 
         return d;
     }
@@ -198,7 +213,7 @@ protected BubbleData generateBubbleData() {
 
         for (int index = 0; index < itemcount; index++) {
             float y = getRandom(10, 105);
-            float size = getRandom(50, 105);
+            float size = getRandom(100, 105);
             entries.add(new BubbleEntry(index + 0.5f, y, size));
         }
 
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/charts/BarChart.java b/MPChartLib/src/main/java/com/github/mikephil/charting/charts/BarChart.java
@@ -201,7 +201,8 @@ public void setFitBars(boolean enabled) {
 
     /**
      * Groups all BarDataSet objects this data object holds together by modifying the x-position of their entries.
-     * Leaves space as specified by the parameters.
+     * Previously set x-positions of entries will be overwritten. Leaves space between bars and groups as specified
+     * by the parameters.
      * Calls notifyDataSetChanged() afterwards.
      *
      * @param fromX      the starting point on the x-axis where the grouping should begin
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/data/BarData.java b/MPChartLib/src/main/java/com/github/mikephil/charting/data/BarData.java
@@ -45,7 +45,8 @@ public float getBarWidth() {
 
     /**
      * Groups all BarDataSet objects this data object holds together by modifying the x-position of their entries.
-     * Leaves space as specified by the parameters.
+     * Previously set x-positions of entries will be overwritten. Leaves space between bars and groups as specified
+     * by the parameters.
      * Do not forget to call notifyDataSetChanged() on your BarChart object after calling this method.
      *
      * @param fromX      the starting point on the x-axis where the grouping should begin

Original file line number	Diff line number	Diff line change
`@@ -201,7 +201,8 @@ public void setFitBars(boolean enabled) {`
`201`	`201`
`202`	`202`	`/**`
`203`	`203`	`* Groups all BarDataSet objects this data object holds together by modifying the x-position of their entries.`
`204`		`- * Leaves space as specified by the parameters.`
	`204`	`+ * Previously set x-positions of entries will be overwritten. Leaves space between bars and groups as specified`
	`205`	`+ * by the parameters.`
`205`	`206`	`* Calls notifyDataSetChanged() afterwards.`
`206`	`207`	`*`
`207`	`208`	`* @param fromX the starting point on the x-axis where the grouping should begin`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,8 @@ public float getBarWidth() {`
`45`	`45`
`46`	`46`	`/**`
`47`	`47`	`* Groups all BarDataSet objects this data object holds together by modifying the x-position of their entries.`
`48`		`- * Leaves space as specified by the parameters.`
	`48`	`+ * Previously set x-positions of entries will be overwritten. Leaves space between bars and groups as specified`
	`49`	`+ * by the parameters.`
`49`	`50`	`* Do not forget to call notifyDataSetChanged() on your BarChart object after calling this method.`
`50`	`51`	`*`
`51`	`52`	`* @param fromX the starting point on the x-axis where the grouping should begin`