Slider0007 2 năm trước cách đây
mục cha
commit
f3e90c6293
1 tập tin đã thay đổi với 13 bổ sung12 xóa
  1. 13 12
      sd-card/html/edit_reference.html

+ 13 - 12
sd-card/html/edit_reference.html

@@ -184,7 +184,6 @@
             domainname = getDomainname();   
             isActReference = false;
             param;
-            new_image = false;
 
        
         function doReboot() {
@@ -230,9 +229,11 @@
             if (new_image) {
                 url = getDomainname() + "/img_tmp/raw.jpg" + "?session=" + Math.floor((Math.random() * 1000000) + 1);
                 document.getElementById("updatereferenceimage").disabled = false;
+                isActReference = false;
             }
             else {
                 document.getElementById("updatereferenceimage").disabled = true;
+                isActReference = true;
             }
 
             document.getElementById("finerotate").disabled = false;
@@ -272,9 +273,8 @@
 //            if (param["TakeImage"]["Contrast"].found)
 //                document.getElementById("TakeImage_Contrast_value1").disabled = false;
 
-            isActReference = false;
-            loadCanvas(url);  
-            drawRotated();          
+
+            loadCanvas(url, true);
         }
         
 
@@ -319,8 +319,7 @@
             document.getElementById("flip").disabled = true;
 
             isActReference = true;                                  
-            loadCanvas(url);
-            drawRotated(false, true);
+            loadCanvas(url, false);
         }
         
         
@@ -377,14 +376,17 @@
         }
 
 
-        function loadCanvas(dataURL) {
+        function loadCanvas(dataURL, grid) {
                 var canvas = document.getElementById('canvas');
                 var context = canvas.getContext('2d');
 
                 imageObj.onload = function() {
                     canvas.width = this.width;
                     canvas.height = this.height;
-                    drawRotated();
+                    if (grid)
+                        drawRotated(true);
+                    else
+                        drawRotated(false);
                 };
 
                 imageObj.src = dataURL;
@@ -518,7 +520,7 @@
         }
 
 
-        function drawRotated(_grid = true, _isreference = false){
+        function drawRotated(_grid = true) {
             finerot= parseFloat(document.getElementById("finerotate").value);
             prerot = parseFloat(document.getElementById("prerotateangle").value);
             mirror = document.getElementById("mirror").checked;
@@ -570,10 +572,9 @@
             
             
             context.restore();
-            if (_grid == true && !isActReference){
-                drawGrid();
-            }
 
+            if (_grid)
+                    drawGrid();
         }