mirror/openscale
1
0
Fork 0
mirror of https://github.com/oliexdev/openScale.git synced 2025-08-23 08:43:15 +02:00
Code Issues Releases Wiki Activity

Draw value text under linear gauge

Browse Source 
This way the value text don't collide with the limit text.

Also centered both limit bars and text and made the position
calculator take the min limit into account when calculating the
position.
This commit is contained in:
Erik Johansson
2017-11-21 00:34:43 +01:00
parent 40750a3b99
commit 25a9fdfccc
1 changed files with 56 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

94
android_app/app/src/main/java/com/health/openscale/gui/views/LinearGaugeView.java
View File

@@ -20,6 +20,8 @@ import android.graphics.Canvas;
import android.graphics.Color; import android.graphics.Color;
import android.graphics.Paint; import android.graphics.Paint;
import android.graphics.Path; import android.graphics.Path;
import android.graphics.Rect;
import android.graphics.RectF;
import android.util.AttributeSet; import android.util.AttributeSet;
import android.view.View; import android.view.View;
@@ -34,17 +36,12 @@ public class LinearGaugeView extends View {
public static final int COLOR_ORANGE = Color.parseColor("#FFBB33"); public static final int COLOR_ORANGE = Color.parseColor("#FFBB33");
public static final int COLOR_RED = Color.parseColor("#FF4444"); public static final int COLOR_RED = Color.parseColor("#FF4444");
private final float barHeight = 10; private static final float barHeight = 10;
private final float limitLineHeight = 20; private static final float textOffset = 10.0f;
private final float lineThickness = 5.0f; private RectF limitRect = new RectF(0, 0, barHeight / 2, barHeight * 2);
private final float textOffset = 10.0f;
private float firstPercent; // Pre-created rect to avoid creating many objects in onDraw
private float firstPos; private Rect bounds = new Rect();
private float secondPercent;
private float secondPos;
private float valuePercent;
private float valuePos;
private Paint rectPaintLow; private Paint rectPaintLow;
private Paint rectPaintNormal; private Paint rectPaintNormal;
@@ -101,62 +98,83 @@ public class LinearGaugeView extends View {
secondLimit = -1.0f; secondLimit = -1.0f;
} }
private float valueToPosition(float value) {
final float percent = (value - minValue) / (maxValue - minValue) * 100.0f;
return getWidth() / 100.0f * percent;
}
private void drawCenteredText(Canvas canvas, String text, float centerX, float y, Paint paint) {
textPaint.getTextBounds(text, 0, text.length(), bounds);
float x = Math.max(0.0f, centerX - bounds.width() / 2.0f);
x = Math.min(x, getWidth() - bounds.width());
canvas.drawText(text, x, y, paint);
}
@Override @Override
protected void onDraw(Canvas canvas) { protected void onDraw(Canvas canvas) {
super.onDraw(canvas); super.onDraw(canvas);
if (firstLimit < 0 && secondLimit < 0) { if (firstLimit < 0 && secondLimit < 0) {
float textY=getHeight() / 2.0f; float textX = getWidth() / 2.0f;
float textX=getWidth() / 2.0f; float textY = getHeight() / 2.0f;
canvas.drawText(getResources().getString(R.string.info_no_evaluation_available),textX,textY,infoTextPaint); canvas.drawText(getResources().getString(R.string.info_no_evaluation_available), textX, textY, infoTextPaint);
return; return;
} }
firstPercent = (firstLimit / maxValue) * 100.0f; final float firstPos = valueToPosition(firstLimit);
firstPos = (getWidth() / 100.0f) * firstPercent; final float secondPos = valueToPosition(secondLimit);
final float valuePos = valueToPosition(value);
secondPercent = (secondLimit / maxValue) * 100.0f;
secondPos = (getWidth() / 100.0f) * secondPercent;
valuePercent = (value / maxValue) * 100.0f;
valuePos = (getWidth() / 100.0f) * valuePercent;
// Bar // Bar
final float barTop = getHeight() / 2.0f - barHeight / 2.0f;
final float barBottom = barTop + barHeight;
if (firstLimit > 0) { if (firstLimit > 0) {
canvas.drawRect(0, (getHeight() / 2.0f) - (barHeight / 2.0f), firstPos, (getHeight() / 2.0f) + (barHeight / 2.0f), rectPaintLow); canvas.drawRect(0, barTop, firstPos, barBottom, rectPaintLow);
canvas.drawRect(firstPos, barTop, secondPos, barBottom, rectPaintNormal);
} else { } else {
canvas.drawRect(0, (getHeight() / 2.0f) - (barHeight / 2.0f), firstPos, (getHeight() / 2.0f) + (barHeight / 2.0f), rectPaintNormal); canvas.drawRect(0, barTop, secondPos, barBottom, rectPaintNormal);
} }
canvas.drawRect(firstPos, (getHeight() / 2.0f) - (barHeight / 2.0f), secondPos , (getHeight() / 2.0f) + (barHeight / 2.0f), rectPaintNormal); canvas.drawRect(secondPos, barTop, getWidth(), barBottom, rectPaintHigh);
canvas.drawRect(secondPos,(getHeight() / 2.0f) - (barHeight / 2.0f), getWidth() , (getHeight() / 2.0f) + (barHeight / 2.0f), rectPaintHigh);
// Limit Lines // Limit Lines
canvas.drawRect(0, (getHeight() / 2.0f) - (limitLineHeight / 2.0f), 0+lineThickness, (getHeight() / 2.0f) + (limitLineHeight / 2.0f), textPaint); limitRect.offsetTo(0, getHeight() / 2.0f - limitRect.height() / 2.0f);
canvas.drawRect(limitRect, textPaint);
if (firstLimit > 0) { if (firstLimit > 0) {
canvas.drawRect(firstPos, (getHeight() / 2.0f) - (limitLineHeight / 2.0f), firstPos + lineThickness, (getHeight() / 2.0f) + (limitLineHeight / 2.0f), textPaint); limitRect.offsetTo(firstPos - limitRect.width() / 2.0f, limitRect.top);
canvas.drawRect(limitRect, textPaint);
} }
canvas.drawRect(secondPos, (getHeight() / 2.0f) - (limitLineHeight / 2.0f), secondPos+lineThickness, (getHeight() / 2.0f) + (limitLineHeight / 2.0f), textPaint); limitRect.offsetTo(secondPos - limitRect.width() / 2.0f, limitRect.top);
canvas.drawRect(getWidth()-lineThickness, (getHeight() / 2.0f) - (limitLineHeight / 2.0f), getWidth(), (getHeight() / 2.0f) + (limitLineHeight / 2.0f), textPaint); canvas.drawRect(limitRect, textPaint);
limitRect.offsetTo(getWidth() - limitRect.width(), limitRect.top);
canvas.drawRect(limitRect, textPaint);
// Text // Text
canvas.drawText(Float.toString(minValue), 0.0f, (getHeight() / 2.0f) - (barHeight / 2.0f) - textOffset, textPaint); final float textY = barTop - textOffset;
canvas.drawText(Float.toString(minValue), 0.0f, textY, textPaint);
if (firstLimit > 0) { if (firstLimit > 0) {
canvas.drawText(Float.toString(firstLimit), firstPos - 5.0f, (getHeight() / 2.0f) - (barHeight / 2.0f) - textOffset, textPaint); drawCenteredText(canvas, Float.toString(firstLimit), firstPos, textY, textPaint);
} }
canvas.drawText(Float.toString(secondLimit), secondPos-5.0f, (getHeight() / 2.0f) - (barHeight / 2.0f) - textOffset, textPaint); drawCenteredText(canvas, Float.toString(secondLimit), secondPos, textY, textPaint);
canvas.drawText(Float.toString(maxValue), getWidth()-40.0f, (getHeight() / 2.0f) - (barHeight / 2.0f)- textOffset, textPaint); drawCenteredText(canvas, Float.toString(maxValue), getWidth(), textY, textPaint);
// Indicator // Indicator
final float indicatorBottom = limitRect.bottom + 10.0f;
Path path = new Path(); Path path = new Path();
path.setFillType(Path.FillType.EVEN_ODD); path.setFillType(Path.FillType.EVEN_ODD);
path.moveTo(valuePos, (getHeight() / 2.0f) - 10.0f); path.moveTo(valuePos, barTop);
path.lineTo(valuePos + 10.0f, (getHeight() / 2.0f) + 20.0f); path.lineTo(valuePos + 10.0f, indicatorBottom);
path.lineTo(valuePos - 10.0f, (getHeight() / 2.0f) + 20.0f); path.lineTo(valuePos - 10.0f, indicatorBottom);
path.lineTo(valuePos, (getHeight() / 2.0f) - 10.0f); path.lineTo(valuePos, barTop);
path.close(); path.close();
canvas.drawPath(path, indicatorPaint); canvas.drawPath(path, indicatorPaint);
canvas.drawText(String.format("%.2f", value), valuePos-15.0f, (getHeight() / 2.0f) - (barHeight / 2.0f) - textOffset, indicatorPaint);
// Value text
String valueStr = String.format("%.2f", value);
indicatorPaint.getTextBounds(valueStr, 0, valueStr.length(), bounds);
drawCenteredText(canvas, valueStr, valuePos,
indicatorBottom + bounds.height() + textOffset, indicatorPaint);
} }
@Override @Override