merge master

Author: PhilJay

MPChartLib/src/com/github/mikephil/charting/charts/BarChart.java

@@ -90,7 +90,7 @@ protected void calcMinMax() {
 	@Override
 	public Highlight getHighlightByTouchPoint(float x, float y) {
 
-		if (mDataNotSet || mData == null) {
+		if (mData == null) {
 			Log.e(LOG_TAG, "Can't select by touch. No data set.");
 			return null;
 		} else

MPChartLib/src/com/github/mikephil/charting/charts/BarLineChartBase.java

@@ -188,7 +188,7 @@ protected void init() {
     protected void onDraw(Canvas canvas) {
         super.onDraw(canvas);
 
-        if (mDataNotSet)
+        if (mData == null)
             return;
 
         long starttime = System.currentTimeMillis();
@@ -315,7 +315,7 @@ protected void prepareOffsetMatrix() {
     @Override
     public void notifyDataSetChanged() {
 
-        if (mDataNotSet) {
+        if (mData == null) {
             if (mLogEnabled)
                 Log.i(LOG_TAG, "Preparing... DATA NOT SET.");
             return;
@@ -653,7 +653,7 @@ public Transformer getTransformer(AxisDependency which) {
     public boolean onTouchEvent(MotionEvent event) {
         super.onTouchEvent(event);
 
-        if (mChartTouchListener == null || mDataNotSet)
+        if (mChartTouchListener == null || mData == null)
             return false;
 
         // check if touch gestures are enabled
@@ -1154,7 +1154,7 @@ public void setMinOffset(float minOffset) {
      */
     public Highlight getHighlightByTouchPoint(float x, float y) {
 
-        if (mDataNotSet || mData == null) {
+        if (mData == null) {
             Log.e(LOG_TAG, "Can't select by touch. No data set.");
             return null;
         } else

MPChartLib/src/com/github/mikephil/charting/charts/Chart.java

@@ -116,11 +116,6 @@ public abstract class Chart<T extends ChartData<? extends IDataSet<? extends Ent
      */
     protected String mDescription = "Description";
 
-    /**
-     * flag that indicates if the chart has been fed with data yet
-     */
-    protected boolean mDataNotSet = true;
-
     /**
      * the number of x-values the chart displays
      */
@@ -309,7 +304,6 @@ public void setData(T data) {
         }
 
         // LET THE CHART KNOW THERE IS DATA
-        mDataNotSet = false;
         mOffsetsCalculated = false;
         mData = data;
 
@@ -334,7 +328,6 @@ public void setData(T data) {
      */
     public void clear() {
         mData = null;
-        mDataNotSet = true;
         mIndicesToHighlight = null;
         invalidate();
     }
@@ -420,11 +413,7 @@ protected void calculateFormatter(float min, float max) {
     protected void onDraw(Canvas canvas) {
         // super.onDraw(canvas);
 
-        if (mDataNotSet || mData == null || mData.getYValCount() <= 0) { // check
-            // if
-            // there
-            // is
-            // data
+        if (mData == null) {
 
             // if no data, inform the user
             canvas.drawText(mNoDataText, getWidth() / 2, getHeight() / 2, mInfoPaint);

MPChartLib/src/com/github/mikephil/charting/charts/HorizontalBarChart.java

@@ -220,7 +220,7 @@ public PointF getPosition(Entry e, AxisDependency axis) {
 	@Override
 	public Highlight getHighlightByTouchPoint(float x, float y) {
 
-		if (mDataNotSet || mData == null) {
+		if (mData == null) {
 			Log.e(LOG_TAG, "Can't select by touch. No data set.");
 			return null;
 		} else

MPChartLib/src/com/github/mikephil/charting/charts/PieChart.java

@@ -112,7 +112,7 @@ protected void init() {
     protected void onDraw(Canvas canvas) {
         super.onDraw(canvas);
 
-        if (mDataNotSet)
+        if (mData == null)
             return;
 
         mRenderer.drawData(canvas);
@@ -136,7 +136,7 @@ public void calculateOffsets() {
         super.calculateOffsets();
 
         // prevent nullpointer when no data set
-        if (mDataNotSet)
+        if (mData == null)
             return;
 
         float diameter = getDiameter();

MPChartLib/src/com/github/mikephil/charting/charts/PieRadarChartBase.java

@@ -87,7 +87,7 @@ public void computeScroll() {
 
     @Override
     public void notifyDataSetChanged() {
-        if (mDataNotSet)
+        if (mData == null)
             return;
 
         calcMinMax();

MPChartLib/src/com/github/mikephil/charting/charts/RadarChart.java

@@ -161,7 +161,7 @@ protected float[] getMarkerPosition(Entry e, Highlight highlight) {
 
     @Override
     public void notifyDataSetChanged() {
-        if (mDataNotSet)
+        if (mData == null)
             return;
 
         calcMinMax();
@@ -183,7 +183,7 @@ public void notifyDataSetChanged() {
     protected void onDraw(Canvas canvas) {
         super.onDraw(canvas);
 
-        if (mDataNotSet)
+        if (mData == null)
             return;
 
         mXAxisRenderer.renderAxisLabels(canvas);

MPChartLib/src/com/github/mikephil/charting/data/DataSet.java

@@ -89,7 +89,11 @@ public void calcMinMax(int start, int end) {
         }
     }
 
-    @Override
+    /**
+     * returns the number of y-values this DataSet represents
+     *
+     * @return
+     */
     public int getEntryCount() {
         return mYVals.size();
     }

MPChartLib/src/com/github/mikephil/charting/renderer/PieChartRenderer.java

@@ -309,8 +309,10 @@ protected void drawCenterText(Canvas c) {
 
             float radiusPercent = mChart.getCenterTextRadiusPercent();
             if (radiusPercent > 0.0) {
-                boundingRect.inset((boundingRect.width() - boundingRect.width() * radiusPercent) / 2.f,
-                        (boundingRect.height() - boundingRect.height() * radiusPercent) / 2.f);
+                boundingRect.inset(
+                        (boundingRect.width() - boundingRect.width() * (radiusPercent / 100.f)) / 2.f,
+                        (boundingRect.height() - boundingRect.height() * (radiusPercent / 100.f)) / 2.f
+                );
             }
 
             if (!centerText.equals(mCenterTextLastValue) || !boundingRect.equals(mCenterTextLastBounds)) {
@@ -408,7 +410,7 @@ public void drawHighlighted(Canvas c, Highlight[] indices) {
             else
                 angle = rotationAngle + absoluteAngles[xIndex - 1];
 
-            angle *= mAnimator.getPhaseY();
+            angle *= mAnimator.getPhaseX();
 
             float sliceDegrees = drawAngles[xIndex];