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

Fix spacing between x axis label and x axis marker.

Browse Source
This commit is contained in:
Jimmy Shih
2013-06-12 17:08:43 -07:00
parent 6cf06d9abe
commit 9d6ff995f7
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MyTracks/src/com/google/android/apps/mytracks/ChartView.java
+12 -6
View File
@@ -653,13 +653,14 @@ public class ChartView extends View {
canvas.drawLine(x, y, x + effectiveWidth, y, axisPaint); canvas.drawLine(x, y, x + effectiveWidth, y, axisPaint);
String label = getXAxisLabel(); String label = getXAxisLabel();
Rect rect = getRect(axisPaint, label); Rect rect = getRect(axisPaint, label);
canvas.drawText(label, x + effectiveWidth + spacer, y + ((int) rect.height() / 2), axisPaint); int yOffset = (int) rect.height() / 2;
canvas.drawText(label, x + effectiveWidth + spacer, y + yOffset, axisPaint);
double interval = getXAxisInterval(); double interval = getXAxisInterval();
ArrayList<Double> markerPositions = getXAxisMarkerPositions(interval); ArrayList<Double> markerPositions = getXAxisMarkerPositions(interval);
NumberFormat numberFormat = interval < 1 ? X_FRACTION_FORMAT : X_NUMBER_FORMAT; NumberFormat numberFormat = interval < 1 ? X_FRACTION_FORMAT : X_NUMBER_FORMAT;
for (int i = 0; i < markerPositions.size(); i++) { for (int i = 0; i < markerPositions.size(); i++) {
drawXAxisMarker(canvas, markerPositions.get(i), numberFormat); drawXAxisMarker(canvas, markerPositions.get(i), numberFormat, spacer + yOffset);
} }
} }
@@ -682,12 +683,14 @@ public class ChartView extends View {
* @param canvas * @param canvas
* @param value value * @param value value
* @param numberFormat the number format * @param numberFormat the number format
* @param spacing the spacing between x axis and marker
*/ */
private void drawXAxisMarker(Canvas canvas, double value, NumberFormat numberFormat) { private void drawXAxisMarker(
Canvas canvas, double value, NumberFormat numberFormat, int spacing) {
String marker = chartByDistance ? numberFormat.format(value) String marker = chartByDistance ? numberFormat.format(value)
: StringUtils.formatElapsedTime((long) value); : StringUtils.formatElapsedTime((long) value);
Rect rect = getRect(xAxisMarkerPaint, marker); Rect rect = getRect(xAxisMarkerPaint, marker);
canvas.drawText(marker, getX(value), topBorder + effectiveHeight + spacer + rect.height(), canvas.drawText(marker, getX(value), topBorder + effectiveHeight + spacing + rect.height(),
xAxisMarkerPaint); xAxisMarkerPaint);
} }
@@ -906,8 +909,11 @@ public class ChartView extends View {
leftBorder = (int) (density * BORDER + markerLength); leftBorder = (int) (density * BORDER + markerLength);
int[] titleDimensions = getTitleDimenions(); int[] titleDimensions = getTitleDimenions();
topBorder = (int) (density * BORDER + titleDimensions[0] * (titleDimensions[1] + spacer)); topBorder = (int) (density * BORDER + titleDimensions[0] * (titleDimensions[1] + spacer));
bottomBorder = (int) (density * BORDER + getRect(xAxisMarkerPaint, "1").height() + spacer); Rect xAxisLabelRect = getRect(axisPaint, getXAxisLabel());
rightBorder = (int) (density * BORDER + getRect(axisPaint, getXAxisLabel()).width() + spacer); // border + x axis marker + spacer + .5 x axis label
bottomBorder = (int) (density * BORDER + getRect(xAxisMarkerPaint, "1").height() + spacer
+ (int) (xAxisLabelRect.height() / 2));
rightBorder = (int) (density * BORDER + xAxisLabelRect.width() + spacer);
updateEffectiveDimensions(); updateEffectiveDimensions();
} }