gudbjartur22/clinx02-androidpebble
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed missing axis labels on chart (drawing black on a black background..)

Browse Source
This commit is contained in:
Graham Jones
2016-05-10 22:12:02 +01:00
parent 33e77c51f9
commit 51db370411
1 changed files with 33 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
app/src/main/java/uk/org/openseizuredetector/MainActivity.java
View File

@@ -49,6 +49,7 @@ import android.widget.TextView;
import android.widget.Button; import android.widget.Button;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import java.text.DecimalFormat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Timer; import java.util.Timer;
import java.util.TimerTask; import java.util.TimerTask;
@@ -65,6 +66,8 @@ import com.github.mikephil.charting.data.Entry;
import com.github.mikephil.charting.data.LineData; import com.github.mikephil.charting.data.LineData;
import com.github.mikephil.charting.data.LineDataSet; import com.github.mikephil.charting.data.LineDataSet;
import com.github.mikephil.charting.utils.ColorTemplate; import com.github.mikephil.charting.utils.ColorTemplate;
import com.github.mikephil.charting.utils.LargeValueFormatter;
import com.github.mikephil.charting.utils.ValueFormatter;
public class MainActivity extends Activity { public class MainActivity extends Activity {
static final String TAG = "MainActivity"; static final String TAG = "MainActivity";
@@ -510,15 +513,15 @@ public class MainActivity extends Activity {
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// Produce graph // Produce graph
BarChart mChart = (BarChart) findViewById(R.id.chart1); BarChart mChart = (BarChart) findViewById(R.id.chart1);
mChart.setDescription("Simple Spectrum");
mChart.setDrawBarShadow(false); mChart.setDrawBarShadow(false);
mChart.setNoDataTextDescription("You need to provide data for the chart."); mChart.setNoDataTextDescription("You need to provide data for the chart.");
mChart.setDescription("");
// X and Y Values // X and Y Values
ArrayList<String> xVals = new ArrayList<String>(); ArrayList<String> xVals = new ArrayList<String>();
ArrayList<BarEntry> yBarVals = new ArrayList<BarEntry>(); ArrayList<BarEntry> yBarVals = new ArrayList<BarEntry>();
for (int i = 0; i < 10; i++) { for (int i = 0; i < 10; i++) {
xVals.add("x "+i+" Hz"); xVals.add(i+"-"+(i+1)+" Hz");
if (mConnection.mSdServer != null) { if (mConnection.mSdServer != null) {
yBarVals.add(new BarEntry(mConnection.mSdServer.mSdData.simpleSpec[i], i)); yBarVals.add(new BarEntry(mConnection.mSdServer.mSdData.simpleSpec[i], i));
} }
@@ -526,8 +529,6 @@ public class MainActivity extends Activity {
yBarVals.add(new BarEntry(i,i)); yBarVals.add(new BarEntry(i,i));
} }
} }
//for (int i = 0;i<10;i++)
// Log.v(TAG,"x="+xVals.get(i)+" y="+yBarVals.get(i));
// create a dataset and give it a type // create a dataset and give it a type
BarDataSet barDataSet = new BarDataSet(yBarVals,"Spectrum"); BarDataSet barDataSet = new BarDataSet(yBarVals,"Spectrum");
@@ -547,29 +548,50 @@ public class MainActivity extends Activity {
} }
barDataSet.setBarSpacePercent(20f); barDataSet.setBarSpacePercent(20f);
barDataSet.setBarShadowColor(Color.WHITE); barDataSet.setBarShadowColor(Color.WHITE);
//ArrayList<BarDataSet> barDataSets = new ArrayList<BarDataSet>();
//barDataSets.add(barDataSet);
BarData barData = new BarData(xVals,barDataSet); BarData barData = new BarData(xVals,barDataSet);
barData.setValueFormatter(new ValueFormatter() {
@Override
public String getFormattedValue(float v) {
DecimalFormat format = new DecimalFormat("####");
return format.format(v);
}
});
mChart.setData(barData); mChart.setData(barData);
// format the axes
XAxis xAxis = mChart.getXAxis(); XAxis xAxis = mChart.getXAxis();
xAxis.setPosition(XAxis.XAxisPosition.BOTTOM); xAxis.setPosition(XAxis.XAxisPosition.BOTTOM);
xAxis.setTextSize(30f); xAxis.setTextSize(10f);
xAxis.setDrawAxisLine(true); xAxis.setDrawAxisLine(true);
xAxis.setDrawLabels(true); xAxis.setDrawLabels(true);
xAxis.setEnabled(true); // Note: the default text colour is BLACK, so does not show up on black background!!!
// This took a lot of finding....
xAxis.setTextColor(Color.WHITE);
xAxis.setDrawGridLines(false); xAxis.setDrawGridLines(false);
YAxis yAxis = mChart.getAxisLeft(); YAxis yAxis = mChart.getAxisLeft();
yAxis.setAxisMinValue(0f); yAxis.setAxisMinValue(0f);
yAxis.setAxisMaxValue(3000f); yAxis.setAxisMaxValue(3000f);
yAxis.setDrawGridLines(true); yAxis.setDrawGridLines(true);
yAxis.setDrawLabels(true);
yAxis.setTextColor(Color.WHITE);
yAxis.setValueFormatter(new ValueFormatter() {
@Override
public String getFormattedValue(float v) {
DecimalFormat format = new DecimalFormat("#####");
return format.format(v);
}
});
YAxis yAxis2 = mChart.getAxisRight(); YAxis yAxis2 = mChart.getAxisRight();
yAxis2.setDrawGridLines(false); yAxis2.setDrawGridLines(false);
//data.setValueTextSize(10f); try {
//mChart.setData(data); mChart.getLegend().setEnabled(false);
} catch (NullPointerException e) {
Log.v(TAG,"Null Pointer Exception setting legend");
}
mChart.invalidate(); mChart.invalidate();
} }
}; };