Upload 5 files

README.md

@@ -146,15 +146,13 @@ The result image also shows the detected bounding boxes and confidence values.
 ## Default classes
 
 ```text
-Carnavalita
-Kimo-COno
-Squizz
-Oreo
-Moro
-Dulce
-KitKat
-Cadbury
-Mega
+cornetto
+magnum
+correto
+cone
+cup
+sandwich
+stick
 other
 ```
 

app.py

@@ -1,3 +1,5 @@
+CLASSES = ['Carnavalita', 'Kimo-COno', 'Squizz', 'Oreo', 'Moro', 'Dulce', 'KitKat', 'Cadbury', 'Mega', 'other']
+
 import io
 import json
 import os
@@ -168,7 +170,7 @@ def annotation_canvas_html(image_id):
     return """<div class="anno-wrap">
 <div class="anno-toolbar"><b>Draw boxes directly on the image</b><span>Click + drag + release = create box</span><span>Choose the class first</span></div>
 <div class="anno-canvas-wrap"><canvas id="anno-canvas"></canvas></div>
-<div class="anno-help">Drag from one corner of the object to the opposite corner, then release. Repeat for every object.</div>
+<div class="anno-help" id="anno-hint">Drag from one corner of the object to the opposite corner, then release. The coordinates are filled automatically; click <b>Save Box</b>. Repeat for every object.</div>
 </div>
 <script>
 (function(){
@@ -182,6 +184,7 @@ function setField(id,val){const box=document.querySelector('#'+id);const el=box?
 canvas.addEventListener('pointerdown',e=>{e.preventDefault();canvas.setPointerCapture(e.pointerId);const p=pos(e);sx=p.x;sy=p.y;drawing=true;current={x:sx,y:sy,w:0,h:0};redraw();});
 canvas.addEventListener('pointermove',e=>{if(!drawing)return;const p=pos(e);current={x:Math.min(sx,p.x),y:Math.min(sy,p.y),w:Math.abs(p.x-sx),h:Math.abs(p.y-sy)};redraw();});
 canvas.addEventListener('pointerup',e=>{if(!drawing)return;drawing=false;const p=pos(e),sc=+canvas.dataset.scale||1;const x=Math.min(sx,p.x)/sc,y=Math.min(sy,p.y)/sc,w=Math.abs(p.x-sx)/sc,h=Math.abs(p.y-sy)/sc;current=null;redraw();if(w<3||h<3)return;setField('anno-x',Math.round(x));setField('anno-y',Math.round(y));setField('anno-w',Math.round(w));setField('anno-h',Math.round(h));const hint=document.getElementById('anno-hint');if(hint)hint.textContent='Box created. Click “Save Box” to store it.';});
+canvas.addEventListener('pointercancel',()=>{drawing=false;current=null;redraw();});
 img.onload=fit;img.src=imgSrc;window.addEventListener('resize',fit);
 })();</script>""" % (json.dumps(src), int(item["width"]), int(item["height"]), boxes)
 
@@ -235,11 +238,11 @@ def draw_annotations(image_id):
 
 
 def add_annotation(image_id, cls, x, y, w, h):
-    if not image_id:return None,"Select an image first.",[]
-    if not cls:return annotation_preview_with_boxes(image_id),"Select a class first.",[]
+    if not image_id:return annotation_canvas_html(image_id),"Select an image first.",[]
+    if not cls:return annotation_canvas_html(image_id),"Select a class first.",[]
     try:x,y,w,h=map(float,[x,y,w,h])
-    except:return annotation_preview_with_boxes(image_id),"Enter box coordinates first.",[]
-    if w<=0 or h<=0:return annotation_preview_with_boxes(image_id),"Box must have a width and height.",[]
+    except:return annotation_canvas_html(image_id),"Enter box coordinates first.",[]
+    if w<=0 or h<=0:return annotation_canvas_html(image_id),"Box must have a width and height.",[]
     data=load_dataset()
     item=next((z for z in data["images"] if z["id"]==image_id),None)
     if not item:return None,"Image not found.",[]
@@ -247,29 +250,29 @@ def add_annotation(image_id, cls, x, y, w, h):
     w=min(w,item["width"]-x); h=min(h,item["height"]-y)
     item.setdefault("annotations",[]).append({"class":cls,"box":[x,y,w,h]})
     save_dataset(data)
-    return annotation_preview_with_boxes(image_id),f"Saved {cls}: [{x:.0f}, {y:.0f}, {w:.0f}, {h:.0f}]",item["annotations"]
+    return annotation_canvas_html(image_id),f"Saved {cls}: [{x:.0f}, {y:.0f}, {w:.0f}, {h:.0f}]",item["annotations"]
 
 
 def remove_annotation(image_id,index):
-    if not image_id:return None,"Select an image first.",[]
+    if not image_id:return annotation_canvas_html(image_id),"Select an image first.",[]
     data=load_dataset()
     item=next((z for z in data["images"] if z["id"]==image_id),None)
     if not item:return None,"Image not found.",[]
     try:idx=int(index)-1
-    except:return annotation_preview_with_boxes(image_id),"Enter an annotation number.",item.get("annotations",[])
+    except:return annotation_canvas_html(image_id),"Enter an annotation number.",item.get("annotations",[])
     anns=item.get("annotations",[])
-    if idx<0 or idx>=len(anns):return annotation_preview_with_boxes(image_id),"Annotation number not found.",anns
+    if idx<0 or idx>=len(anns):return annotation_canvas_html(image_id),"Annotation number not found.",anns
     deleted=anns.pop(idx);save_dataset(data)
-    return annotation_preview_with_boxes(image_id),f"Deleted annotation {index}: {deleted['class']}",anns
+    return annotation_canvas_html(image_id),f"Deleted annotation {index}: {deleted['class']}",anns
 
 
 def clear_annotations(image_id):
-    if not image_id:return None,"Select an image first.",[]
+    if not image_id:return annotation_canvas_html(image_id),"Select an image first.",[]
     data=load_dataset()
     item=next((z for z in data["images"] if z["id"]==image_id),None)
     if not item:return None,"Image not found.",[]
     item["annotations"]=[];save_dataset(data)
-    return annotation_preview_image(image_id),"Annotations cleared.",[]
+    return annotation_canvas_html(image_id),"Annotations cleared.",[]
 
 
 def save_classes(text):
@@ -277,11 +280,11 @@ def save_classes(text):
     if not classes:
         return "At least one class is required.", gr.update(choices=[]), dataset_status()
     if len(set(classes)) != len(classes):
-        return "Classes must be unique.", gr.update(choices=classes), dataset_status()
+        return "Classes must be unique.", gr.update(choices=CLASSES), dataset_status()
     CLASSES_FILE.write_text("\n".join(classes) + "\n", encoding="utf-8")
     data = load_dataset()
     save_dataset(data)
-    return f"Saved {len(classes)} classes.", gr.update(choices=classes, value=classes[0]), dataset_status()
+    return f"Saved {len(classes)} classes.", gr.update(choices=CLASSES, value=classes[0]), dataset_status()
 
 
 def build_coco():
@@ -460,14 +463,14 @@ with gr.Blocks(title="Ice Cream Dataset + Counter") as demo:
         gr.Markdown("The actual uploaded photo is displayed below. Select a class and enter the box coordinates in the original image pixels, then click **Save Box**. Saved boxes appear in red.")
         with gr.Row():
             with gr.Column(scale=3):
-                annotation_preview = gr.Image(label="Training image", type="pil", interactive=False, height=650)
+                annotation_canvas = gr.HTML(value='<div class="anno-empty">Select an image.</div>', label="Training image")
                 editor_info = gr.Markdown()
             with gr.Column(scale=1):
                 ann_class = gr.Dropdown(choices=read_classes(), value=(read_classes()[0] if read_classes() else None), label="Class")
-                x = gr.Number(label="X (left)", value=0, precision=0)
-                y = gr.Number(label="Y (top)", value=0, precision=0)
-                w = gr.Number(label="Width", value=0, precision=0)
-                h = gr.Number(label="Height", value=0, precision=0)
+                x = gr.Number(label="X (left)", value=0, precision=0, elem_id="anno-x")
+                y = gr.Number(label="Y (top)", value=0, precision=0, elem_id="anno-y")
+                w = gr.Number(label="Width", value=0, precision=0, elem_id="anno-w")
+                h = gr.Number(label="Height", value=0, precision=0, elem_id="anno-h")
                 add_btn = gr.Button("💾 Save Box", variant="primary")
                 gr.Markdown("Example: X=120, Y=80, Width=180, Height=300.")
                 delete_index = gr.Number(label="Annotation # to delete", value=1, precision=0)
@@ -475,10 +478,10 @@ with gr.Blocks(title="Ice Cream Dataset + Counter") as demo:
                 clear_btn = gr.Button("Clear All Boxes")
         annotations = gr.JSON(label="Saved annotations")
         ann_msg = gr.Markdown()
-        image_select.change(refresh_editor, image_select, [annotation_preview, editor_info, annotations])
-        add_btn.click(add_annotation, [image_select, ann_class, x, y, w, h], [annotation_preview, ann_msg, annotations])
-        delete_btn.click(remove_annotation, [image_select, delete_index], [annotation_preview, ann_msg, annotations])
-        clear_btn.click(clear_annotations, image_select, [annotation_preview, ann_msg, annotations])
+        image_select.change(lambda image_id: (draw_annotations(image_id), refresh_editor(image_id)[1], refresh_editor(image_id)[2]), image_select, [annotation_canvas, editor_info, annotations])
+        add_btn.click(add_annotation, [image_select, ann_class, x, y, w, h], [annotation_canvas, ann_msg, annotations])
+        delete_btn.click(remove_annotation, [image_select, delete_index], [annotation_canvas, ann_msg, annotations])
+        clear_btn.click(clear_annotations, image_select, [annotation_canvas, ann_msg, annotations])
 
     with gr.Tab("3 · Training"):
         gr.Markdown("### Train RT-DETR")

training/classes.txt

@@ -1,10 +1,8 @@
-Carnavalita
-Kimo-COno
-Squizz
-Oreo
-Moro
-Dulce
-KitKat
-Cadbury
-Mega
+cornetto
+magnum
+correto
+cone
+cup
+sandwich
+stick
 other