TheCloud/Digital
1
0
Fork 0
mirror of https://github.com/hneemann/Digital.git synced 2025-09-19 01:44:44 -04:00
Code Issues Packages Projects Releases Wiki Activity

improved drawing of the left most values in the chronograph

Browse Source
This commit is contained in:
hneemann 2018-07-09 19:58:58 +02:00
parent a829d58332
commit 93bc2dd851
1 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/main/java/de/neemann/digital/data/DataPlotter.java
View File

@ -67,7 +67,7 @@ public class DataPlotter implements Drawable {
size *= f; size *= f;
if (size < Style.NORMAL.getThickness()) size = Style.NORMAL.getThickness(); if (size < Style.NORMAL.getThickness()) size = Style.NORMAL.getThickness();
if (size > SIZE * 4) size = SIZE * 4; if (size > SIZE * 6) size = SIZE * 6;
offset = (int) (p * size - xPos + getTextBorder()); offset = (int) (p * size - xPos + getTextBorder());
@ -132,11 +132,14 @@ public class DataPlotter implements Drawable {
boolean first = true; boolean first = true;
double pos = 0; double pos = 0;
for (Value[] s : data) { for (Value[] s : data) {
int xx = (int) (pos + textWidth - offset); int x1 = (int) (pos + textWidth - offset);
int x2 = (int) (pos + textWidth - offset + size);
if (xx >= textWidth) { if (x2 > textWidth) {
if (x1 < textWidth)
x1 = textWidth;
g.drawLine(new Vector(xx, BORDER - SEP2), new Vector(xx, (SIZE + SEP) * signals + BORDER - SEP2), Style.DASH); g.drawLine(new Vector(x1, BORDER - SEP2), new Vector(x1, (SIZE + SEP) * signals + BORDER - SEP2), Style.DASH);
y = BORDER; y = BORDER;
for (int i = 0; i < signals; i++) { for (int i = 0; i < signals; i++) {
Style style; Style style;
@ -164,31 +167,31 @@ public class DataPlotter implements Drawable {
final String text = IntFormat.toShortHex(value); final String text = IntFormat.toShortHex(value);
last[i].textWidth = text.length() * SIZE / 2; last[i].textWidth = text.length() * SIZE / 2;
if (value < width / 2) if (value < width / 2)
g.drawText(new Vector(xx + 1, y - SEP2 + 1), new Vector(xx + 2, y - SEP2 + 1), text, Orientation.LEFTTOP, Style.SHAPE_PIN); g.drawText(new Vector(x1 + 1, y - SEP2 + 1), new Vector(x1 + 2, y - SEP2 + 1), text, Orientation.LEFTTOP, Style.SHAPE_PIN);
else else
g.drawText(new Vector(xx + 1, y + SIZE + SEP2 - 1), new Vector(xx + 2, y + SIZE + SEP2 - 1), text, Orientation.LEFTBOTTOM, Style.SHAPE_PIN); g.drawText(new Vector(x1 + 1, y + SIZE + SEP2 - 1), new Vector(x1 + 2, y + SIZE + SEP2 - 1), text, Orientation.LEFTBOTTOM, Style.SHAPE_PIN);
last[i].hasChanged = false; last[i].hasChanged = false;
} }
if (!s[i].getType().equals(Value.Type.HIGHZ)) if (!s[i].getType().equals(Value.Type.HIGHZ))
g.drawLine(new Vector(xx, y + ry), new Vector((int) (xx + size), y + ry), style); g.drawLine(new Vector(x1, y + ry), new Vector((int) (x2), y + ry), style);
if (!first && ry != last[i].y) if (!first && ry != last[i].y)
g.drawLine(new Vector(xx, y + last[i].y), new Vector(xx, y + ry), style); g.drawLine(new Vector(x1, y + last[i].y), new Vector(x1, y + ry), style);
if (!first && value != last[i].value && Math.abs(ry - last[i].y) < SEP2) if (!first && value != last[i].value && Math.abs(ry - last[i].y) < SEP2)
g.drawLine(new Vector(xx, y + ry - SEP2), new Vector(xx, y + ry + SEP2), Style.NORMAL); g.drawLine(new Vector(x1, y + ry - SEP2), new Vector(x1, y + ry + SEP2), Style.NORMAL);
last[i].y = ry; last[i].y = ry;
last[i].value = value; last[i].value = value;
last[i].decTextWidth(size); last[i].decTextWidth(x2 - x1);
y += SIZE + SEP; y += SIZE + SEP;
} }
first = false; first = false;
} }
if (width > 0 && xx > width) if (width > 0 && x1 > width)
break; break;
pos += size; pos += size;
@ -217,7 +220,7 @@ public class DataPlotter implements Drawable {
@Override @Override
public void run() { public void run() {
r = DataPlotter.this.getTextBorder() + (int) (dataOriginal.getRows() * size); r = DataPlotter.this.getTextBorder() + (int) ((dataOriginal.getRows() + 1) * size);
} }
}).r; }).r;
} }
@ -248,7 +251,7 @@ public class DataPlotter implements Drawable {
private int textWidth; private int textWidth;
private boolean hasChanged = true; private boolean hasChanged = true;
private void decTextWidth(double size) { private void decTextWidth(int size) {
if (textWidth > 0) { if (textWidth > 0) {
textWidth -= size; textWidth -= size;
if (textWidth < 0) if (textWidth < 0)