Merge #1947

PhilJay · Jul 2, 2016 · 43fa1e6 · 43fa1e6
1 parent 40c5c87
commit 43fa1e6
Show file tree

Hide file tree

Showing 27 changed files with 191 additions and 333 deletions.
diff --git a/MPChartExample/src/com/xxmassdeveloper/mpchartexample/LineChartActivity2.java b/MPChartExample/src/com/xxmassdeveloper/mpchartexample/LineChartActivity2.java
@@ -58,6 +58,7 @@ protected void onCreate(Bundle savedInstanceState) {
 
         mChart = (LineChart) findViewById(R.id.chart1);
         mChart.setOnChartValueSelectedListener(this);
+        mChart.setLogEnabled(true);
 
         // no description text
         mChart.setDescription("");

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
@@ -105,7 +105,6 @@ public Highlight getHighlightByTouchPoint(float x, float y) {
      */
     public RectF getBarBounds(BarEntry e) {
 
-
         RectF bounds = new RectF();
         getBarBounds(e, bounds);
 
@@ -143,7 +142,6 @@ public void getBarBounds(BarEntry e, RectF outputRect){
         bounds.set(left, top, right, bottom);
 
         getTransformer(set.getAxisDependency()).rectValueToPixel(outputRect);
-
     }
 
     /**

diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/charts/BarLineChartBase.java b/MPChartLib/src/main/java/com/github/mikephil/charting/charts/BarLineChartBase.java
@@ -1280,7 +1280,9 @@ public IBarLineScatterCandleBubbleDataSet getDataSetByTouchPoint(float x, float
         return null;
     }
 
+    /** buffer for storing lowest visible x point */
     protected PointD posForGetLowestVisibleX = PointD.getInstance(0,0);
+
     /**
      * Returns the lowest x-index (value on the x-axis) that is still visible on
      * the chart.
@@ -1295,7 +1297,9 @@ public float getLowestVisibleX() {
         return result;
     }
 
+    /** buffer for storing highest visible x point */
     protected PointD posForGetHighestVisibleX = PointD.getInstance(0,0);
+
     /**
      * Returns the highest x-index (value on the x-axis) that is still visible
      * on the chart.

diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/charts/Chart.java b/MPChartLib/src/main/java/com/github/mikephil/charting/charts/Chart.java
@@ -12,7 +12,6 @@
 import android.graphics.Color;
 import android.graphics.Paint;
 import android.graphics.Paint.Align;
-import android.graphics.PointF;
 import android.graphics.RectF;
 import android.graphics.Typeface;
 import android.graphics.drawable.Drawable;
@@ -1429,50 +1428,6 @@ public void setDrawMarkerViews(boolean enabled) {
         mDrawMarkerViews = enabled;
     }
 
-    /**
-     * Get all Entry objects at the given index across all DataSets.
-     * INFORMATION: This method does calculations at runtime. Do not over-use in
-     * performance critical situations.
-     *
-     * @param xIndex
-     * @return
-     */
-    public List<Entry> getEntriesAtIndex(int xIndex) {
-
-        List<Entry> vals = new ArrayList<Entry>();
-
-        for (int i = 0; i < mData.getDataSetCount(); i++) {
-
-            IDataSet set = mData.getDataSetByIndex(i);
-
-            Entry e = set.getEntryForXPos(xIndex);
-
-            if (e != null) {
-                vals.add(e);
-            }
-        }
-
-        return vals;
-    }
-
-    public void getEntriesAtIndex(int xIndex, List<Entry> entriesOutput){
-
-        List<Entry> vals = entriesOutput;
-        vals.clear();
-
-        for (int i = 0; i < mData.getDataSetCount(); i++) {
-
-            IDataSet set = mData.getDataSetByIndex(i);
-
-            Entry e = set.getEntryForXPos(xIndex);
-
-            if (e != null) {
-                vals.add(e);
-            }
-        }
-
-    }
-
     /**
      * Returns the ChartData object that has been set for the chart.
      *

diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/charts/HorizontalBarChart.java b/MPChartLib/src/main/java/com/github/mikephil/charting/charts/HorizontalBarChart.java
@@ -1,7 +1,6 @@
 package com.github.mikephil.charting.charts;
 
 import android.content.Context;
-import android.graphics.PointF;
 import android.graphics.RectF;
 import android.util.AttributeSet;
 import android.util.Log;
@@ -18,7 +17,6 @@
 import com.github.mikephil.charting.renderer.YAxisRendererHorizontalBarChart;
 import com.github.mikephil.charting.utils.HorizontalViewPortHandler;
 import com.github.mikephil.charting.utils.MPPointF;
-import com.github.mikephil.charting.utils.PointD;
 import com.github.mikephil.charting.utils.TransformerHorizontalBarChart;
 import com.github.mikephil.charting.utils.Utils;
 
@@ -209,7 +207,6 @@ public Highlight getHighlightByTouchPoint(float x, float y) {
             return getHighlighter().getHighlight(y, x); // switch x and y
     }
 
-    protected PointD posForGetLowestVisibleX = PointD.getInstance(0,0);
     @Override
     public float getLowestVisibleX() {
         getTransformer(AxisDependency.LEFT).getValuesByTouchPoint(mViewPortHandler.contentLeft(),
@@ -218,7 +215,6 @@ public float getLowestVisibleX() {
         return result;
     }
 
-    protected PointD posForGetHighestVisibleX = PointD.getInstance(0,0);
     @Override
     public float getHighestVisibleX() {
         getTransformer(AxisDependency.LEFT).getValuesByTouchPoint(mViewPortHandler.contentLeft(),

diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/data/BarDataSet.java b/MPChartLib/src/main/java/com/github/mikephil/charting/data/BarDataSet.java
@@ -51,11 +51,10 @@ public BarDataSet(List<BarEntry> yVals, String label) {
         calcEntryCountIncludingStacks(yVals);
     }
 
-    protected List<BarEntry> barEntriesForCopy = new ArrayList<>();
     @Override
     public DataSet<BarEntry> copy() {
 
-        List<BarEntry> yVals = barEntriesForCopy;
+        List<BarEntry> yVals = new ArrayList<BarEntry>();
         yVals.clear();
 
         for (int i = 0; i < mValues.size(); i++) {

diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/data/BaseDataSet.java b/MPChartLib/src/main/java/com/github/mikephil/charting/data/BaseDataSet.java
@@ -169,14 +169,12 @@ public void setColors(int[] colors, Context c) {
         if(mColors == null){
             mColors = new ArrayList<>();
         }
-        List<Integer> clrs = mColors;
-        clrs.clear();
+
+        mColors.clear();
 
         for (int color : colors) {
-            clrs.add(c.getResources().getColor(color));
+            mColors.add(c.getResources().getColor(color));
         }
-
-        mColors = clrs;
     }
 
     /**

diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/data/BubbleData.java b/MPChartLib/src/main/java/com/github/mikephil/charting/data/BubbleData.java
@@ -3,7 +3,6 @@
 
 import com.github.mikephil.charting.interfaces.datasets.IBubbleDataSet;
 
-import java.util.ArrayList;
 import java.util.List;
 
 public class BubbleData extends BarLineScatterCandleBubbleData<IBubbleDataSet> {
@@ -28,11 +27,8 @@ public BubbleData(List<IBubbleDataSet> dataSets) {
      * @param width
      */
     public void setHighlightCircleWidth(float width) {
-        IBubbleDataSet set;
-        final int setCount = mDataSets.size();
-        for(int i = 0 ; i < setCount ; i++){
-            set = mDataSets.get(i);
-            set.setHighlightCircleWidth(width);
+        for(int i = 0 ; i < mDataSets.size() ; i++){
+            mDataSets.get(i).setHighlightCircleWidth(width);
         }
     }
 }
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/data/BubbleDataSet.java b/MPChartLib/src/main/java/com/github/mikephil/charting/data/BubbleDataSet.java
@@ -51,12 +51,10 @@ public void calcMinMax() {
         }
     }
 
-    protected ArrayList<BubbleEntry> bubbleEntriesForCopy = new ArrayList<>();
     @Override
     public DataSet<BubbleEntry> copy() {
 
-        List<BubbleEntry> yVals = bubbleEntriesForCopy;
-        yVals.clear();
+        List<BubbleEntry> yVals = new ArrayList<BubbleEntry>();
 
         for (int i = 0; i < mValues.size(); i++) {
             yVals.add(mValues.get(i).copy());

diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/data/CandleDataSet.java b/MPChartLib/src/main/java/com/github/mikephil/charting/data/CandleDataSet.java
@@ -77,15 +77,14 @@ public CandleDataSet(List<CandleEntry> yVals, String label) {
         super(yVals, label);
     }
 
-    protected ArrayList<CandleEntry> candleEntriesForCopy = new ArrayList<>();
     @Override
     public DataSet<CandleEntry> copy() {
 
-        List<CandleEntry> yVals = candleEntriesForCopy;
+        List<CandleEntry> yVals = new ArrayList<CandleEntry>();
         yVals.clear();
 
         for (int i = 0; i < mValues.size(); i++) {
-            yVals.add(((CandleEntry) mValues.get(i)).copy());
+            yVals.add(mValues.get(i).copy());
         }
 
         CandleDataSet copied = new CandleDataSet(yVals, getLabel());