wilderjds
/
emacs-application-framework
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #166 from MatthewZMD/pdf-refactor-bug-fix

Browse Source 
PDF code refactor, improve workflow and cancel search when zooming
master
Andy Stewart 6 years ago committed by GitHub
parent b8aab2b6fe a28ff859e5
commit a364bca991
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 33 additions and 27 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 60
      app/pdf-viewer/buffer.py

60
app/pdf-viewer/buffer.py
Unescape View File

@ -50,7 +50,7 @@ class AppBuffer(Buffer):
def cancel_input_message(self, result_type): def cancel_input_message(self, result_type):
if result_type == "jump_link": if result_type == "jump_link":
self.buffer_widget.clean_links() self.buffer_widget.cleanup_links()
def scroll(self, scroll_direction, scroll_type): def scroll(self, scroll_direction, scroll_type):
if scroll_type == "page": if scroll_type == "page":
@ -109,10 +109,10 @@ class AppBuffer(Buffer):
self.buffer_widget.zoom_out() self.buffer_widget.zoom_out()
def jump_to_page(self): def jump_to_page(self):
self.buffer_widget.send_input_message("EAF PDF Viewer - Jump to Page: ", "jump_page") self.buffer_widget.send_input_message("EAF PDF - Jump to Page: ", "jump_page")
def jump_to_percent(self): def jump_to_percent(self):
self.buffer_widget.send_input_message("EAF PDF Viewer - Jump to Percent: ", "jump_percent") self.buffer_widget.send_input_message("EAF PDF - Jump to Percent: ", "jump_percent")
def remember_current_position(self): def remember_current_position(self):
self.buffer_widget.remember_current_position() self.buffer_widget.remember_current_position()
@ -128,25 +128,24 @@ class AppBuffer(Buffer):
def jump_to_link(self): def jump_to_link(self):
self.buffer_widget.add_mark_jump_link_tips() self.buffer_widget.add_mark_jump_link_tips()
self.buffer_widget.send_input_message("EAF PDF Viewer - Jump to Link: ", "jump_link") self.buffer_widget.send_input_message("EAF PDF - Jump to Link: ", "jump_link")
def search_text(self): def search_text(self):
if self.buffer_widget.search_flag: if self.buffer_widget.is_mark_search:
self.buffer_widget.remove_marked_search_text() self.buffer_widget.cleanup_search()
else: self.buffer_widget.send_input_message("EAF PDF - Search Text: ", "search_text")
self.buffer_widget.send_input_message("EAF PDF Viewer - Search Text: ", "search_text")
def jump_next_match(self): def jump_next_match(self):
if self.buffer_widget.search_flag: if self.buffer_widget.is_mark_search:
self.buffer_widget.jump_next_match() self.buffer_widget.jump_next_match()
else: else:
self.message_to_emacs.emit("EAF PDF Viewer - Cannot jump to next match. Nothing searched!") self.message_to_emacs.emit("EAF PDF - Cannot jump to next match. Nothing searched!")
def jump_last_match(self): def jump_last_match(self):
if self.buffer_widget.search_flag: if self.buffer_widget.is_mark_search:
self.buffer_widget.jump_last_match() self.buffer_widget.jump_last_match()
else: else:
self.message_to_emacs.emit("EAF PDF Viewer - Cannot jump to last match. Nothing searched!") self.message_to_emacs.emit("EAF PDF - Cannot jump to last match. Nothing searched!")
class PdfViewerWidget(QWidget): class PdfViewerWidget(QWidget):
translate_double_click_word = QtCore.pyqtSignal(str) translate_double_click_word = QtCore.pyqtSignal(str)
@ -183,7 +182,7 @@ class PdfViewerWidget(QWidget):
self.jump_link_annot_cache_dict = {} self.jump_link_annot_cache_dict = {}
#global search text #global search text
self.search_flag = False self.is_mark_search = False
self.search_text_offset_list = [] self.search_text_offset_list = []
self.search_text_annot_cache_dict = {} self.search_text_annot_cache_dict = {}
@ -218,11 +217,11 @@ class PdfViewerWidget(QWidget):
def remember_current_position(self): def remember_current_position(self):
self.remember_offset = self.scroll_offset self.remember_offset = self.scroll_offset
self.message_to_emacs.emit("EAF PDF Viewer - Remembered current position.") self.message_to_emacs.emit("EAF PDF - Remembered current position.")
def remember_jump(self): def remember_jump(self):
if self.remember_offset is None: if self.remember_offset is None:
self.message_to_emacs.emit("EAF PDF Viewer - Cannot jump from this position.") self.message_to_emacs.emit("EAF PDF - Cannot jump from this position.")
else: else:
current_scroll_offset = self.scroll_offset current_scroll_offset = self.scroll_offset
self.scroll_offset = self.remember_offset self.scroll_offset = self.remember_offset
@ -248,7 +247,7 @@ class PdfViewerWidget(QWidget):
page = self.document[index] page = self.document[index]
# follow page search text # follow page search text
if self.search_flag: if self.is_mark_search:
page = self.add_mark_search_text(page, index) page = self.add_mark_search_text(page, index)
trans = self.page_cache_trans if self.page_cache_trans is not None else fitz.Matrix(scale, scale) trans = self.page_cache_trans if self.page_cache_trans is not None else fitz.Matrix(scale, scale)
@ -439,16 +438,22 @@ class PdfViewerWidget(QWidget):
self.update_scroll_offset(self.max_scroll_offset()) self.update_scroll_offset(self.max_scroll_offset())
def zoom_in(self): def zoom_in(self):
if self.is_mark_search:
self.cleanup_search()
self.read_mode = "fit_to_customize" self.read_mode = "fit_to_customize"
self.scale_to(min(10, self.scale + 0.2)) self.scale_to(min(10, self.scale + 0.2))
self.update() self.update()
def zoom_out(self): def zoom_out(self):
if self.is_mark_search:
self.cleanup_search()
self.read_mode = "fit_to_customize" self.read_mode = "fit_to_customize"
self.scale_to(max(1, self.scale - 0.2)) self.scale_to(max(1, self.scale - 0.2))
self.update() self.update()
def zoom_reset(self): def zoom_reset(self):
if self.is_mark_search:
self.cleanup_search()
self.read_mode = "fit_to_width" self.read_mode = "fit_to_width"
self.update_scale() self.update_scale()
self.update() self.update()
@ -544,9 +549,9 @@ class PdfViewerWidget(QWidget):
self.jump_to_page(link["page"] + 1) self.jump_to_page(link["page"] + 1)
self.delete_all_mark_jump_link_tips() self.delete_all_mark_jump_link_tips()
self.update() self.update()
self.message_to_emacs.emit("EAF PDF Viewer - Landed on Page " + str(link["page"] + 1)) self.message_to_emacs.emit("EAF PDF - Landed on Page " + str(link["page"] + 1))
def clean_links(self): def cleanup_links(self):
self.is_mark_link = False self.is_mark_link = False
self.delete_all_mark_jump_link_tips() self.delete_all_mark_jump_link_tips()
self.page_cache_pixmap_dict.clear() self.page_cache_pixmap_dict.clear()
@ -566,7 +571,7 @@ class PdfViewerWidget(QWidget):
return page return page
def search_text(self, text): def search_text(self, text):
self.search_flag = True self.is_mark_search = True
self.search_term = text self.search_term = text
self.page_cache_pixmap_dict.clear() self.page_cache_pixmap_dict.clear()
@ -584,31 +589,32 @@ class PdfViewerWidget(QWidget):
search_text_index += 1 search_text_index += 1
self.update() self.update()
if(len(self.search_text_offset_list) == 0): if(len(self.search_text_offset_list) == 0):
self.message_to_emacs.emit("EAF PDF Viewer - No results found with \"" + text + "\".") self.message_to_emacs.emit("EAF PDF - No results found with \"" + text + "\".")
self.is_mark_search = False
else: else:
self.jump_next_match() self.update_scroll_offset(self.search_text_offset_list[self.search_text_index])
self.message_to_emacs.emit("EAF PDF Viewer - Found " + str(len(self.search_text_offset_list)) + " results with \"" + text + "\".") self.message_to_emacs.emit("EAF PDF - Found " + str(len(self.search_text_offset_list)) + " results with \"" + text + "\".")
def jump_next_match(self): def jump_next_match(self):
if len(self.search_text_offset_list) > 0: if len(self.search_text_offset_list) > 0:
self.search_text_index = (self.search_text_index + 1) % len(self.search_text_offset_list) self.search_text_index = (self.search_text_index + 1) % len(self.search_text_offset_list)
self.update_scroll_offset(self.search_text_offset_list[self.search_text_index]) self.update_scroll_offset(self.search_text_offset_list[self.search_text_index])
self.message_to_emacs.emit("EAF PDF Viewer - Match " + str(self.search_text_index + 1) + "/" + str(len(self.search_text_offset_list))) self.message_to_emacs.emit("EAF PDF - Match " + str(self.search_text_index + 1) + "/" + str(len(self.search_text_offset_list)))
def jump_last_match(self): def jump_last_match(self):
if len(self.search_text_offset_list) > 0: if len(self.search_text_offset_list) > 0:
self.search_text_index = (self.search_text_index - 1) % len(self.search_text_offset_list) self.search_text_index = (self.search_text_index - 1) % len(self.search_text_offset_list)
self.update_scroll_offset(self.search_text_offset_list[self.search_text_index]) self.update_scroll_offset(self.search_text_offset_list[self.search_text_index])
self.message_to_emacs.emit("EAF PDF Viewer - Match " + str(self.search_text_index + 1) + "/" + str(len(self.search_text_offset_list))) self.message_to_emacs.emit("EAF PDF - Match " + str(self.search_text_index + 1) + "/" + str(len(self.search_text_offset_list)))
def remove_marked_search_text(self): def cleanup_search(self):
self.message_to_emacs.emit("EAF PDF Viewer - Unmarked all matched results.") self.message_to_emacs.emit("EAF PDF - Unmarked all matched results.")
if self.search_text_annot_cache_dict: if self.search_text_annot_cache_dict:
for page_index in self.search_text_annot_cache_dict.keys(): for page_index in self.search_text_annot_cache_dict.keys():
page = self.document[page_index] page = self.document[page_index]
for annot in self.search_text_annot_cache_dict[page_index]: for annot in self.search_text_annot_cache_dict[page_index]:
page.deleteAnnot(annot) page.deleteAnnot(annot)
self.search_flag = False self.is_mark_search = False
self.search_term = None self.search_term = None
self.search_text_annot_cache_dict.clear() self.search_text_annot_cache_dict.clear()
self.page_cache_pixmap_dict.clear() self.page_cache_pixmap_dict.clear()

Write Preview
Loading…
Cancel
Save