From bb56972ec812072ebd335ed9bbb4c6c2115daeb0 Mon Sep 17 00:00:00 2001
From: Sebastian <sebastian@sebastians-site.de>
Date: Sat, 12 Feb 2022 23:00:52 +0100
Subject: [PATCH] Adjusted update to image size

---
 src/decoder.rs | 30 ++++++++++--------------------
 src/ui.rs      | 22 ++++++++++++----------
 2 files changed, 22 insertions(+), 30 deletions(-)

diff --git a/src/decoder.rs b/src/decoder.rs
index b1653c8..6cf90cb 100644
--- a/src/decoder.rs
+++ b/src/decoder.rs
@@ -1,8 +1,4 @@
-use std::fs::File;
-use std::io::prelude::*;
 use std::path::Path;
-use std::sync::{Arc, Mutex};
-use std::time;
 
 use amdemod::SquaringAMDemodulator;
 use aptsyncer::{APTSyncer, SyncedSample};
@@ -81,7 +77,7 @@ const LOWPASS_COEFFS: [f32; 63] = [
 
 pub fn decode<T>(input_file: &str, output_file: &str, progress_update: T) -> Result<(), String>
 where
-    T: Fn(f32, image::RgbaImage) -> bool,
+    T: Fn(f32, image::RgbaImage) -> (bool, u32),
 {
     let mut reader = hound::WavReader::open(input_file)
         .map_err(|err| format!("Could not open inputfile: {}", err))?;
@@ -91,7 +87,6 @@ where
     }
 
     let sample_rate = reader.spec().sample_rate;
-    println!("Samplerate: {}", sample_rate);
     if sample_rate != 48000 {
         return Err("Expected a 48kHz sample rate".to_owned());
     }
@@ -99,7 +94,6 @@ where
     let sample_count = reader.len();
     let seconds = (sample_count as f32) / (sample_rate as f32);
     let lines = (seconds.ceil() as u32) * LINES_PER_SECOND;
-    println!("File contains {} seconds or {} lines", seconds, lines);
 
     let mut img = image::DynamicImage::ImageLuma8(image::ImageBuffer::new(PIXELS_PER_LINE, lines));
 
@@ -119,20 +113,14 @@ where
     let mut has_sync = false;
 
     let mut progress = 0;
-    let step = sample_count * 13 / 150 / 10;
+    let pixel_count = sample_count * 13 / 150;
+    let mut update_step = 10;
 
     let mut previous_sample = 0.0;
 
-    print!("0%");
-    std::io::stdout().flush().unwrap();
     for synced_sample in syncer {
         progress += 1;
 
-        if progress % step == 0 {
-            print!("...{}%", progress / step * 10);
-            std::io::stdout().flush().unwrap();
-        }
-
         let sample = match synced_sample {
             SyncedSample::Sample(s) => s,
             SyncedSample::SyncA(s) => {
@@ -179,20 +167,22 @@ where
 
         previous_sample = sample;
 
-        if progress % (PIXELS_PER_LINE * 4) == 0 {
-            if !progress_update((progress as f32) / (step * 10) as f32, img.to_rgba8()) {
+        if progress % (PIXELS_PER_LINE * update_step) == 0 {
+            let (cont, update_steps) =
+                progress_update((progress as f32) / (pixel_count as f32), img.to_rgba8());
+            if !cont {
                 return Ok(());
             }
+
+            let line_count = pixel_count / PIXELS_PER_LINE;
+            update_step = line_count / update_steps;
         }
     }
-    println!("");
 
     progress_update(1.0, img.to_rgba8());
 
     img.save_with_format(&Path::new(output_file), image::ImageFormat::Png)
         .map_err(|err| format!("Could not save outputfile: {}", err))?;
 
-    println!("Done !");
-
     Ok(())
 }
diff --git a/src/ui.rs b/src/ui.rs
index 19a3c83..7b9c832 100644
--- a/src/ui.rs
+++ b/src/ui.rs
@@ -1,5 +1,4 @@
 use std::sync::{Arc, Mutex};
-use std::time;
 
 use eframe::egui::text_edit::TextEdit;
 use eframe::egui::widgets::{Button, ProgressBar};
@@ -16,8 +15,9 @@ enum DecoderRunState {
 }
 
 struct DecoderJobState {
+    update_steps: u32,
     progress: f32,
-    texture: Option<(egui::TextureId, egui::Vec2)>,
+    texture: Option<egui::TextureId>,
     run_state: DecoderRunState,
 }
 
@@ -30,6 +30,7 @@ impl DecoderJobState {
 impl Default for DecoderJobState {
     fn default() -> Self {
         Self {
+            update_steps: 10,
             progress: 0.0,
             texture: None,
             run_state: DecoderRunState::DONE,
@@ -56,7 +57,7 @@ impl Default for DecoderApp {
 
 impl epi::App for DecoderApp {
     fn name(&self) -> &str {
-        "eframe template"
+        "APT Decoder"
     }
 
     /// Called once before the first frame.
@@ -143,17 +144,15 @@ impl epi::App for DecoderApp {
                                     size,
                                     image.as_flat_samples().as_slice(),
                                 );
-                                let size = egui::Vec2::new(size[0] as f32, size[1] as f32);
 
-                                if let Some((old_texture, _)) = state.texture {
+                                if let Some(old_texture) = state.texture {
                                     frame.free_texture(old_texture);
                                 }
-
-                                state.texture = Some((frame.alloc_texture(epi_img), size));
+                                state.texture = Some(frame.alloc_texture(epi_img));
 
                                 frame.request_repaint();
 
-                                return state.is_running();
+                                return (state.is_running(), state.update_steps);
                             })
                             .unwrap();
 
@@ -179,8 +178,11 @@ impl epi::App for DecoderApp {
 
                 ui.separator();
 
-                if let Some((texture, size)) = state.texture {
-                    ui.image(texture, ui.available_size());
+                let image_size = ui.available_size();
+                state.update_steps = image_size[1] as u32;
+
+                if let Some(texture) = state.texture {
+                    ui.image(texture, image_size);
                 }
             });
         }