Fix a few critical issues

static/picture-annotation.py

@@ -81,10 +81,10 @@ def list_shapes():

                                
                                
                                
                            
                                
                                    
                                        
                                            81  
                                                    if shape.tagName == "rect":
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            82  
                                                        shape_dict["type"] = "bbox"
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            83  
                                                        shape_dict["shape"] = {
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        84 -
                                                        "x": float(shape.getAttribute("x")[:-1]) / 100,
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        85 -
                                                        "y": float(shape.getAttribute("y")[:-1]) / 100,
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        86 -
                                                        "w": float(shape.getAttribute("width")[:-1]) / 100,
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        87 -
                                                        "h": float(shape.getAttribute("height")[:-1]) / 100
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        84 +
                                                        "x": float(shape.getAttribute("x")[:-1]),
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        85 +
                                                        "y": float(shape.getAttribute("y")[:-1]),
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        86 +
                                                        "w": float(shape.getAttribute("width")[:-1]),
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        87 +
                                                        "h": float(shape.getAttribute("height")[:-1])
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            88  
                                                        }
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            89  
                                                    elif shape.tagName == "polygon" or shape.tagName == "polyline":
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            90  
                                                        if shape.tagName == "polygon":
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        

@@ -168,7 +168,7 @@ async def load_shapes():

                                
                                
                                
                            
                                
                                    
                                        
                                            168  
                                            async def save_shapes(event):
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            169  
                                                shapes = list_shapes()
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            170  
                                                resource_id = document.getElementById("resource-id").value
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        171 -
                                            print("Saving shapes:", shapes)
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        171 +
                                            #print("Saving shapes:", shapes)
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            172  
                                                response = await pyfetch(f"/picture/{resource_id}/save-annotations",
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            173  
                                                    method="POST",
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            174  
                                                    headers={
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        

@@ -176,8 +176,6 @@ async def save_shapes(event):

                                
                                
                                
                            
                                
                                    
                                        
                                            176  
                                                    },
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            177  
                                                    body=json.dumps(shapes)
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            178  
                                                )
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        179 -
                                            if response.ok:
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        180 -
                                                return await response
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            179  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            180  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            181  
                                            save_shapes_proxy = create_proxy(save_shapes)
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        

@@ -607,7 +605,7 @@ def backspace_polygon(event):

                                
                                
                                
                            
                                
                                    
                                        
                                            605  
                                                polygon_points.pop()
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            606  
                                                polygon = new_shape.children[0]
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            607  
                                                polygon.setAttribute("points", " ".join(
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        610 -
                                                    [f"{point[0] * 100}%,{point[1] * 100}%" for point in
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        608 +
                                                    [f"{point[0]},{point[1]}" for point in
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            609  
                                                         polygon_points]))
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            610  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            611  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        

@@ -918,4 +916,4 @@ zoom_out_button.addEventListener("click", zoom_out)

                                
                                
                                
                            
                                
                                    
                                        
                                            916  
                                            # Load existing annotations, if any
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            917  
                                            put_shapes(await load_shapes())
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            918  
                                            update_transform()
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        921 -
                                        print("Ready!")
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        919 +
                                        print("Ready!")