Added possibility to set label textsize, added possibility to set val…

…ue textsize. Fixed bug in the getPaint(...) method.
aven-yang · Aug 11, 2014 · 6c1163d · 6c1163d
1 parent 5e6d84e
commit 6c1163d
Show file tree

Hide file tree

Showing 12 changed files with 201 additions and 186 deletions.
diff --git a/MPChartExample/project.properties b/MPChartExample/project.properties
@@ -11,5 +11,5 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-19
+target=android-20
 android.library.reference.1=../MPChartLib
diff --git a/MPChartExample/src/com/xxmassdeveloper/mpchartexample/BarChartActivity.java b/MPChartExample/src/com/xxmassdeveloper/mpchartexample/BarChartActivity.java
@@ -1,6 +1,7 @@
 
 package com.xxmassdeveloper.mpchartexample;
 
+import android.graphics.Paint;
 import android.graphics.Typeface;
 import android.os.Bundle;
 import android.view.Menu;
@@ -12,6 +13,7 @@
 import android.widget.Toast;
 
 import com.github.mikephil.charting.charts.BarChart;
+import com.github.mikephil.charting.charts.Chart;
 import com.github.mikephil.charting.data.BarData;
 import com.github.mikephil.charting.data.BarDataSet;
 import com.github.mikephil.charting.data.Entry;
@@ -81,13 +83,15 @@ protected void onCreate(Bundle savedInstanceState) {
 
         XLabels xLabels = mChart.getXLabels();
         xLabels.setPosition(XLabelPosition.TOP);
-
         // mChart.setDrawXLabels(false);
 
         mChart.setDrawGridBackground(false);
         mChart.setDrawHorizontalGrid(true);
         mChart.setDrawVerticalGrid(false);
         // mChart.setDrawYLabels(false);
+
+        // sets the text size of the values inside the chart
+        mChart.setValueTextSize(10f);
 
         mChart.setDrawBorder(false);
         // mChart.setBorderPositions(new BorderPosition[] {BorderPosition.LEFT,

diff --git a/MPChartLib/project.properties b/MPChartLib/project.properties
@@ -11,5 +11,5 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-19
+target=android-20
 android.library=true
diff --git a/MPChartLib/src/com/github/mikephil/charting/charts/BarChart.java b/MPChartLib/src/com/github/mikephil/charting/charts/BarChart.java
@@ -689,7 +689,8 @@ public void setPaint(Paint p, int which) {
 
     @Override
     public Paint getPaint(int which) {
-        super.getPaint(which);
+        Paint p = super.getPaint(which);
+        if(p != null) return p;
 
         switch (which) {
             case PAINT_HIGHLIGHT_BAR:

diff --git a/MPChartLib/src/com/github/mikephil/charting/charts/BarLineChartBase.java b/MPChartLib/src/com/github/mikephil/charting/charts/BarLineChartBase.java
@@ -614,6 +614,7 @@ protected void drawXLabels() {
         float yoffset = Utils.convertDpToPixel(3.5f);
 
         mXLabelPaint.setTypeface(mXLabels.getTypeface());
+        mXLabelPaint.setTextSize(mXLabels.getTextSize());
 
         if (mXLabels.getPosition() == XLabelPosition.TOP) {
 
@@ -686,6 +687,7 @@ protected void drawYLabels() {
         float xoffset = Utils.convertDpToPixel(5f);
 
         mYLabelPaint.setTypeface(mYLabels.getTypeface());
+        mYLabelPaint.setTextSize(mYLabels.getTextSize());
 
         // determine position and draw adequately
         if (mYLabels.getPosition() == YLabelPosition.LEFT) {
@@ -1281,35 +1283,6 @@ public void setMaxVisibleValueCount(int count) {
         this.mMaxVisibleCount = count;
     }
 
-    /**
-     * sets the size of the y-label text in pixels min = 7f, max = 14f
-     * 
-     * @param size
-     */
-    public void setYLabelTextSize(float size) {
-
-        if (size > 14f)
-            size = 14f;
-        if (size < 7f)
-            size = 7f;
-        mYLabelPaint.setTextSize(Utils.convertDpToPixel(size));
-    }
-
-    /**
-     * sets the size of the x-label text in pixels min = 7f, max = 14f
-     * 
-     * @param size
-     */
-    public void setXLabelTextSize(float size) {
-
-        if (size > 14f)
-            size = 14f;
-        if (size < 7f)
-            size = 7f;
-
-        mXLabelPaint.setTextSize(Utils.convertDpToPixel(size));
-    }
-
     /**
      * If set to true, the highlight indicators (cross of two lines for
      * LineChart and ScatterChart, dark bar overlay for BarChart) that give
@@ -1846,7 +1819,8 @@ public void setPaint(Paint p, int which) {
 
     @Override
     public Paint getPaint(int which) {
-        super.getPaint(which);
+        Paint p = super.getPaint(which);
+        if(p != null) return p;
 
         switch (which) {
             case PAINT_GRID: