metrics

test_tube_scanner/planarian/admin.py

@@ -30,7 +30,7 @@ class ExperimentConfigAdmin(admin.ModelAdmin):
             "classes": ("collapse",),
         }),
         (_("Tracker"), {
-            "fields": ("tube_axis", "min_area_px", "max_area_ratio", "planarian_count"),
+            "fields": ("tube_axis", "min_area_px", "max_area_ratio", "planarian_count", "merge_kernel_size", "min_contour_dist_px"),
             "classes": ("collapse",),
         }),
         (_("Thigmotactisme"), {

test_tube_scanner/planarian/models.py

@@ -75,6 +75,18 @@ class ExperimentConfig(models.Model):
         verbose_name=_("Nombre de planaires"),
     )
 
+    merge_kernel_size = models.PositiveIntegerField(
+        _("Taille du kernel"), 
+        help_text=_("taille du kernel elliptique de fusion des fragments (px)"), 
+        default=15
+    )
+    
+    min_contour_dist_px = models.PositiveIntegerField(
+        _("Distance <contour>"), 
+        help_text=_("Distance min entre deux contours pour les considérer comme individus distincts. Défaut : 40px."), 
+        default=40
+    )
+
     # --- Thigmotactisme ---
     thigmotaxis_wall_dist_mm = models.FloatField(
         default=1.0,
@@ -133,6 +145,8 @@ class ExperimentConfig(models.Model):
             "tube_axis":             self.tube_axis,
             "min_area_px":           self.min_area_px,
             "max_area_ratio":        self.max_area_ratio,
+            "merge_kernel_size":     self.merge_kernel_size,
+            "min_contour_dist_px":   self.min_contour_dist_px,
             "planarian_count":       self.planarian_count,
             "thigmotaxis_wall_dist_mm": self.thigmotaxis_wall_dist_mm,
             "photo_mode":            self.photo_mode,

test_tube_scanner/planarian/templates/planarian/experiment_form.html

@@ -188,7 +188,22 @@
                         <span class="w3-text-red w3-small">{{ form.planarian_count.errors|join:", " }}</span>
                         {% endif %}
                     </div>
-
+                    
+                    <div class="w3-col m4 s12 w3-margin-bottom">
+                        <label class="w3-text-grey"><b>{{ form.min_contour_dist_px.label }}</b></label>
+                        {{ form.min_contour_dist_px }}
+                        {% if form.min_contour_dist_px.errors %}
+                        <span class="w3-text-red w3-small">{{ form.min_contour_dist_px.errors|join:", " }}</span>
+                        {% endif %}
+                    </div>
+                      
+                    <div class="w3-col m4 s12 w3-margin-bottom">
+                        <label class="w3-text-grey"><b>{{ form.merge_kernel_size.label }}</b></label>
+                        {{ form.merge_kernel_size }}
+                        {% if form.merge_kernel_size.errors %}
+                        <span class="w3-text-red w3-small">{{ form.merge_kernel_size.errors|join:", " }}</span>
+                        {% endif %}
+                    </div>                  
                 </div>
             </div>
         </div>