Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Better x-axis labeling #2539

Merged
merged 4 commits into from
Dec 8, 2020
Merged

Better x-axis labeling #2539

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
da76868
Updated X-labels to be more informative and added collected Raster me…
terrylucas Dec 8, 2020
151ae4d
Used constant names instead of #s.
terrylucas Dec 8, 2020
48844f2
Incorporated PR suggestions.
terrylucas Dec 8, 2020
3ffbfd2
PR Suggestion.
terrylucas Dec 8, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
112 changes: 26 additions & 86 deletions packages/devtools_app/lib/src/charts/chart.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,11 +164,6 @@ class ChartPainter extends CustomPainter {
},
);

/// Number of minor ticks between major ticks.
const tickMarkInterval = 4;

int tickIndex = 0;

/// Key is trace index and value is x,y point.
final previousTracesData = <int, Point>{};

Expand All @@ -188,29 +183,9 @@ class ChartPainter extends CustomPainter {

int xTickIndex = chartController.timestampsLength;
while (--xTickIndex >= 0) {
// Hide left-side label when its ticks scrolls out.
final leftTimestamp = chartController.leftLabelTimestamp;
if (endVisibleIndex >= 0 &&
leftTimestamp != null &&
leftTimestamp < chartController.timestamps[endVisibleIndex]) {
chartController.leftLabelTimestamp = null;
}

// Make sure duration label has been computed.
chartController.computeDurationLabel();

final currentTimestamp = chartController.timestamps[xTickIndex];
final xLabelIndex =
chartController.getLabeledIndexByTimestamp(currentTimestamp);

if (xTickIndex < endVisibleIndex) {
// Has left label has slid out of visible range?
if (xLabelIndex == leftLabelIndex) {
// Yes, slide other labels left.
chartController.slideLabelsLeft();
chartController.rightLabelTimestamp = currentTimestamp;
}

// Once outside of visible range of data skip the rest of the collected data.
break;
}
Expand Down Expand Up @@ -315,79 +290,44 @@ class ChartPainter extends CustomPainter {

// Undo the clipRect at beginning of for loop.
canvas.restore();

/////////////////////////////////////////////////////////////////////////
// Compute the ticks to label.
/////////////////////////////////////////////////////////////////////////

final minorTick = tickIndex++ < tickMarkInterval;

// Compute major tick labels
if (!minorTick) {
chartController.recomputeLabels(
timestamp: chartController.timestamps.last,
);
}

if (chartController.displayXAxis || chartController.displayXLabels)
// Y translation is below X-axis line.
drawTranslate(
canvas,
xTranslation,
chartController.zeroYPosition + 1,
(canvas) {
// Draw right-most tick label (first major tick).
drawXTick(
canvas,
currentTimestamp,
chartController.timestampXCanvasCoord(currentTimestamp),
axis,
shortTick: minorTick,
);
},
);

if (!minorTick) tickIndex = 0;
}

if (chartController.displayXAxis || chartController.displayXLabels)
chartController.computeChartArea();
chartController.buildLabelTimestamps();

if (chartController.displayXAxis || chartController.displayXLabels) {
// Y translation is below X-axis line.
drawTranslate(
canvas,
xTranslation,
chartController.zeroYPosition + 1,
(canvas) {
// Draw the major labels.
for (var labelIndex = 0;
labelIndex < chartController.getLabelsCount();
labelIndex++) {
final timestamp =
chartController.getLabelTimestampByIndex(labelIndex);
if (timestamp != null) {
final xCoord = chartController.timestampXCanvasCoord(timestamp);
drawXTick(canvas, timestamp, xCoord, axis, displayTime: true);
}
// Draw the X-axis labels.
for (var timestamp in chartController.labelTimestamps) {
final xCoord = chartController.timestampXCanvasCoord(timestamp);
drawXTick(canvas, timestamp, xCoord, axis, displayTime: true);
}
},
);

// X translation is left-most edge of chart widget.
drawTranslate(
canvas,
chartController.xCanvasChart,
yTranslation,
(canvas) {
// Rescale Y-axis to max visible Y range.
chartController.resetYMaxValue(visibleYMax);

// Draw Y-axis ticks and labels.
// TODO(terry): Optimization add a listener for Y-axis range changing
// only need to redraw Y-axis if the range changed.
if (chartController.displayYLabels) {
drawYTicks(canvas, chartController, axis);
}
},
);
// X translation is left-most edge of chart widget.
drawTranslate(
canvas,
chartController.xCanvasChart,
yTranslation,
(canvas) {
// Rescale Y-axis to max visible Y range.
chartController.resetYMaxValue(visibleYMax);

// Draw Y-axis ticks and labels.
// TODO(terry): Optimization add a listener for Y-axis range changing
// only need to redraw Y-axis if the range changed.
if (chartController.displayYLabels) {
drawYTicks(canvas, chartController, axis);
}
},
);
}

drawTitle(canvas, size, chartController.title);

Expand Down
Loading