karol/OpenTracks
1
0
Fork 0
forked from upstream-mirrors/OpenTracks
Code Pull Requests Actions Releases 2 Activity

Minor chart fixes.

Browse Source
This commit is contained in:
Sandor Dornbush
2011-02-07 21:50:12 -08:00
parent 43e51848fc
commit eeaa363132
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MyTracks/src/com/google/android/apps/mytracks/ChartActivity.java
+1 -1
View File
@@ -610,7 +610,7 @@ public class ChartActivity extends Activity implements
*/ */
private ArrayList<double[]> readPointsToList(Track track) { private ArrayList<double[]> readPointsToList(Track track) {
Cursor cursor = null; Cursor cursor = null;
long lastLocationRead = track.getStartId(); long lastLocationRead = lastSeenLocationId;
int points = 0; int points = 0;
int chartSamplingFrequency = getSamplingFrequency(track); int chartSamplingFrequency = getSamplingFrequency(track);
ArrayList<double[]> result = new ArrayList<double[]>(); ArrayList<double[]> result = new ArrayList<double[]>();
MyTracks/src/com/google/android/apps/mytracks/ChartView.java
+8 -5
View File
@@ -216,7 +216,7 @@ public class ChartView extends View {
R.color.speed_fill, R.color.speed_fill,
R.color.speed_border, R.color.speed_border,
new ZoomSettings(MAX_INTERVALS, 0, Integer.MIN_VALUE, new ZoomSettings(MAX_INTERVALS, 0, Integer.MIN_VALUE,
new int[] {5, 10, 20, 50}), new int[] {1, 5, 10, 20, 50}),
R.string.speed); R.string.speed);
series[POWER_SERIES] = series[POWER_SERIES] =
new ChartValueSeries(context, new ChartValueSeries(context,
@@ -610,7 +610,8 @@ public class ChartView extends View {
c.translate(getScrollX(), 0); c.translate(getScrollX(), 0);
drawYAxis(c); drawYAxis(c);
final int spacer = 5; float density = getContext().getResources().getDisplayMetrics().density;
final int spacer = (int) (5 * density);
int x = leftBorder - spacer; int x = leftBorder - spacer;
for (ChartValueSeries cvs : series) { for (ChartValueSeries cvs : series) {
if (cvs.isEnabled() && cvs.hasData()) { if (cvs.isEnabled() && cvs.hasData()) {
@@ -726,9 +727,10 @@ public class ChartView extends View {
maxLength += cvs.getMaxLabelLength(); maxLength += cvs.getMaxLabelLength();
} }
} }
leftBorder = 4 + 8 * maxLength;
effectiveWidth = w - leftBorder - RIGHT_BORDER;
float density = getContext().getResources().getDisplayMetrics().density; float density = getContext().getResources().getDisplayMetrics().density;
// TODO: This should be function of the number of variables displayed.
leftBorder = (int) (density * (4 + 8 * maxLength));
effectiveWidth = w - leftBorder - RIGHT_BORDER;
bottomBorder = (int) (density * BOTTOM_BORDER); bottomBorder = (int) (density * BOTTOM_BORDER);
topBorder = (int) (density * TOP_BORDER); topBorder = (int) (density * TOP_BORDER);
effectiveHeight = h - topBorder - bottomBorder; effectiveHeight = h - topBorder - bottomBorder;
@@ -739,8 +741,9 @@ public class ChartView extends View {
} }
private int getY(ChartValueSeries cvs, double y) { private int getY(ChartValueSeries cvs, double y) {
int effectiveSpread = cvs.getInterval() * MAX_INTERVALS;
return topBorder + effectiveHeight return topBorder + effectiveHeight
- (int) ((y - cvs.getMin()) * effectiveHeight / cvs.getSpread()); - (int) ((y - cvs.getMin()) * effectiveHeight / effectiveSpread);
} }
private void drawXLabels(Canvas c) { private void drawXLabels(Canvas c) {