<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[196556] trunk/Websites/perf.webkit.org</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/196556">196556</a></dd>
<dt>Author</dt> <dd>rniwa@webkit.org</dd>
<dt>Date</dt> <dd>2016-02-13 14:48:32 -0800 (Sat, 13 Feb 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>v3 UI sometimes shows same dates twice on the x-axis of time series charts
https://bugs.webkit.org/show_bug.cgi?id=154210
Reviewed by Chris Dumez.
The bug was caused by the label generation code in TimeSeriesChart.computeTimeGrid never emitting hours.
Use hours instead of dates as labels when the current time's date is same as the previous label's date.
Always include dates before entering this mode to avoid just having hours as labels on the entire x-axis.
* public/v3/components/time-series-chart.js:
(TimeSeriesChart.prototype._renderXAxis): Slightly increase the "average" width of x-axis label.
(TimeSeriesChart.computeTimeGrid): See above. Also assert that the number of labels we generate never
exceeds maxLabels as a sanity check.
(TimeSeriesChart._timeIterators): Added an iterator that increments by two hours for zoomed graphs.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkWebsitesperfwebkitorgChangeLog">trunk/Websites/perf.webkit.org/ChangeLog</a></li>
<li><a href="#trunkWebsitesperfwebkitorgpublicv3componentstimeserieschartjs">trunk/Websites/perf.webkit.org/public/v3/components/time-series-chart.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkWebsitesperfwebkitorgChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Websites/perf.webkit.org/ChangeLog (196555 => 196556)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Websites/perf.webkit.org/ChangeLog 2016-02-13 22:45:34 UTC (rev 196555)
+++ trunk/Websites/perf.webkit.org/ChangeLog 2016-02-13 22:48:32 UTC (rev 196556)
</span><span class="lines">@@ -1,5 +1,23 @@
</span><span class="cx"> 2016-02-13 Ryosuke Niwa <rniwa@webkit.org>
</span><span class="cx">
</span><ins>+ v3 UI sometimes shows same dates twice on the x-axis of time series charts
+ https://bugs.webkit.org/show_bug.cgi?id=154210
+
+ Reviewed by Chris Dumez.
+
+ The bug was caused by the label generation code in TimeSeriesChart.computeTimeGrid never emitting hours.
+
+ Use hours instead of dates as labels when the current time's date is same as the previous label's date.
+ Always include dates before entering this mode to avoid just having hours as labels on the entire x-axis.
+
+ * public/v3/components/time-series-chart.js:
+ (TimeSeriesChart.prototype._renderXAxis): Slightly increase the "average" width of x-axis label.
+ (TimeSeriesChart.computeTimeGrid): See above. Also assert that the number of labels we generate never
+ exceeds maxLabels as a sanity check.
+ (TimeSeriesChart._timeIterators): Added an iterator that increments by two hours for zoomed graphs.
+
+2016-02-13 Ryosuke Niwa <rniwa@webkit.org>
+
</ins><span class="cx"> v3 UI should show status and associated bugs on analysis task pages
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=154212
</span><span class="cx">
</span></span></pre></div>
<a id="trunkWebsitesperfwebkitorgpublicv3componentstimeserieschartjs"></a>
<div class="modfile"><h4>Modified: trunk/Websites/perf.webkit.org/public/v3/components/time-series-chart.js (196555 => 196556)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Websites/perf.webkit.org/public/v3/components/time-series-chart.js 2016-02-13 22:45:34 UTC (rev 196555)
+++ trunk/Websites/perf.webkit.org/public/v3/components/time-series-chart.js 2016-02-13 22:48:32 UTC (rev 196556)
</span><span class="lines">@@ -283,7 +283,7 @@
</span><span class="cx">
</span><span class="cx"> _renderXAxis(context, metrics, startTime, endTime)
</span><span class="cx"> {
</span><del>- var typicalWidth = context.measureText('12/31').width;
</del><ins>+ var typicalWidth = context.measureText('12/31 x').width;
</ins><span class="cx"> var maxXAxisLabels = Math.floor(metrics.chartWidth / typicalWidth);
</span><span class="cx"> var xAxisGrid = TimeSeriesChart.computeTimeGrid(startTime, endTime, maxXAxisLabels);
</span><span class="cx">
</span><span class="lines">@@ -578,11 +578,33 @@
</span><span class="cx">
</span><span class="cx"> var result = [];
</span><span class="cx">
</span><ins>+ var previousDate = null;
+ var previousHour = null;
</ins><span class="cx"> while (currentTime <= max) {
</span><del>- var label = (currentTime.getUTCMonth() + 1) + '/' + currentTime.getUTCDate();
- result.push({time: new Date(currentTime), label: label});
</del><ins>+ var time = new Date(currentTime);
+ var month = (time.getUTCMonth() + 1);
+ var date = time.getUTCDate();
+ var hour = time.getUTCHours();
+ var hourLabel = (hour > 12 ? hour - 12 : hour) + (hour >= 12 ? 'PM' : 'AM');
+
</ins><span class="cx"> iterator.next(currentTime);
</span><ins>+
+ var label;
+ if (date == previousDate)
+ label = hourLabel;
+ else {
+ label = `${month}/${date}`;
+ if (hour && currentTime.getUTCDate() != date)
+ label += ' ' + hourLabel;
+ }
+
+ result.push({time: time, label: label});
+
+ previousDate = date;
+ previousHour = hour;
</ins><span class="cx"> }
</span><ins>+
+ console.assert(result.length <= maxLabels);
</ins><span class="cx">
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="lines">@@ -593,6 +615,16 @@
</span><span class="cx"> var DAY = 24 * HOUR;
</span><span class="cx"> return [
</span><span class="cx"> {
</span><ins>+ diff: 2 * HOUR,
+ next: function (date) {
+ if (date.getUTCHours() >= 22) {
+ date.setUTCHours(0);
+ date.setUTCDate(date.getUTCDate() + 1);
+ } else
+ date.setUTCHours(Math.floor(date.getUTCHours() / 2) * 2 + 2);
+ },
+ },
+ {
</ins><span class="cx"> diff: 12 * HOUR,
</span><span class="cx"> next: function (date) {
</span><span class="cx"> if (date.getUTCHours() >= 12) {
</span></span></pre>
</div>
</div>
</body>
</html>