Merge: mask a whole category, not just one instance
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> # Conflicts: # apps/darkroom-desktop/Cargo.toml # docs/traceability.md
This commit is contained in:
@@ -971,6 +971,10 @@ fn write_mask(out: &mut String, version: &str, layer: &MaskLayer) {
|
||||
let _ = writeln!(out, "class = {class}");
|
||||
let _ = writeln!(out, "score = {}", format_value(*score));
|
||||
}
|
||||
MaskSource::Category { signature, name } => {
|
||||
let _ = writeln!(out, "signature = {signature}");
|
||||
let _ = writeln!(out, "category = {name}");
|
||||
}
|
||||
MaskSource::Linear {
|
||||
centre,
|
||||
angle,
|
||||
@@ -1124,6 +1128,7 @@ struct PartialMask {
|
||||
ids: Vec<u32>,
|
||||
index: u32,
|
||||
class: String,
|
||||
category: String,
|
||||
score: f32,
|
||||
centre: (f32, f32),
|
||||
radii: (f32, f32),
|
||||
@@ -1154,6 +1159,7 @@ impl PartialMask {
|
||||
level: 0,
|
||||
ids: Vec::new(),
|
||||
index: 0,
|
||||
category: String::new(),
|
||||
class: String::new(),
|
||||
score: 0.0,
|
||||
centre: (0.5, 0.5),
|
||||
@@ -1191,6 +1197,11 @@ impl PartialMask {
|
||||
self.ids.sort_unstable();
|
||||
self.ids.dedup();
|
||||
}
|
||||
// A category's own key rather than reusing `class`: both name a
|
||||
// thing the mask covers, but one is a COCO instance's label and
|
||||
// the other an entry in the scene descriptor, and a file that
|
||||
// conflated them would round-trip a subject into a category.
|
||||
"category" => self.category = value.to_string(),
|
||||
"index" => self.index = value.parse().unwrap_or(0),
|
||||
"class" => self.class = value.to_string(),
|
||||
"score" => self.score = value.parse().unwrap_or(0.0),
|
||||
@@ -1257,6 +1268,10 @@ impl PartialMask {
|
||||
class: self.class,
|
||||
score: self.score,
|
||||
},
|
||||
"category" => MaskSource::Category {
|
||||
signature: self.signature,
|
||||
name: self.category,
|
||||
},
|
||||
"linear" => MaskSource::Linear {
|
||||
centre: self.centre,
|
||||
angle: self.angle,
|
||||
|
||||
Reference in New Issue
Block a user