13hannes11/focus_annotator
1
0
Fork 0
mirror of https://github.com/13hannes11/focus_annotator.git synced 2024-09-03 23:21:01 +02:00
Code Issues Projects Releases Wiki Activity

import arc properly and replace qualified names

Browse Source
This commit is contained in:
Hannes Kuchelmeister
2022-01-25 16:10:45 +01:00
parent ae0d598056
commit eaffa5ecba
1 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/main.rs
View File

@@ -1,3 +1,5 @@
use std::sync::Arc;
use adw::{prelude::*, ApplicationWindow, HeaderBar, SplitButton}; use adw::{prelude::*, ApplicationWindow, HeaderBar, SplitButton};
use gio::SimpleAction; use gio::SimpleAction;
use glib::clone; use glib::clone;
@@ -65,24 +67,24 @@ impl AnnotationImage {
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
struct ImageUI { struct ImageUI {
individual: std::sync::Arc<Image>, individual: Arc<Image>,
center: std::sync::Arc<Image>, center: Arc<Image>,
neighbours: [std::sync::Arc<Image>; 8], neighbours: [Arc<Image>; 8],
} }
impl ImageUI { impl ImageUI {
pub fn new() -> ImageUI { pub fn new() -> ImageUI {
let individual = std::sync::Arc::new(Image::builder().vexpand(true).hexpand(true).build()); let individual = Arc::new(Image::builder().vexpand(true).hexpand(true).build());
let center = std::sync::Arc::new(Image::builder().vexpand(true).hexpand(true).build()); let center = Arc::new(Image::builder().vexpand(true).hexpand(true).build());
let neighbours = [ let neighbours = [
std::sync::Arc::new(Image::builder().vexpand(true).hexpand(true).build()), Arc::new(Image::builder().vexpand(true).hexpand(true).build()),
std::sync::Arc::new(Image::builder().vexpand(true).hexpand(true).build()), Arc::new(Image::builder().vexpand(true).hexpand(true).build()),
std::sync::Arc::new(Image::builder().vexpand(true).hexpand(true).build()), Arc::new(Image::builder().vexpand(true).hexpand(true).build()),
std::sync::Arc::new(Image::builder().vexpand(true).hexpand(true).build()), Arc::new(Image::builder().vexpand(true).hexpand(true).build()),
std::sync::Arc::new(Image::builder().vexpand(true).hexpand(true).build()), Arc::new(Image::builder().vexpand(true).hexpand(true).build()),
std::sync::Arc::new(Image::builder().vexpand(true).hexpand(true).build()), Arc::new(Image::builder().vexpand(true).hexpand(true).build()),
std::sync::Arc::new(Image::builder().vexpand(true).hexpand(true).build()), Arc::new(Image::builder().vexpand(true).hexpand(true).build()),
std::sync::Arc::new(Image::builder().vexpand(true).hexpand(true).build()), Arc::new(Image::builder().vexpand(true).hexpand(true).build()),
]; ];
ImageUI { ImageUI {
@@ -166,13 +168,13 @@ fn main() {
// MAIN CONTENT // // MAIN CONTENT //
////////////////// //////////////////
let image_ui = std::sync::Arc::new(ImageUI::new()); let image_ui = Arc::new(ImageUI::new());
image_ui image_ui
.as_ref() .as_ref()
.update_image(&z_stack.clone().first().unwrap()); .update_image(&z_stack.clone().first().unwrap());
let focus_neighbours_grid = std::sync::Arc::new( let focus_neighbours_grid = Arc::new(
Grid::builder() Grid::builder()
.vexpand(true) .vexpand(true)
.hexpand(true) .hexpand(true)
@@ -201,7 +203,7 @@ fn main() {
eprintln!("{column} {row}"); eprintln!("{column} {row}");
} }
let focus_scale = std::sync::Arc::new( let focus_scale = Arc::new(
Scale::builder() Scale::builder()
.orientation(Orientation::Vertical) .orientation(Orientation::Vertical)
.vexpand(true) .vexpand(true)