add: Now the pdfs are fit to image size, but still needs a custom size option, and the gui can convert and save the output pdf file.

Author: Fabiokleis

convert/src/lib.rs

@@ -2,6 +2,9 @@ extern crate printpdf;
 use printpdf::*;
 use image_crate::codecs::{jpeg::JpegDecoder, png::PngDecoder};
 use std::{path::Path, fs::File, io::BufWriter};
+//use std::cmp::max;
+
+const PPI_BY_DPI: f64 = 0.084666667;
 
 #[allow(dead_code)]
 pub mod conf;
@@ -11,11 +14,23 @@ pub struct Convert {
     config: conf::Conf,
 }
 
+// TODO: Convert page size by setting a pdf size
+//#[derive(Clone, Copy)]
+//enum PdfSizes {
+//    A2,
+//    A3,
+//    A4,
+//    A5,
+//    ImgSize,
+//}
+
 enum ImgExtension {
     Png,
     Jpg,
 }
 
+
+
 impl Convert {
     pub fn new(config: conf::Conf) -> Self {
         Convert { config }
@@ -32,9 +47,30 @@ impl Convert {
                     let img_extension = get_img_extension(p.to_string());
                     match img_extension {
                         Some(ft) => {
-                            let (page, layer) = doc.add_page(Mm(210.0), Mm(297.0), "Layer");
+                            let (img, px) = load_img(p.to_string(), ft);
+                            let mm = px2mm(px.0, px.1);
+                            let mut page_mm = (Mm(0.0), Mm(0.0));
+                            let s_ratio = 1.0;
+
+                            // TODO: Create a flag option to pdf size and center image on page 
+                            //s_ratio = max(1, max((210.0 / mm.0) as i32, (297.0 / mm.1) as i32)) as f64;
+
+
+
+                            // set to img size
+                            page_mm.0 = Mm(mm.0);
+                            page_mm.1 = Mm(mm.1);
+                    
+                            let (page, layer) = doc.add_page(page_mm.0 * s_ratio, page_mm.1 * s_ratio, "Layer");
                             let current_layer = doc.get_page(page).get_layer(layer);
-                            load_and_write_img(p.to_string(), current_layer.clone(), ft)
+                             
+                            let img_transform = ImageTransform {
+                                scale_x: Some(s_ratio),
+                                scale_y: Some(s_ratio),
+                                .. Default::default()
+                            };
+                            img.add_to_layer(current_layer.clone(), img_transform);
+
                         },
                         None => {}
                     }
@@ -68,19 +104,24 @@ fn get_img_extension(path: String) -> Option<ImgExtension> {
     }    
 }
 
-fn load_and_write_img(path: String, current_layer: PdfLayerReference, ft: ImgExtension) {
+fn px2mm(x: f64, y: f64) -> (f64, f64) {
+    (x * PPI_BY_DPI, y * PPI_BY_DPI)
+}
+
+fn load_img(path: String, ft: ImgExtension) -> (Image, (f64, f64)) {
     match ft {
         ImgExtension::Jpg => {
             let mut image_file = File::open(Path::new(&path)).unwrap();
             let img = Image::try_from(JpegDecoder::new(&mut image_file).unwrap()).unwrap();
-            img.add_to_layer(current_layer.clone(), ImageTransform::default());    
-
+            let px = (img.image.width.0 as f64, img.image.height.0 as f64);
+            (img, px)
         },
         ImgExtension::Png => {
             let mut image_file = File::open(Path::new(&path)).unwrap();
             let mut img = Image::try_from(PngDecoder::new(&mut image_file).unwrap()).unwrap();
+            let px = (img.image.width.0 as f64, img.image.height.0 as f64);
             img.image = remove_alpha_channel_from_image_x_object(img.image);
-            img.add_to_layer(current_layer.clone(), ImageTransform::default());    
+            (img, px)
         },
     }
 }

gui/src/rpdfapp/components/mod.rs

@@ -95,6 +95,18 @@ impl InputButton {
     pub fn add_path(&mut self, path: String) {
         self.image_paths.push(path);
     }
+
+    pub fn clean_images(&mut self) -> bool {
+        if self.image_paths.is_empty() {
+            return false;
+        }
+        self.image_paths.clear();
+        true
+    }
+
+    pub fn send(&mut self) {
+        self.btn.do_callback();
+    } 
 }
 
 pub struct ButtonSection {
@@ -134,6 +146,10 @@ impl ButtonSection {
     pub fn create_input_button(&mut self, label: String, w: i32) -> InputButton {
         InputButton::new(&mut self.flex, label, w)
     }
+
+    pub fn flex(&mut self) -> &mut Flex {
+        &mut self.flex
+    }
 }
 
 pub struct PreviewSection {
@@ -179,6 +195,7 @@ impl PreviewSection {
     pub fn add_image(&mut self, path: String, w: i32, h: i32, pad: i32, margin: i32) -> ImageItem {
         ImageItem::new(&mut self.flex, path, w, h, pad, margin)
     }
+    
 }
 
 type ImageWrapp = Option<SharedImage>;

gui/src/rpdfapp/mod.rs

@@ -1,3 +1,4 @@
+use convert::{Convert, conf::Conf};
 use fltk::{
     prelude::*,
     frame::{self, Frame},
@@ -39,6 +40,12 @@ fn main_menu(sys_menu: &mut MyMenu, s: &Sender<Message>) {
 //    );
 //}
 
+pub fn center() -> (i32, i32) {
+    (
+        (app::screen_size().0 / 2.0) as i32,
+        (app::screen_size().1 / 2.0) as i32,
+    )
+}
 
 
 pub struct RpdfApp {
@@ -54,7 +61,7 @@ pub struct RpdfApp {
 
 impl RpdfApp {
     pub fn new() -> Self {
-        let app = app::App::default().with_scheme(Scheme::Base);
+        let app = app::App::default().with_scheme(Scheme::Gtk);
         let (s, r) = app::channel::<Message>();
         let mut main_win = Window::default()
             .with_size(W_WIDTH, W_HEIGHT)
@@ -74,8 +81,9 @@ impl RpdfApp {
         let mut b_section = ButtonSection::new(&mut app_flex, 50, 10, 10);
         let mut input_button = b_section.create_input_button("@fileopen Open image".to_string(), 140);
         input_button.emit(s, Message::FileOperation(FileOperations::Upload));
-        let mut convert_button = b_section.create_button("Convert images".to_string(), 140);
-        convert_button.emit(s, Message::FileOperation(FileOperations::Convert));
+        let mut convert_button = b_section.create_button("@filenew Convert and save images".to_string(), 200);
+        convert_button.emit(s, Message::FileOperation(FileOperations::ConvertAndSave));
+        convert_button.deactivate();
 
         b_section.end();
 
@@ -105,20 +113,63 @@ impl RpdfApp {
         }
     }
 
-    fn open_files_dialog(&mut self) {
+    fn open_files_dialog(&mut self) -> Result<bool, String> {
         let mut dialog = NativeFileChooser::new(NativeFileChooserType::BrowseMultiFile);
         dialog.set_filter("*.{png,jpg}");
         dialog.show();
-        for p in dialog.filenames().iter() {
-            let path = p.to_string_lossy().to_string();
-            if ! self.input_button.get_paths().contains(&path) {
+        let file_names: Vec<String> = dialog.filenames().iter().map(|p| p.to_string_lossy().to_string()).collect();
+        if file_names.is_empty() {
+            dialog::message_title("Choose file");
+            dialog::alert(center().0 - 200, center().1 - 100, "Please choose a file!");
+            return Ok(false);
+        }
+        
+        for path in file_names.iter() {
+            if ! self.input_button.get_paths().contains(&path.clone()) {
                 self.input_button.add_path(path.clone());
                 self.p_section.begin();
-                self.p_section.add_image(path, IMAGE_WIDTH, IMAGE_HEIGTH, IMAGE_PAD, IMAGE_MARGIN);
+                self.p_section.add_image(path.to_string(), IMAGE_WIDTH, IMAGE_HEIGTH, IMAGE_PAD, IMAGE_MARGIN);
                 self.p_section.end();
                 self.p_section.redraw();
             }
         }
+
+        Ok(true)
+    }
+
+    fn convert_and_save(&mut self) -> Result<bool, String> {
+        let mut dlg = dialog::FileDialog::new(dialog::FileDialogType::BrowseSaveFile);
+        dlg.set_option(dialog::FileDialogOptions::SaveAsConfirm);
+        dlg.show();
+        let out = dlg.filename().to_string_lossy().to_string();
+        if out.is_empty() {
+            dialog::message_title("Choose save file");
+            dialog::alert(center().0 - 200, center().1 - 100, "Please specify a file!");
+            return Ok(false);
+        }
+
+        self.p_section.flex().deactivate();
+        self.b_section.flex().deactivate();
+        let images = self.input_button.get_paths().clone();
+        let config = Conf::from_images(images, out);
+        let cvrt = Convert::new(config);
+        self.clean_preview_section()?;
+        cvrt.save_to_pdf()?;
+
+        self.p_section.flex().activate();
+        self.b_section.flex().activate();
+        self.b_section.flex().child(1).unwrap().deactivate();
+        Ok(true)
+    }
+
+    fn clean_preview_section(&mut self) -> Result<bool, String> {
+        if ! self.input_button.clean_images() {
+            dialog::alert(center().0 - 200, center().1 - 100, "No image in preview section!");
+            return Ok(false);
+        }
+        self.p_section.flex().clear();
+        
+        Ok(true)
     }
 
     pub fn launch(&mut self) {
@@ -141,13 +192,12 @@ impl RpdfApp {
                     },
                     Message::FileOperation(fopt) => match fopt {
                         FileOperations::Upload => {
-                            self.open_files_dialog();
+                            if self.open_files_dialog().unwrap() {
+                                self.b_section.flex().child(1).unwrap().activate();
+                            }
                         },
-                        FileOperations::Convert => {
-                            todo!("pass image paths to convert lib then create a handler to save on output name")
-                        },
-                        FileOperations::Save => {
-                            todo!()
+                        FileOperations::ConvertAndSave => {
+                            self.convert_and_save();
                         },
                     },
                     Message::PdfSize(ps) => match ps {
@@ -168,13 +218,26 @@ impl RpdfApp {
                         }
                     },
                     Message::About => {
-                        todo!()
+                        dialog::message_title("About");
+                        dialog::message(center().0 - 200, center().1 - 100, "About dialog");
                     },
                     Message::Help => {
-                        todo!()
+                        dialog::message_title("Help");
+                        dialog::message(center().0 - 200, center().1 - 100, "About dialog");
                     },
                     Message::Quit => {
-                        self.app.quit();
+                        if self.input_button.get_paths().is_empty() {
+                            self.app.quit();
+                        } else {
+                            match dialog::choice2_default("Would you like to convert and save", "No", "Yes", "Cancel") {
+                                Some(1) => self.b_section.flex().child(1).unwrap().do_callback(),
+                                Some(0) => self.app.quit(),
+                                Some(2) => {},
+                                None => {},
+                                _ => {}
+                            }
+                             
+                        }
                     },
                     Message::None => todo!() 
                 }

gui/src/utils.rs

@@ -21,16 +21,14 @@ pub enum Message {
 #[derive(Clone, Copy)]
 pub enum FileOperations {
     Upload,
-    Convert,
-    Save,
+    ConvertAndSave,
 }
 
 impl FileOperations {
     pub fn get_variant(e_v: String) -> Message {
         match e_v.as_str() {
             "Upload" => Message::FileOperation(FileOperations::Upload),
-            "Convert" => Message::FileOperation(FileOperations::Convert),
-            "Save" => Message::FileOperation(FileOperations::Save),
+            "Convert" => Message::FileOperation(FileOperations::ConvertAndSave),
             _ => Message::None,
         }
     }