new layout
This commit is contained in:
jomjol
2020-09-09 22:08:38 +02:00
parent 40953091d7
commit 14705d0601
4 changed files with 29 additions and 5 deletions

View File

@@ -31,7 +31,8 @@ A 3d-printable housing can be found here: https://www.thingiverse.com/thing:4571
##### Rolling - (2020-09-09) ##### Rolling - (2020-09-09)
* tbd * Update to new and modern layout (thanks to michaeljoos in iobroker-thread)
* incorporated "Take Picture" to make new reference image
* based on v1.1.3 (2020-09-09) * based on v1.1.3 (2020-09-09)

Binary file not shown.

View File

@@ -247,7 +247,9 @@ function ParseIni(_basepath) {
loadCanvas(basepath + "/fileserver/config/reference.jpg"); loadCanvas(basepath + "/fileserver/config/reference.jpg");
ParseIni(basepath); ParseIni(basepath);
drawImage(); drawImage();
draw();
} }
function drawImage(){ function drawImage(){
var canvas = document.getElementById('canvas'); var canvas = document.getElementById('canvas');
var context = canvas.getContext('2d'); var context = canvas.getContext('2d');

View File

@@ -21,6 +21,11 @@
<td> <td>
<table> <table>
<tr>
<td>
<input type="submit" id="take" onclick="doTake()" value="Make new raw image (raw.jpg)">
</td>
</tr>
<tr> <tr>
<td> <td>
Pre-rotate Angle Pre-rotate Angle
@@ -63,27 +68,43 @@
ctx = canvas.getContext('2d'), ctx = canvas.getContext('2d'),
imageObj = new Image() imageObj = new Image()
basepath = "http://192.168.178.26"; basepath = "http://192.168.178.26";
isActReference = false;
function doTake(){
var xhttp = new XMLHttpRequest();
url = basepath + "/editflow.html?task=test_take";
if (basepath.length > 0){
url = url + "&host=" + basepath;
}
xhttp.open("GET", url, false);
xhttp.send();
loadRawImage();
}
function loadRawImage(){ function loadRawImage(){
url = basepath + "/fileserver/img_tmp/raw.jpg"; url = basepath + "/fileserver/img_tmp/raw.jpg" + "?session=" + Math.floor((Math.random() * 1000000) + 1);
document.getElementById("finerotate").value = 0; document.getElementById("finerotate").value = 0;
document.getElementById("prerotateangle").value = getPreRotate(); document.getElementById("prerotateangle").value = getPreRotate();
document.getElementById("finerotate").disabled = false; document.getElementById("finerotate").disabled = false;
document.getElementById("prerotateangle").disabled = false; document.getElementById("prerotateangle").disabled = false;
document.getElementById("updatereferenceimage").disabled = false; document.getElementById("updatereferenceimage").disabled = false;
document.getElementById("take").disabled = false;
// document.getElementById("ButtonRotate").disabled = false; // document.getElementById("ButtonRotate").disabled = false;
isActReference = false;
loadCanvas(url); loadCanvas(url);
drawRotated(); drawRotated();
} }
function showReference(){ function showReference(){
url = basepath + "/fileserver/config/reference.jpg"; url = basepath + "/fileserver/config/reference.jpg" + "?session=" + Math.floor((Math.random() * 1000000) + 1);;
document.getElementById("finerotate").value = 0; document.getElementById("finerotate").value = 0;
document.getElementById("prerotateangle").value = 0; document.getElementById("prerotateangle").value = 0;
document.getElementById("finerotate").disabled = true; document.getElementById("finerotate").disabled = true;
document.getElementById("prerotateangle").disabled = true; document.getElementById("prerotateangle").disabled = true;
document.getElementById("updatereferenceimage").disabled = true; document.getElementById("updatereferenceimage").disabled = true;
document.getElementById("take").disabled = true;
// document.getElementById("ButtonRotate").disabled = true; // document.getElementById("ButtonRotate").disabled = true;
isActReference = true;
loadCanvas(url); loadCanvas(url);
ParseConfig(); ParseConfig();
drawRotated(); drawRotated();
@@ -168,7 +189,7 @@
context.rotate(degrees*Math.PI/180); context.rotate(degrees*Math.PI/180);
context.drawImage(imageObj,-imageObj.width/2,-imageObj.height/2); context.drawImage(imageObj,-imageObj.width/2,-imageObj.height/2);
context.restore(); context.restore();
if (_grid == true){ if (_grid == true && !isActReference){
drawGrid(); drawGrid();
} }