patrick/Data
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FIX: Graph used wrong outerAlignment instead of inner

Browse Source
This commit is contained in:
Patrick Haßel 2025-05-05 15:54:35 +02:00
parent f5e9fd3679
commit 83d8dec332
6 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/angular/src/app/history/history.component.html
View File

@ -54,11 +54,11 @@
</div>
</app-tile>
<app-tile>
<app-tile *ngIf="alignment.inner">
<div tile-head>
Zisterne
</div>
<div tile-body>
<img width="100%" *ngIf="seriesService.cisternVolume.series" [src]="seriesService.graph(seriesService.cisternVolume.series, 600, 200, alignment, offset, alignment.inner,1)" [alt]="seriesService.cisternVolume.series.title">
<img width="100%" *ngIf="seriesService.cisternVolume.series" [src]="seriesService.graph(seriesService.cisternVolume.series, 600, 200, alignment, offset, alignment.inner, 1)" [alt]="seriesService.cisternVolume.series.title">
</div>
</app-tile>

13
src/main/java/de/ph87/data/series/graph/Graph.java
View File

@ -1,6 +1,7 @@
package de.ph87.data.series.graph;
import de.ph87.data.series.Aligned;
import de.ph87.data.series.Alignment;
import de.ph87.data.series.SeriesDto;
import de.ph87.data.series.SeriesType;
import de.ph87.data.value.Autoscale;
@ -24,6 +25,9 @@ public class Graph {
@NonNull
public final SeriesDto series;
@NonNull
public final Alignment innerAlignment;
@NonNull
public final Aligned begin;
@ -62,10 +66,11 @@ public class Graph {
public final int maxLabelWidth;
private final Autoscale autoscale;
public final Autoscale autoscale;
public Graph(@NonNull final SeriesDto series, @NonNull final List<GraphPoint> points, @NonNull final Aligned begin, @NonNull final Aligned end, final int width, final int height, final int border) {
public Graph(@NonNull final SeriesDto series, @NonNull final List<GraphPoint> points, @NonNull final Alignment innerAlignment, @NonNull final Aligned begin, @NonNull final Aligned end, final int width, final int height, final int border) {
this.series = series;
this.innerAlignment = innerAlignment;
this.begin = begin;
this.end = end;
this.width = width;
@ -102,7 +107,7 @@ public class Graph {
minuteMin = begin.date.toEpochSecond() / 60;
minuteMax = end.date.toEpochSecond() / 60;
minuteRange = minuteMax - minuteMin;
minuteScale = (double) widthInner / (minuteRange + begin.alignment.maxDuration.toMinutes());
minuteScale = (double) widthInner / (minuteRange + innerAlignment.maxDuration.toMinutes());
valueMin = vMin;
valueMax = vMax;
@ -132,7 +137,7 @@ public class Graph {
g.setColor(Color.WHITE);
if (series.type == SeriesType.METER) {
final int space = (int) (minuteScale * begin.alignment.maxDuration.toMinutes());
final int space = (int) (minuteScale * innerAlignment.maxDuration.toMinutes());
final int width = (int) (space * 0.95);
for (final Point point : points) {
g.fillRect(point.x + (space - width), 0, width, point.y);

1
src/main/java/de/ph87/data/series/graph/GraphController.java
View File

@ -29,6 +29,7 @@ public class GraphController {
final Alignment innerAlignment = Alignment.valueOf(innerAlignmentName);
final Aligned end = outerAlignment.align(ZonedDateTime.now()).plus(1).minus(offset);
final Aligned begin = end.minus(duration);
log.warn("Graph: outer={}, offset={}, duration={}, begin={}, end={}, inner={}", outerAlignment, offset, duration, begin.date.toLocalDateTime(), end.date.toLocalDateTime(), innerAlignment);
final Graph graph = graphService.getGraph(seriesId, innerAlignment, begin, end, width, height, 10);
final BufferedImage image = graph.draw();
response.setContentType("image/png");

2
src/main/java/de/ph87/data/series/graph/GraphService.java
View File

@ -31,7 +31,7 @@ public class GraphService {
case METER -> meterService.getPoints(series, innerAlignment, begin, end);
case VARYING -> varyingService.getPoints(series, innerAlignment, begin, end);
};
return new Graph(series, entries, begin, end, width, height, border);
return new Graph(series, entries, innerAlignment, begin, end, width, height, border);
}
}

4
src/main/java/de/ph87/data/series/meter/MeterService.java
View File

@ -80,8 +80,8 @@ public class MeterService {
}
@NonNull
public List<GraphPoint> getPoints(@NonNull final SeriesDto series, @NonNull final Alignment innerAlignment, @NonNull final Aligned begin, @NonNull final Aligned end) {
final List<? extends MeterValue> graphPoints = findRepository(innerAlignment).findAllByIdMeterSeriesIdAndIdDateGreaterThanEqualAndIdDateLessThanEqualOrderByIdDate(series.id, begin.date, end.date);
public List<GraphPoint> getPoints(@NonNull final SeriesDto series, @NonNull final Alignment alignment, @NonNull final Aligned begin, @NonNull final Aligned end) {
final List<? extends MeterValue> graphPoints = findRepository(alignment).findAllByIdMeterSeriesIdAndIdDateGreaterThanEqualAndIdDateLessThanEqualOrderByIdDate(series.id, begin.date, end.date);
final List<GraphPoint> points = graphPoints.stream().map(meterValue -> new GraphPoint(meterValue.getId().getDate(), meterValue.getMax() - meterValue.getMin())).collect(Collectors.toCollection(LinkedList::new));
for (int i = 0; i < points.size() - 1; i++) {
if (points.get(i).date.compareTo(points.get(i + 1).date) == 0) {

1
src/main/java/de/ph87/data/series/varying/VaryingService.java
View File

@ -73,6 +73,7 @@ public class VaryingService {
@NonNull
public List<GraphPoint> getPoints(@NonNull final SeriesDto series, @NonNull final Alignment innerAlignment, @NonNull final Aligned begin, @NonNull final Aligned end) {
log.info("getPoints: innerAlignment={}, begin={}, end={}", innerAlignment, begin, end);
return findRepository(innerAlignment)
.findAllByIdSeriesIdAndIdDateGreaterThanEqualAndIdDateLessThanEqual(series.id, begin.date, end.date)
.stream()