julian/music-reader
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove commented code

Browse Source
This commit is contained in:
Julian Mutter 2023-11-21 18:18:13 +01:00
parent a9729005ff
commit 874120108b
3 changed files with 1 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/cache.rs
View File

@ -12,20 +12,14 @@ pub type MyPageType = Page;
pub struct PageCache {
document: Document,
// render_config: PdfRenderConfig,
max_num_stored_pages: usize,
pages: BTreeMap<usize, Arc<MyPageType>>,
}
impl PageCache {
pub fn new(
document: Document,
// render_config: PdfRenderConfig,
max_num_stored_pages: usize,
) -> Self {
pub fn new(document: Document, max_num_stored_pages: usize) -> Self {
PageCache {
document,
// render_config,
max_num_stored_pages,
pages: BTreeMap::new(),
}
@ -42,25 +36,7 @@ impl PageCache {
continue;
}
// let page = self.document.pages().get(page_number as u16).unwrap();
// let image = page.render_with_config(&self.render_config).unwrap();
// // TODO: does this clone?
// let bytes = Bytes::from(image.as_bytes());
// let page = Texture::from_bytes(&bytes).unwrap();
if let Some(page) = self.document.page(page_number as i32) {
// let image = Picture::new();
// // poppler.rend
// let surface = ImageSurface::create(Format::Rgb24, 10, 10).unwrap();
// let context = Context::new(&surface).unwrap();
// page.render(&context);
// context.paint().expect("Could not paint");
// println!("Surface: {:?}", surface);
// let page = surface;
// let page = surface.take_data().unwrap();
// context.draw
self.pages.insert(page_number, Arc::new(page));
if self.pages.len() > self.max_num_stored_pages && self.pages.len() > 2 {
@ -137,21 +113,11 @@ where
F: Fn(CacheResponse) + 'static,
{
let (command_sender, command_receiver) = async_channel::unbounded();
// let (response_sender, response_receiver) = async_channel::unbounded();
let path: PathBuf = file.as_ref().to_path_buf();
glib::spawn_future_local(async move {
println!("async loading of document:...");
// Load pdf document here since Document is not thread safe and cannot be passed from main thread
// let pdfium = Pdfium::default();
// let document = pdfium.load_pdf_from_file(&path, None).unwrap();
// let render_config = PdfRenderConfig::new()
// .set_target_width(2000)
// .set_maximum_height(2000)
// .rotate_if_landscape(PdfPageRenderRotation::Degrees90, true);
// let num_pages = document.pages().iter().count();
let uri = format!("file://{}", path.to_str().unwrap());
let document = poppler::Document::from_file(&uri, None).unwrap();

27
src/draw.rs
View File

@ -10,29 +10,12 @@ pub fn draw(ui: &mut Ui, area: &DrawingArea, context: &Context) {
}
let document_canvas = ui.document_canvas.as_ref().unwrap();
// let left_page = document_canvas.left_page.as_ref().unwrap();
// let left_page = left_page.as_ref();
// let data: Vec<u8> = left_page.into_iter().map(|x| x.to_owned()).collect();
// let data: Vec<u8> = page.iter().map(|x| x.clone()).collect();
// let surface = ImageSurface::create_for_data(data, Format::Rgb24, 0, 0, 0).unwrap();
// context.set_source_surface(surface, 0.0, 0.0);
// context.paint();
if document_canvas.num_pages.unwrap_or(0) > 1 {
draw_two_pages(ui, area, context);
} else {
draw_single_page(ui, area, context);
}
// gio::spawn_blocking(move || {
// ui.document_canvas
// .as_mut()
// .unwrap()
// .cache_surrounding_pages();
// });
println!("Finished drawing");
document_canvas.cache_surrounding_pages();
}
@ -121,18 +104,8 @@ fn draw_single_page(ui: &Ui, area: &DrawingArea, context: &Context) {
}
let page = document_canvas.left_page.as_ref().unwrap();
// let page = ImageSurface::create_for_data(page.into(), Format::Rgb24, 0, 0, 0).unwrap();
// context.set_source_surface(page, 0, 0);
// Draw background
// context.set_source_rgba(1.0, 1.0, 1.0, 1.0);
// context.paint().unwrap();
// context.fill().expect("uh oh");
// context.paint().unwrap();
let (w, h) = page.size();
// let w = page.width() as f64;
// let h = page.height() as f64;
let width_diff = area.width() as f64 / w;
let height_diff = area.height() as f64 / h;

21
src/ui.rs
View File

@ -202,7 +202,6 @@ impl Ui {
ui.borrow().header_bar.pack_start(&open_file_button);
app_wrapper.prepend(&ui.borrow().drawing_area);
// app_wrapper.prepend(&ui.borrow().picture);
app_wrapper.append(&ui.borrow().bottom_bar);
ui.borrow().bottom_bar.append(&ui.borrow().page_indicator);
@ -220,8 +219,6 @@ impl Ui {
ui.borrow().drawing_area.add_controller(click_left);
ui.borrow().drawing_area.add_controller(click_right);
// ui.borrow().picture.add_controller(click_left);
// ui.borrow().picture.add_controller(click_right);
ui.borrow().drawing_area.set_draw_func(
glib::clone!(@weak ui => move |area, context, _, _| {
@ -266,7 +263,6 @@ fn choose_file(ui: Rc<RefCell<Ui>>, window: &ApplicationWindow) {
pub fn load_document(file: impl AsRef<Path>, ui: Rc<RefCell<Ui>>) {
println!("Loading file...");
// TODO: catch errors, maybe show error dialog
// let uri = format!("file://{}", file.as_ref().to_str().unwrap());
let sender = cache::spawn_async_cache(
file,
@ -292,23 +288,6 @@ pub fn load_document(file: impl AsRef<Path>, ui: Rc<RefCell<Ui>>) {
);
println!("Spawned async cache");
// // gtk::spawn
// glib::spawn_future_local(clone!(@weak ui => async move {
// println!("Waiting for cache response:...");
// while let Ok(cache_response) = receiver.recv().await {
// match cache_response{
// cache::CacheResponse::DocumentLoaded { num_pages } => {ui.borrow_mut().document_canvas.as_mut().unwrap().num_pages = Some(num_pages); update_page_status(&ui.borrow())},
// cache::CacheResponse::SinglePageLoaded { page } => { ui.borrow_mut().document_canvas.as_mut().unwrap().left_page = Some(page);
// ui.borrow_mut().document_canvas.as_mut().unwrap().right_page = None;
// ui.borrow().drawing_area.queue_draw();
// },
// cache::CacheResponse::TwoPagesLoaded { page_left, page_right } => { ui.borrow_mut().document_canvas.as_mut().unwrap().left_page = Some(page_left);
// ui.borrow_mut().document_canvas.as_mut().unwrap().right_page = Some(page_right);
// ui.borrow().drawing_area.queue_draw();
// }
// }
// }
// }));
let document_canvas = DocumentCanvas::new(sender);
document_canvas.cache_initial_pages();