Skip to content

Commit

Permalink
Remove chart.setHighlightEnabled(...) method because it led to confus…
Browse files Browse the repository at this point in the history 
…ions when no data was set (issue PhilJay#1110).
  • Loading branch information
@PhilJay
PhilJay committed Oct 15, 2015
1 parent 7b27f47 commit c915075
Show file tree
Hide file tree
Showing 24 changed files with 92 additions and 164 deletions.
10 changes: 5 additions & 5 deletions MPChartExample/src/com/xxmassdeveloper/mpchartexample/AnotherBarActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,11 +104,11 @@ public boolean onOptionsItemSelected(MenuItem item) {
break;
}
case R.id.actionToggleHighlight: {
if (mChart.isHighlightEnabled())
mChart.setHighlightEnabled(false);
else
mChart.setHighlightEnabled(true);
mChart.invalidate();

if(mChart.getData() != null) {
mChart.getData().setHighlightEnabled(!mChart.getData().isHighlightEnabled());
mChart.invalidate();
}
break;
}
case R.id.actionTogglePinch: {
Expand Down
14 changes: 4 additions & 10 deletions MPChartExample/src/com/xxmassdeveloper/mpchartexample/BarChartActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,11 +76,6 @@ protected void onCreate(Bundle savedInstanceState) {
// scaling can now only be done on x- and y-axis separately
mChart.setPinchZoom(false);

// draw shadows for each bar that show the maximum value
// mChart.setDrawBarShadow(true);

// mChart.setDrawXLabels(false);

mChart.setDrawGridBackground(false);
// mChart.setDrawYLabels(false);

Expand Down Expand Up @@ -149,11 +144,10 @@ public boolean onOptionsItemSelected(MenuItem item) {
break;
}
case R.id.actionToggleHighlight: {
if (mChart.isHighlightEnabled())
mChart.setHighlightEnabled(false);
else
mChart.setHighlightEnabled(true);
mChart.invalidate();
if(mChart.getData() != null) {
mChart.getData().setHighlightEnabled(!mChart.getData().isHighlightEnabled());
mChart.invalidate();
}
break;
}
case R.id.actionTogglePinch: {
Expand Down
9 changes: 4 additions & 5 deletions MPChartExample/src/com/xxmassdeveloper/mpchartexample/BarChartActivityMultiDataset.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -135,11 +135,10 @@ public boolean onOptionsItemSelected(MenuItem item) {
break;
}
case R.id.actionToggleHighlight: {
if (mChart.isHighlightEnabled())
mChart.setHighlightEnabled(false);
else
mChart.setHighlightEnabled(true);
mChart.invalidate();
if(mChart.getData() != null) {
mChart.getData().setHighlightEnabled(!mChart.getData().isHighlightEnabled());
mChart.invalidate();
}
break;
}
case R.id.actionToggleHighlightArrow: {
Expand Down
9 changes: 4 additions & 5 deletions MPChartExample/src/com/xxmassdeveloper/mpchartexample/BarChartActivitySinus.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -130,11 +130,10 @@ public boolean onOptionsItemSelected(MenuItem item) {
break;
}
case R.id.actionToggleHighlight: {
if (mChart.isHighlightEnabled())
mChart.setHighlightEnabled(false);
else
mChart.setHighlightEnabled(true);
mChart.invalidate();
if(mChart.getData() != null) {
mChart.getData().setHighlightEnabled(!mChart.getData().isHighlightEnabled());
mChart.invalidate();
}
break;
}
case R.id.actionTogglePinch: {
Expand Down
10 changes: 4 additions & 6 deletions MPChartExample/src/com/xxmassdeveloper/mpchartexample/BubbleChartActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@ protected void onCreate(Bundle savedInstanceState) {
mChart.setDrawGridBackground(false);

mChart.setTouchEnabled(true);
mChart.setHighlightEnabled(true);

// enable scaling and dragging
mChart.setDragEnabled(true);
Expand Down Expand Up @@ -116,11 +115,10 @@ public boolean onOptionsItemSelected(MenuItem item) {
break;
}
case R.id.actionToggleHighlight: {
if (mChart.isHighlightEnabled())
mChart.setHighlightEnabled(false);
else
mChart.setHighlightEnabled(true);
mChart.invalidate();
if(mChart.getData() != null) {
mChart.getData().setHighlightEnabled(!mChart.getData().isHighlightEnabled());
mChart.invalidate();
}
break;
}
case R.id.actionTogglePinch: {
Expand Down
9 changes: 4 additions & 5 deletions MPChartExample/src/com/xxmassdeveloper/mpchartexample/CandleStickChartActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,11 +101,10 @@ public boolean onOptionsItemSelected(MenuItem item) {

switch (item.getItemId()) {
case R.id.actionToggleHighlight: {
if (mChart.isHighlightEnabled())
mChart.setHighlightEnabled(false);
else
mChart.setHighlightEnabled(true);
mChart.invalidate();
if(mChart.getData() != null) {
mChart.getData().setHighlightEnabled(!mChart.getData().isHighlightEnabled());
mChart.invalidate();
}
break;
}
case R.id.actionTogglePinch: {
Expand Down
12 changes: 4 additions & 8 deletions MPChartExample/src/com/xxmassdeveloper/mpchartexample/CubicLineChartActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,6 @@ protected void onCreate(Bundle savedInstanceState) {
// no description text
mChart.setDescription("");

// enable value highlighting
mChart.setHighlightEnabled(true);

// enable touch gestures
mChart.setTouchEnabled(true);

Expand Down Expand Up @@ -122,11 +119,10 @@ public boolean onOptionsItemSelected(MenuItem item) {
break;
}
case R.id.actionToggleHighlight: {
if (mChart.isHighlightEnabled())
mChart.setHighlightEnabled(false);
else
mChart.setHighlightEnabled(true);
mChart.invalidate();
if(mChart.getData() != null) {
mChart.getData().setHighlightEnabled(!mChart.getData().isHighlightEnabled());
mChart.invalidate();
}
break;
}
case R.id.actionToggleFilled: {
Expand Down
17 changes: 4 additions & 13 deletions MPChartExample/src/com/xxmassdeveloper/mpchartexample/DrawChartActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,14 +47,6 @@ protected void onCreate(Bundle savedInstanceState) {
mChart.setOnChartValueSelectedListener(this);
mChart.setOnDrawListener(this);

// enable drawing with the finger
// mChart.setDrawingEnabled(true);

// mChart.setLineWidth(5f);
// mChart.setCircleSize(5f);

mChart.setHighlightEnabled(true);

// if disabled, drawn datasets with the finger will not be automatically
// finished
// mChart.setAutoFinish(true);
Expand Down Expand Up @@ -119,11 +111,10 @@ public boolean onOptionsItemSelected(MenuItem item) {
break;
}
case R.id.actionToggleHighlight: {
if (mChart.isHighlightEnabled())
mChart.setHighlightEnabled(false);
else
mChart.setHighlightEnabled(true);
mChart.invalidate();
if(mChart.getData() != null) {
mChart.getData().setHighlightEnabled(!mChart.getData().isHighlightEnabled());
mChart.invalidate();
}
break;
}
case R.id.actionToggleStartzero: {
Expand Down
9 changes: 4 additions & 5 deletions MPChartExample/src/com/xxmassdeveloper/mpchartexample/HorizontalBarChartActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -141,11 +141,10 @@ public boolean onOptionsItemSelected(MenuItem item) {
break;
}
case R.id.actionToggleHighlight: {
if (mChart.isHighlightEnabled())
mChart.setHighlightEnabled(false);
else
mChart.setHighlightEnabled(true);
mChart.invalidate();
if(mChart.getData() != null) {
mChart.getData().setHighlightEnabled(!mChart.getData().isHighlightEnabled());
mChart.invalidate();
}
break;
}
case R.id.actionTogglePinch: {
Expand Down
16 changes: 4 additions & 12 deletions MPChartExample/src/com/xxmassdeveloper/mpchartexample/InvertedLineChartActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,6 @@ protected void onCreate(Bundle savedInstanceState) {
// no description text
mChart.setDescription("");

// enable value highlighting
mChart.setHighlightEnabled(true);

// enable touch gestures
mChart.setTouchEnabled(true);

Expand All @@ -84,10 +81,6 @@ protected void onCreate(Bundle savedInstanceState) {

// set the marker to the chart
mChart.setMarkerView(mv);

// enable/disable highlight indicators (the lines that indicate the
// highlighted Entry)
mChart.setHighlightEnabled(false);

XAxis xl = mChart.getXAxis();
xl.setAvoidFirstLastClipping(true);
Expand Down Expand Up @@ -136,11 +129,10 @@ public boolean onOptionsItemSelected(MenuItem item) {
break;
}
case R.id.actionToggleHighlight: {
if (mChart.isHighlightEnabled())
mChart.setHighlightEnabled(false);
else
mChart.setHighlightEnabled(true);
mChart.invalidate();
if(mChart.getData() != null) {
mChart.getData().setHighlightEnabled(!mChart.getData().isHighlightEnabled());
mChart.invalidate();
}
break;
}
case R.id.actionToggleFilled: {
Expand Down
12 changes: 4 additions & 8 deletions MPChartExample/src/com/xxmassdeveloper/mpchartexample/LineChartActivity1.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,6 @@ protected void onCreate(Bundle savedInstanceState) {
mChart.setDescription("");
mChart.setNoDataTextDescription("You need to provide data for the chart.");

// enable value highlighting
mChart.setHighlightEnabled(true);

// enable touch gestures
mChart.setTouchEnabled(true);

Expand Down Expand Up @@ -186,11 +183,10 @@ public boolean onOptionsItemSelected(MenuItem item) {
break;
}
case R.id.actionToggleHighlight: {
if (mChart.isHighlightEnabled())
mChart.setHighlightEnabled(false);
else
mChart.setHighlightEnabled(true);
mChart.invalidate();
if(mChart.getData() != null) {
mChart.getData().setHighlightEnabled(!mChart.getData().isHighlightEnabled());
mChart.invalidate();
}
break;
}
case R.id.actionToggleFilled: {
Expand Down
12 changes: 4 additions & 8 deletions MPChartExample/src/com/xxmassdeveloper/mpchartexample/LineChartActivity2.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,6 @@ protected void onCreate(Bundle savedInstanceState) {
mChart.setDescription("");
mChart.setNoDataTextDescription("You need to provide data for the chart.");

// enable value highlighting
mChart.setHighlightEnabled(true);

// enable touch gestures
mChart.setTouchEnabled(true);

Expand Down Expand Up @@ -146,11 +143,10 @@ public boolean onOptionsItemSelected(MenuItem item) {
break;
}
case R.id.actionToggleHighlight: {
if (mChart.isHighlightEnabled())
mChart.setHighlightEnabled(false);
else
mChart.setHighlightEnabled(true);
mChart.invalidate();
if(mChart.getData() != null) {
mChart.getData().setHighlightEnabled(!mChart.getData().isHighlightEnabled());
mChart.invalidate();
}
break;
}
case R.id.actionToggleFilled: {
Expand Down
12 changes: 4 additions & 8 deletions MPChartExample/src/com/xxmassdeveloper/mpchartexample/MultiLineChartActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,6 @@ protected void onCreate(Bundle savedInstanceState) {
mChart.getXAxis().setDrawAxisLine(false);
mChart.getXAxis().setDrawGridLines(false);

// enable value highlighting
mChart.setHighlightEnabled(true);

// enable touch gestures
mChart.setTouchEnabled(true);

Expand Down Expand Up @@ -115,11 +112,10 @@ public boolean onOptionsItemSelected(MenuItem item) {
break;
}
case R.id.actionToggleHighlight: {
if (mChart.isHighlightEnabled())
mChart.setHighlightEnabled(false);
else
mChart.setHighlightEnabled(true);
mChart.invalidate();
if(mChart.getData() != null) {
mChart.getData().setHighlightEnabled(!mChart.getData().isHighlightEnabled());
mChart.invalidate();
}
break;
}
case R.id.actionToggleFilled: {
Expand Down
7 changes: 0 additions & 7 deletions MPChartExample/src/com/xxmassdeveloper/mpchartexample/PerformanceLineChart.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,6 @@ protected void onCreate(Bundle savedInstanceState) {
mChart.setDescription("");
mChart.setNoDataTextDescription("You need to provide data for the chart.");

// disable value highlighting
mChart.setHighlightEnabled(false);

// enable touch gestures
mChart.setTouchEnabled(true);

Expand All @@ -57,10 +54,6 @@ protected void onCreate(Bundle savedInstanceState) {

// if disabled, scaling can be done on x- and y-axis separately
mChart.setPinchZoom(false);

// enable/disable highlight indicators (the lines that indicate the
// highlighted Entry)
mChart.setHighlightEnabled(false);

mChart.getAxisLeft().setDrawGridLines(false);
mChart.getAxisRight().setEnabled(false);
Expand Down
9 changes: 4 additions & 5 deletions MPChartExample/src/com/xxmassdeveloper/mpchartexample/RadarChartActivitry.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,11 +90,10 @@ public boolean onOptionsItemSelected(MenuItem item) {
break;
}
case R.id.actionToggleHighlight: {
if (mChart.isHighlightEnabled())
mChart.setHighlightEnabled(false);
else
mChart.setHighlightEnabled(true);
mChart.invalidate();
if(mChart.getData() != null) {
mChart.getData().setHighlightEnabled(!mChart.getData().isHighlightEnabled());
mChart.invalidate();
}
break;
}
case R.id.actionToggleRotate: {
Expand Down
3 changes: 0 additions & 3 deletions MPChartExample/src/com/xxmassdeveloper/mpchartexample/RealtimeLineChartActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,6 @@ protected void onCreate(Bundle savedInstanceState) {
mChart.setDescription("");
mChart.setNoDataTextDescription("You need to provide data for the chart.");

// enable value highlighting
mChart.setHighlightEnabled(true);

// enable touch gestures
mChart.setTouchEnabled(true);

Expand Down
10 changes: 4 additions & 6 deletions MPChartExample/src/com/xxmassdeveloper/mpchartexample/ScatterChartActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@ protected void onCreate(Bundle savedInstanceState) {
mChart.setDrawGridBackground(false);

mChart.setTouchEnabled(true);
mChart.setHighlightEnabled(true);

// enable scaling and dragging
mChart.setDragEnabled(true);
Expand Down Expand Up @@ -109,11 +108,10 @@ public boolean onOptionsItemSelected(MenuItem item) {
break;
}
case R.id.actionToggleHighlight: {
if (mChart.isHighlightEnabled())
mChart.setHighlightEnabled(false);
else
mChart.setHighlightEnabled(true);
mChart.invalidate();
if(mChart.getData() != null) {
mChart.getData().setHighlightEnabled(!mChart.getData().isHighlightEnabled());
mChart.invalidate();
}
break;
}
case R.id.actionTogglePinch: {
Expand Down
9 changes: 4 additions & 5 deletions MPChartExample/src/com/xxmassdeveloper/mpchartexample/StackedBarActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,11 +112,10 @@ public boolean onOptionsItemSelected(MenuItem item) {
break;
}
case R.id.actionToggleHighlight: {
if (mChart.isHighlightEnabled())
mChart.setHighlightEnabled(false);
else
mChart.setHighlightEnabled(true);
mChart.invalidate();
if(mChart.getData() != null) {
mChart.getData().setHighlightEnabled(!mChart.getData().isHighlightEnabled());
mChart.invalidate();
}
break;
}
case R.id.actionTogglePinch: {
Expand Down
Loading

0 comments on commit c915075

Please sign in to comment.