Improvements concerning Pie- and RadarChart offset calculation. Improvements concerning Pie- and RadarChart touch listener.

Author: PhilJay

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

@@ -1057,22 +1057,6 @@ public boolean onTouchEvent(MotionEvent event) {
  */
  /** CODE BELOW THIS RELATED TO SCALING AND GESTURES */
 
- /**
- * disables intercept touchevents
- */
- public void disableScroll() {
- ViewParent parent = getParent();
- parent.requestDisallowInterceptTouchEvent(true);
- }
-
- /**
- * enables intercept touchevents
- */
- public void enableScroll() {
- ViewParent parent = getParent();
- parent.requestDisallowInterceptTouchEvent(false);
- }
-
  /**
  * Zooms in by 1.4f, x and y are the coordinates (in pixels) of the zoom
  * center.

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

@@ -22,6 +22,7 @@
 import android.util.AttributeSet;
 import android.util.Log;
 import android.view.View;
+import android.view.ViewParent;
 
 import com.github.mikephil.charting.data.BarData;
 import com.github.mikephil.charting.data.BarDataSet;
@@ -1737,6 +1738,22 @@ public Legend getLegend() {
  public RectF getContentRect() {
  return mContentRect;
  }
+ 
+ /**
+ * disables intercept touchevents
+ */
+ public void disableScroll() {
+ ViewParent parent = getParent();
+ parent.requestDisallowInterceptTouchEvent(true);
+ }
+
+ /**
+ * enables intercept touchevents
+ */
+ public void enableScroll() {
+ ViewParent parent = getParent();
+ parent.requestDisallowInterceptTouchEvent(false);
+ }
 
  /** paint for the grid lines (only line and barchart) */
  public static final int PAINT_GRID = 3;

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

@@ -173,77 +173,6 @@ protected void calcMinMax(boolean fixedValues) {
  calcAngles();
  }
 
- @Override
- protected void calculateOffsets() {
-
- float legendRight = 0f, legendBottom = 0f, legendTop = 0f;
-
- if (mDrawLegend) {
-
- if (mLegend == null)
- return;
-
- if (mLegend.getPosition() == LegendPosition.RIGHT_OF_CHART_CENTER) {
-
- // this is the space between the legend and the chart
- float spacing = Utils.convertDpToPixel(13f);
-
- legendRight = mLegend.getMaximumEntryLength(mLegendLabelPaint)
- + mLegend.getFormSize() + mLegend.getFormToTextSpace() + spacing;
-
- mLegendLabelPaint.setTextAlign(Align.LEFT);
- // legendTop = mLegend.getFullHeight(mLegendLabelPaint);
-
- } else if (mLegend.getPosition() == LegendPosition.RIGHT_OF_CHART) {
-
- // this is the space between the legend and the chart
- float spacing = Utils.convertDpToPixel(13f);
-
- float legendWidth = mLegend.getMaximumEntryLength(mLegendLabelPaint)
- + mLegend.getFormSize() + mLegend.getFormToTextSpace() + spacing;
-
- float legendHeight = mLegend.getFullHeight(mLegendLabelPaint) + mOffsetTop;
-
- PointF bottomRight = new PointF(getWidth() - legendWidth, legendHeight);
- PointF reference = getPosition(getCenter(), getRadius(), 315);
-
- float distLegend = distanceToCenter(bottomRight.x, bottomRight.y);
- float distReference = distanceToCenter(reference.x, reference.y);
- float min = Utils.convertDpToPixel(5f);
-
- if (distLegend < distReference) {
-
- float diff = distReference - distLegend;
-
- legendRight = min + diff;
- legendTop = min + diff;
- }
-
- mLegendLabelPaint.setTextAlign(Align.LEFT);
-
- } else if (mLegend.getPosition() == LegendPosition.BELOW_CHART_LEFT
- || mLegend.getPosition() == LegendPosition.BELOW_CHART_RIGHT
- || mLegend.getPosition() == LegendPosition.BELOW_CHART_CENTER) {
-
- legendBottom = mLegendLabelPaint.getTextSize() * 4f;
- }
-
- mLegend.setOffsetBottom(legendBottom);
- mLegend.setOffsetRight(legendRight);
- }
-
- float min = Utils.convertDpToPixel(11f);
-
- mLegend.setOffsetLeft(min);
-
- mOffsetLeft = min;
- mOffsetTop = Math.max(min, legendTop);
- mOffsetRight = Math.max(min, legendRight);
- mOffsetBottom = Math.max(min, legendBottom);
-
- applyCalculatedOffsets();
- }
-
  /**
  * calculates the needed angles for the chart slices
  */
@@ -694,6 +623,16 @@ public boolean isDrawXValuesEnabled() {
  return mDrawXVals;
  }
 
+ @Override
+ protected float getRequiredBottomOffset() {
+ return mLegendLabelPaint.getTextSize() * 4f;
+ }
+ 
+ @Override
+ protected float getRequiredBaseOffset() {
+ return 0;
+ }
+
  @Override
  public float getRadius() {
  if (mCircleBox == null)

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

@@ -4,13 +4,16 @@
 import android.content.Context;
 import android.graphics.Matrix;
 import android.graphics.PointF;
+import android.graphics.Paint.Align;
 import android.util.AttributeSet;
 import android.view.MotionEvent;
 
 import com.github.mikephil.charting.data.ChartData;
 import com.github.mikephil.charting.data.DataSet;
 import com.github.mikephil.charting.data.Entry;
 import com.github.mikephil.charting.listener.PieRadarChartTouchListener;
+import com.github.mikephil.charting.utils.Utils;
+import com.github.mikephil.charting.utils.Legend.LegendPosition;
 import com.nineoldandroids.animation.ObjectAnimator;
 
 /**
@@ -67,7 +70,7 @@ public void prepare() {
  calcMinMax(false);
 
  prepareLegend();
- 
+
  calculateOffsets();
  }
 
@@ -76,6 +79,78 @@ public void notifyDataSetChanged() {
  prepare();
  }
 
+ @Override
+ protected void calculateOffsets() {
+
+ float legendRight = 0f, legendBottom = 0f, legendTop = 0f;
+
+ if (mDrawLegend) {
+
+ if (mLegend == null)
+ return;
+
+ if (mLegend.getPosition() == LegendPosition.RIGHT_OF_CHART_CENTER) {
+
+ // this is the space between the legend and the chart
+ float spacing = Utils.convertDpToPixel(13f);
+
+ legendRight = getFullLegendWidth() + spacing;
+
+ mLegendLabelPaint.setTextAlign(Align.LEFT);
+ // legendTop = mLegend.getFullHeight(mLegendLabelPaint);
+
+ } else if (mLegend.getPosition() == LegendPosition.RIGHT_OF_CHART) {
+
+ // this is the space between the legend and the chart
+ float spacing = Utils.convertDpToPixel(13f);
+
+ float legendWidth = getFullLegendWidth() + spacing;
+
+ float legendHeight = mLegend.getFullHeight(mLegendLabelPaint) + mOffsetTop;
+
+ PointF bottomRight = new PointF(getWidth() - legendWidth, legendHeight);
+ PointF reference = getPosition(getCenter(), getRadius(), 315);
+
+ float distLegend = distanceToCenter(bottomRight.x, bottomRight.y);
+ float distReference = distanceToCenter(reference.x, reference.y);
+ float min = Utils.convertDpToPixel(5f);
+
+ if (distLegend < distReference) {
+
+ float diff = distReference - distLegend;
+
+ legendRight = min + diff;
+ legendTop = min + diff;
+ }
+
+ mLegendLabelPaint.setTextAlign(Align.LEFT);
+
+ } else if (mLegend.getPosition() == LegendPosition.BELOW_CHART_LEFT
+ || mLegend.getPosition() == LegendPosition.BELOW_CHART_RIGHT
+ || mLegend.getPosition() == LegendPosition.BELOW_CHART_CENTER) {
+
+ legendBottom = getRequiredBottomOffset();
+ }
+ 
+ legendRight += getRequiredBaseOffset();
+ legendTop += getRequiredBaseOffset();
+
+ mLegend.setOffsetBottom(mLegendLabelPaint.getTextSize() * 4f);
+ mLegend.setOffsetRight(legendRight);
+ }
+
+ float min = Utils.convertDpToPixel(11f);
+
+ mLegend.setOffsetLeft(min);
+
+ mOffsetLeft = Math.max(min, getRequiredBaseOffset());
+ mOffsetTop = Math.max(min, legendTop);
+ mOffsetRight = Math.max(min, legendRight);
+ mOffsetBottom = Math.max(min, legendBottom);
+
+ applyCalculatedOffsets();
+ }
+
  @Override
  protected void drawAdditional() {
  // TODO Auto-generated method stub
@@ -170,7 +245,7 @@ public float getAngleForPoint(float x, float y) {
 
  return angle;
  }
- 
+
  /**
  * Calculates the position around a center point, depending on the distance
  * from the center, and the angle of the position around the center.
@@ -199,7 +274,7 @@ protected PointF getPosition(PointF center, float dist, float angle) {
  public float distanceToCenter(float x, float y) {
 
  PointF c = getCenterOffsets();
- 
+
  float dist = 0f;
 
  float xDist = 0f;
@@ -291,6 +366,31 @@ public float getDiameter() {
  */
  public abstract float getRadius();
 
+ /**
+ * Returns the required bottom offset for the chart.
+ * 
+ * @return
+ */
+ protected abstract float getRequiredBottomOffset();
+
+ /**
+ * Returns the required right offset for the chart.
+ * 
+ * @return
+ */
+ private float getFullLegendWidth() {
+ return mLegend.getMaximumEntryLength(mLegendLabelPaint)
+ + mLegend.getFormSize() + mLegend.getFormToTextSpace();
+ }
+
+ /**
+ * Returns the base offset needed for the chart without calculating the
+ * legend size.
+ * 
+ * @return
+ */
+ protected abstract float getRequiredBaseOffset();
+
  /**
  * set a new (e.g. custom) charttouchlistener NOTE: make sure to
  * setTouchEnabled(true); if you need touch gestures on the chart