Skip to content

Commit d4e71d8

Browse files
PhilJayPhilJay
committed
Refactoring of entry
2 parents 7de481b + 545c633 commit d4e71d8

69 files changed

Lines changed: 879 additions & 594 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎MPChartExample/AndroidManifest.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
</activity>
2727
<activity android:name="LineChartActivity1"></activity> <!-- android:configChanges="keyboardHidden|orientation|screenSize" -->
2828
<activity android:name="LineChartActivity2"></activity>
29+
<activity android:name=".LineChartTime"></activity>
2930
<activity android:name="BarChartActivity"></activity>
3031
<activity android:name="HorizontalBarChartActivity"></activity>
3132
<activity android:name="PieChartActivity"></activity>

‎MPChartExample/src/com/xxmassdeveloper/mpchartexample/AnotherBarActivity.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@
1717
import com.github.mikephil.charting.data.BarDataSet;
1818
import com.github.mikephil.charting.data.BarEntry;
1919
import com.github.mikephil.charting.data.XAxisValue;
20-
import com.github.mikephil.charting.data.filter.Approximator;
21-
import com.github.mikephil.charting.data.filter.Approximator.ApproximatorType;
2220
import com.github.mikephil.charting.interfaces.datasets.IBarDataSet;
2321
import com.github.mikephil.charting.interfaces.datasets.IDataSet;
2422
import com.github.mikephil.charting.utils.ColorTemplate;
@@ -185,7 +183,7 @@ public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
185183
ArrayList<XAxisValue> xVals = new ArrayList<XAxisValue>();
186184
for (int i = 0; i < mSeekBarX.getProgress() + 1; i++) {
187185

188-
XAxisValue xValue = new XAxisValue(i, (int) yVals1.get(i).getVal() + "");
186+
XAxisValue xValue = new XAxisValue(i, (int) yVals1.get(i).getY() + "");
189187
xVals.add(xValue);
190188
}
191189

‎MPChartExample/src/com/xxmassdeveloper/mpchartexample/BarChartActivity.java‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,6 @@
2929
import com.github.mikephil.charting.data.BarEntry;
3030
import com.github.mikephil.charting.data.Entry;
3131
import com.github.mikephil.charting.data.XAxisValue;
32-
import com.github.mikephil.charting.data.filter.Approximator;
33-
import com.github.mikephil.charting.data.filter.Approximator.ApproximatorType;
3432
import com.github.mikephil.charting.formatter.YAxisValueFormatter;
3533
import com.github.mikephil.charting.highlight.Highlight;
3634
import com.github.mikephil.charting.interfaces.datasets.IBarDataSet;
@@ -285,8 +283,8 @@ public void onValueSelected(Entry e, int dataSetIndex, Highlight h) {
285283
Log.i("position", position.toString());
286284

287285
Log.i("x-index",
288-
"low: " + mChart.getLowestVisibleXIndex() + ", high: "
289-
+ mChart.getHighestVisibleXIndex());
286+
"low: " + mChart.getLowestVisibleX() + ", high: "
287+
+ mChart.getHighestVisibleX());
290288
}
291289

292290
public void onNothingSelected() {

‎MPChartExample/src/com/xxmassdeveloper/mpchartexample/BubbleChartActivity.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@
2222
import com.github.mikephil.charting.data.BubbleEntry;
2323
import com.github.mikephil.charting.data.Entry;
2424
import com.github.mikephil.charting.data.XAxisValue;
25-
import com.github.mikephil.charting.data.filter.Approximator;
26-
import com.github.mikephil.charting.data.filter.Approximator.ApproximatorType;
2725
import com.github.mikephil.charting.highlight.Highlight;
2826
import com.github.mikephil.charting.interfaces.datasets.IBubbleDataSet;
2927
import com.github.mikephil.charting.interfaces.datasets.IDataSet;
@@ -226,7 +224,7 @@ public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
226224
@Override
227225
public void onValueSelected(Entry e, int dataSetIndex, Highlight h) {
228226
Log.i("VAL SELECTED",
229-
"Value: " + e.getVal() + ", xIndex: " + e.getXIndex()
227+
"Value: " + e.getY() + ", xIndex: " + e.getX()
230228
+ ", DataSet index: " + dataSetIndex);
231229
}
232230

‎MPChartExample/src/com/xxmassdeveloper/mpchartexample/DrawChartActivity.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ public boolean onOptionsItemSelected(MenuItem item) {
144144
@Override
145145
public void onValueSelected(Entry e, int dataSetIndex, Highlight h) {
146146
Log.i("VAL SELECTED",
147-
"Value: " + e.getVal() + ", xIndex: " + e.getXIndex()
147+
"Value: " + e.getY() + ", xIndex: " + e.getX()
148148
+ ", DataSet index: " + dataSetIndex);
149149
}
150150

‎MPChartExample/src/com/xxmassdeveloper/mpchartexample/InvertedLineChartActivity.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@
2020
import com.github.mikephil.charting.data.LineData;
2121
import com.github.mikephil.charting.data.LineDataSet;
2222
import com.github.mikephil.charting.data.XAxisValue;
23-
import com.github.mikephil.charting.data.filter.Approximator;
24-
import com.github.mikephil.charting.data.filter.Approximator.ApproximatorType;
2523
import com.github.mikephil.charting.interfaces.datasets.ILineDataSet;
2624
import com.github.mikephil.charting.listener.OnChartValueSelectedListener;
2725
import com.github.mikephil.charting.highlight.Highlight;
@@ -232,7 +230,7 @@ public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
232230
@Override
233231
public void onValueSelected(Entry e, int dataSetIndex, Highlight h) {
234232
Log.i("VAL SELECTED",
235-
"Value: " + e.getVal() + ", xIndex: " + e.getXIndex()
233+
"Value: " + e.getY() + ", xIndex: " + e.getX()
236234
+ ", DataSet index: " + dataSetIndex);
237235
}
238236

‎MPChartExample/src/com/xxmassdeveloper/mpchartexample/LineChartActivity1.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -445,7 +445,7 @@ public void onChartTranslate(MotionEvent me, float dX, float dY) {
445445
@Override
446446
public void onValueSelected(Entry e, int dataSetIndex, Highlight h) {
447447
Log.i("Entry selected", e.toString());
448-
Log.i("LOWHIGH", "low: " + mChart.getLowestVisibleXIndex() + ", high: " + mChart.getHighestVisibleXIndex());
448+
Log.i("LOWHIGH", "low: " + mChart.getLowestVisibleX() + ", high: " + mChart.getHighestVisibleX());
449449
Log.i("MIN MAX", "xmin: " + mChart.getXChartMin() + ", xmax: " + mChart.getXChartMax() + ", ymin: " + mChart.getYChartMin() + ", ymax: " + mChart.getYChartMax());
450450
}
451451

‎MPChartExample/src/com/xxmassdeveloper/mpchartexample/LineChartActivity2.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -371,9 +371,9 @@ private void setData(int count, float range) {
371371
public void onValueSelected(Entry e, int dataSetIndex, Highlight h) {
372372
Log.i("Entry selected", e.toString());
373373

374-
mChart.centerViewToAnimated(e.getXIndex(), e.getVal(), mChart.getData().getDataSetByIndex(dataSetIndex).getAxisDependency(), 500);
375-
//mChart.zoomAndCenterAnimated(2.5f, 2.5f, e.getXIndex(), e.getVal(), mChart.getData().getDataSetByIndex(dataSetIndex).getAxisDependency(), 1000);
376-
//mChart.zoomAndCenterAnimated(1.8f, 1.8f, e.getXIndex(), e.getVal(), mChart.getData().getDataSetByIndex(dataSetIndex).getAxisDependency(), 1000);
374+
mChart.centerViewToAnimated(e.getX(), e.getY(), mChart.getData().getDataSetByIndex(dataSetIndex).getAxisDependency(), 500);
375+
//mChart.zoomAndCenterAnimated(2.5f, 2.5f, e.getX(), e.getY(), mChart.getData().getDataSetByIndex(dataSetIndex).getAxisDependency(), 1000);
376+
//mChart.zoomAndCenterAnimated(1.8f, 1.8f, e.getX(), e.getY(), mChart.getData().getDataSetByIndex(dataSetIndex).getAxisDependency(), 1000);
377377
}
378378

379379
@Override

0 commit comments

Comments
 (0)