fix marking not disappearing for nonannotated images

This commit is contained in:
2022-01-26 14:49:50 +01:00
parent ee1e25bba4
commit f08b5ba90c

View File

@@ -13,7 +13,7 @@ use gtk::{
const MARGIN_TOP: i32 = 32; const MARGIN_TOP: i32 = 32;
const MARGIN_BOTTOM: i32 = 32; const MARGIN_BOTTOM: i32 = 32;
const MARGIN_LEFT: i32 = 16; const MARGIN_LEFT: i32 = 16;
const MARGIN_RIGHT_SCALE_ADDITIONAL: i32 = 42; const MARGIN_RIGHT_SCALE_ADDITIONAL: i32 = 38;
const NONE_STRING_OPTION: Option<String> = None; const NONE_STRING_OPTION: Option<String> = None;
@@ -117,6 +117,7 @@ fn update_focus_scale(focus_scale: &Scale, z_stack: AnnotationZStack) {
); );
focus_scale.set_margin_end(0); focus_scale.set_margin_end(0);
} else { } else {
focus_scale.clear_marks();
focus_scale.set_margin_end(MARGIN_RIGHT_SCALE_ADDITIONAL); focus_scale.set_margin_end(MARGIN_RIGHT_SCALE_ADDITIONAL);
} }
} }
@@ -250,6 +251,8 @@ fn main() {
{ {
let mut z_stack = AnnotationZStack::new(); let mut z_stack = AnnotationZStack::new();
z_stack.best_index = Some(0);
let path = "/var/home/hannes/Documents/toolbox/python/thesis/focus_metrics_test/img/30_753da05d-cd1e-45c5-8593-003323e0bb69_I00243_X013_Y003_Z4648.jpg"; let path = "/var/home/hannes/Documents/toolbox/python/thesis/focus_metrics_test/img/30_753da05d-cd1e-45c5-8593-003323e0bb69_I00243_X013_Y003_Z4648.jpg";
z_stack.push(AnnotationImage::from_vec( z_stack.push(AnnotationImage::from_vec(
path.to_string(), path.to_string(),