Skip to content
Snippets Groups Projects
Commit 246a59fd authored by Ossi Laine's avatar Ossi Laine
Browse files

Set mouse pointer to crosshair on canvas

parent 9ec0c142
No related branches found
No related tags found
No related merge requests found
......@@ -22,4 +22,6 @@ body {
.clear-button {
margin:10px;
}
\ No newline at end of file
}
.crosshair {cursor: crosshair;}
\ No newline at end of file
......@@ -6,6 +6,7 @@ $(document).ready(function() {
try {
var canvas = $("#embody-canvas")
var canvasInfo = $(".canvas-info")
var context = document.getElementById("embody-canvas").getContext("2d");
var img = document.getElementById("baseImage");
......@@ -43,9 +44,10 @@ $(document).ready(function() {
// TODO: if mousedown -> can draw outside of image
var mouseX = e.pageX - this.offsetLeft;
var mouseY = e.pageY - this.offsetTop;
if(paint && pointInsideBaseImage([mouseX, mouseY])){
addClick(mouseX, mouseY, true);
redraw();
if (paint && pointInsideBaseImage([mouseX, mouseY])){
addClick(mouseX, mouseY, true);
redraw();
}
});
......@@ -57,11 +59,12 @@ $(document).ready(function() {
paint = false;
});
// TODO: changing drawradius doesnt affect to the saved datapoints !!!
// Bigger brush should make more datapoints compared to smaller ones.
// add brush size to click arry -> {x:[...], y:[...], size:[...]} ??
$(".canvas-container").bind('DOMMouseScroll', changeBrushSize)
$("#embody-canvas").bind('DOMMouseScroll', changeBrushSize)
// DOMMouseScroll is only for firefox
//$(".canvas-container").bind('wheel', changeBrushSize)
......@@ -81,11 +84,11 @@ $(document).ready(function() {
// Show brush size to user
if (drawRadius == 10) {
this.firstElementChild.innerHTML = "small brush"
canvasInfo.html("small brush")
} else if (drawRadius == 15) {
this.firstElementChild.innerHTML = "normal brush"
canvasInfo.html("normal brush")
} else if (drawRadius == 20) {
this.firstElementChild.innerHTML = "large brush"
canvasInfo.html("large brush")
}
}
......@@ -123,7 +126,7 @@ $(document).ready(function() {
startG = imageData.data[1];
startB = imageData.data[2];
return (isWhite(startB) && isWhite(startG) && isWhite(startR)) ? true : false;
return (isWhite(startB) && isWhite(startG) && isWhite(startR)) ? false : true;
}
function redraw() {
......
......@@ -100,7 +100,7 @@
<div class="canvas-container">
<span class="canvas-info"></span>
<canvas id="embody-canvas" width="20" height="20" style="border: 1px solid blue;" ></canvas>
<canvas id="embody-canvas" class="crosshair" width="20" height="20" style="border: 1px solid blue;" ></canvas>
</div>
<img id="baseImage" class="" src={{ url_for('static', filename='img/dummy_600.png') }} />
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment