Skip to content

devtools: Show diff image first #414

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

Merged
merged 3 commits into from
May 24, 2016
Merged

devtools: Show diff image first #414

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1f5c827
devtools: Show diff image first
n-riesco Apr 11, 2016
c5a8d53
devtools: add image tooltip and toggle button
n-riesco May 20, 2016
3b315cb
Merge branch 'master' into PR #414
n-riesco May 21, 2016
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
3 changes: 2 additions & 1 deletion devtools/image_viewer/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@
</head>
<body>
<div id="plot-list" style="overflow:auto; height:100px;"></div>
<div id="plot-toggles"></div>
<div id="plot-images"></div>
<div id="plot-mock"></div>
<pre id="plot-mock"></pre>

<script type="text/javascript" src="../../build/image_viewer-bundle.js"></script>
</body>
Expand Down
75 changes: 55 additions & 20 deletions devtools/image_viewer/viewer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,22 @@ var path = require('path');
var d3 = require('d3');

var $plotlist = document.getElementById('plot-list'),
$toggles = document.getElementById('plot-toggles'),
$images = document.getElementById('plot-images'),
$mock = document.getElementById('plot-mock');
$mock = document.getElementById('plot-mock'),
$toggleBaseline = document.createElement('button'),
$toggleTest = document.createElement('button'),
$toggleDiff = document.createElement('button'),
$imgBaseline = document.createElement('img'),
$imgTest = document.createElement('img'),
$imgDiff = document.createElement('img');

$toggles.style.display = 'none';
$images.style.display = 'none';

setupToggle($toggleBaseline, $imgBaseline, 'Baseline');
setupToggle($toggleTest, $imgTest, 'Test');
setupToggle($toggleDiff, $imgDiff, 'Diff');

var pathToRoot = path.join(__dirname, '../../'),
pathToImageTest = path.join(pathToRoot, 'test/image'),
Expand Down Expand Up @@ -33,37 +47,58 @@ imageNames.forEach(function(imageName) {
function createButton(imageName) {
var button = document.createElement('button');
button.style.cssFloat = 'left';
button.style.width = '100px';
button.style.height = '40px';
button.innerHTML = imageName;
button.style.padding = '0.5em';
button.style.border = '0';
button.style.margin = '1px';
button.style.cursor = 'pointer';

button.addEventListener('click', function() {
var imgBaseline = createImg(dirBaseline, imageName),
imgTest = createImg(dirTest, imageName),
imgDiff = createImg(dirDiff, 'diff-' + imageName);

d3.json(dirMocks + imageName + '.json', function(err, mock) {
$images.innerHTML = '';
$images.appendChild(imgBaseline);
$images.appendChild(imgTest);
$images.appendChild(imgDiff);
$toggles.style.display = 'block';

$mock.innerHTML = '';
$mock.appendChild(createJSONview(mock));
$images.style.display = 'block';
$imgBaseline.src = dirBaseline + imageName + '.png';
$imgTest.src = dirTest + imageName + '.png';
$imgDiff.src = dirDiff + 'diff-' + imageName + '.png';

$mock.innerHTML = JSON.stringify(mock, null, 2);
});
});

return button;
}

function createImg(dir, name) {
var img = new Image();
img.src = dir + name + '.png';
return img;
function setupToggle(toggle, img, title) {
img.title = title;
toggle.innerHTML = title;
toggle.style.padding = '0.5em';
toggle.style.border = '0';
toggle.style.margin = '1px';
toggle.style.cursor = 'pointer';

checkToggle(toggle, img);

toggle.addEventListener('click', function() {
if(toggle.value === 'checked') uncheckToggle(toggle, img);
else checkToggle(toggle, img);
});

$toggles.appendChild(toggle);
$images.appendChild(img);
}

function checkToggle(toggle, img) {
toggle.value = 'checked';
toggle.style.color = '#4c4c4c';
toggle.style.backgroundColor = '#f2f1f0';
img.style.display = 'inline';
}

function createJSONview(mock) {
var jsonView = document.createElement('pre');
jsonView.innerHTML = JSON.stringify(mock, null, 2);
return jsonView;
function uncheckToggle(toggle, img) {
toggle.value = 'unchecked';
toggle.style.color = '#f2f1f0';
toggle.style.backgroundColor = '#4c4c4c';
img.style.display = 'none';
}