Release nwbview 0.2.4 (#35)

* add back static/icon to include directive in Cargo.toml * version 0.2.4 * remove extra call to eframe::run_native
brainhack-ch · Mar 14, 2023 · 224ff13 · 224ff13
1 parent ca5c8d3
commit 224ff13
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 26 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -3,7 +3,7 @@ authors = ["Anıl Tuncel <[email protected]>"]
 categories = ["science", "visualization", "science::neuroscience"]
 description = "Neurodata Without Borders viewer"
 name = "nwbview"
-version = "0.2.3"
+version = "0.2.4"
 edition = "2021"
 repository = "https://github.com/brainhack-ch/nwbview"
 license = "Apache-2.0"
@@ -14,7 +14,8 @@ include = [
   "Cargo.lock",
   "Cargo.toml",
   "LICENSE",
-  "src/**/*"
+  "src/**/*",
+  "static/icon.png",
 ]
 
 [[bin]]

diff --git a/src/main.rs b/src/main.rs
@@ -10,11 +10,18 @@ use image::GenericImageView;
 fn main() {
     const ICON: &[u8] = include_bytes!("../static/icon.png");
 
+    let mut options = eframe::NativeOptions {
+        drag_and_drop_support: true,
+        ..Default::default()
+    };
     match image::load_from_memory(ICON) {
+        Err(error) => {
+            println!("Error raised while loading icon: {}", error);
+            println!("Launching NWBView without the icon...");
+        }
         Ok(icon) => {
             let (icon_width, icon_height) = icon.dimensions();
-
-            let options = eframe::NativeOptions {
+            options = eframe::NativeOptions {
                 icon_data: Some(eframe::IconData {
                     rgba: icon.into_rgba8().to_vec(),
                     width: icon_width,
@@ -23,27 +30,12 @@ fn main() {
                 drag_and_drop_support: true,
                 ..Default::default()
             };
-
-            eframe::run_native(
-                "NWB View",
-                options,
-                Box::new(|_cc| Box::<NWBView>::default()),
-            )
-            .ok();
-        }
-        Err(error) => {
-            println!("Error raised while loading icon: {}", error);
-            println!("Launching without icon...");
-            let options = eframe::NativeOptions {
-                drag_and_drop_support: true,
-                ..Default::default()
-            };
-            eframe::run_native(
-                "NWB View",
-                options,
-                Box::new(|_cc| Box::<NWBView>::default()),
-            )
-            .ok();
         }
     }
+    eframe::run_native(
+        "NWB View",
+        options,
+        Box::new(|_cc| Box::<NWBView>::default()),
+    )
+    .ok();
 }