Skip to content

Bugfix: reset state correctly when dropping a new image #17

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 2 commits into from
Oct 4, 2024
Merged

Bugfix: reset state correctly when dropping a new image #17

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
85a567d
Remove unused vars/comments
brunopicinin Sep 23, 2024
c55fc08
Reset state after loading new image
brunopicinin Sep 24, 2024
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
27 changes: 15 additions & 12 deletions script.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,13 @@ offScreenCanvas.width = canvas.width;
offScreenCanvas.height = canvas.height;

var img = new Image();
var rgb_color = "#FF00FF";
var rgb_color = color_choices[0];
var fill_color = 'rgba(0,0,0,0.35)';

var scaleFactor = 1;
var scaleSpeed = 0.01;

var points = [];
var regions = [];
var masterPoints = [];
var masterColors = [];

Expand All @@ -39,8 +38,14 @@ setDrawMode('polygon');
var constrainAngles = false;
var showNormalized = false;

var modeMessage = document.querySelector('#mode');
// var coords = document.querySelector('#coords');
function resetState() {
points = [];
masterPoints = [];
masterColors = [];
rgb_color = color_choices[0];
document.querySelector('#json').innerHTML = '';
document.querySelector('#python').innerHTML = '';
}

function blitCachedCanvas() {
mainCtx.clearRect(0, 0, canvas.width, canvas.height);
Expand Down Expand Up @@ -309,6 +314,10 @@ canvas.addEventListener('drop', function(e) {
}

img.onload = function() {
// reset state to initial values
resetState();

// draw loaded image on canvas
scaleFactor = 0.25;
canvas.style.width = img.width * scaleFactor + 'px';
canvas.style.height = img.height * scaleFactor + 'px';
Expand All @@ -320,8 +329,6 @@ canvas.addEventListener('drop', function(e) {
offScreenCtx.drawImage(img, 0, 0);
blitCachedCanvas();
};
// show coords
// document.getElementById('coords').style.display = 'inline-block';
});

function writePoints(parentPoints) {
Expand Down Expand Up @@ -508,16 +515,12 @@ document.querySelector('#discard-current').addEventListener('click', function(e)

function clearAll() {
highlightButtonInteraction('#clear')
resetState();
// reset main and offscreen canvases
mainCtx.clearRect(0, 0, canvas.width, canvas.height);
offScreenCtx.clearRect(0, 0, offScreenCanvas.width, offScreenCanvas.height);
mainCtx.drawImage(img, 0, 0);
offScreenCtx.drawImage(img, 0, 0);
points = [];
masterPoints = [];
masterColors = [];
rgb_color = color_choices[0];
document.querySelector('#json').innerHTML = '';
document.querySelector('#python').innerHTML = '';
}

document.querySelector('#clear').addEventListener('click', function(e) {
Expand Down