pull/387/head
chrox 11 years ago
parent ecd8949e85
commit 2fd66e1fa3

@ -727,10 +727,11 @@ function KoptInterface:nativeToReflowPosTransform(doc, pageno, pos)
local kctx_hash = "kctx|"..context_hash local kctx_hash = "kctx|"..context_hash
local cached = Cache:check(kctx_hash) local cached = Cache:check(kctx_hash)
local kc = self:waitForContext(cached.kctx) local kc = self:waitForContext(cached.kctx)
local x, y = kc:nativeToReflowPosTransform(pos.x, pos.y) --DEBUG("transform native pos", pos)
if x ~= nil and y ~= nil then local rpos = {}
return {x=x, y=y} rpos.x, rpos.y = kc:nativeToReflowPosTransform(pos.x, pos.y)
end --DEBUG("transformed reflowed pos", rpos)
return rpos
end end
--[[ --[[
@ -743,7 +744,7 @@ function KoptInterface:reflowToNativePosTransform(doc, pageno, abs_pos, rel_pos)
local cached = Cache:check(kctx_hash) local cached = Cache:check(kctx_hash)
local kc = self:waitForContext(cached.kctx) local kc = self:waitForContext(cached.kctx)
--kc:setDebug() --kc:setDebug()
--DEBUG("transform reflowed pos", pos) --DEBUG("transform reflowed pos", abs_pos, rel_pos)
local npos = {} local npos = {}
npos.x, npos.y = kc:reflowToNativePosTransform(abs_pos.x, abs_pos.y, rel_pos.x, rel_pos.y) npos.x, npos.y = kc:reflowToNativePosTransform(abs_pos.x, abs_pos.y, rel_pos.x, rel_pos.y)
--DEBUG("transformed native pos", npos) --DEBUG("transformed native pos", npos)
@ -782,9 +783,12 @@ function KoptInterface:getTextFromReflowPositions(doc, native_boxes, pos0, pos1)
local reflowed_pos_rel0 = getBoxRelativePosition(scratch_reflowed_word_box0.box, reflowed_word_box0.box) local reflowed_pos_rel0 = getBoxRelativePosition(scratch_reflowed_word_box0.box, reflowed_word_box0.box)
local reflowed_pos_abs1 = scratch_reflowed_word_box1.box:center() local reflowed_pos_abs1 = scratch_reflowed_word_box1.box:center()
local reflowed_pos_rel1 = getBoxRelativePosition(scratch_reflowed_word_box1.box, reflowed_word_box1.box) local reflowed_pos_rel1 = getBoxRelativePosition(scratch_reflowed_word_box1.box, reflowed_word_box1.box)
--DEBUG("absolute positions", reflowed_pos_abs0, reflowed_pos_abs1)
--DEBUG("relative positions", reflowed_pos_rel0, reflowed_pos_rel1)
local native_pos0 = self:reflowToNativePosTransform(doc, pageno, reflowed_pos_abs0, reflowed_pos_rel0) local native_pos0 = self:reflowToNativePosTransform(doc, pageno, reflowed_pos_abs0, reflowed_pos_rel0)
local native_pos1 = self:reflowToNativePosTransform(doc, pageno, reflowed_pos_abs1, reflowed_pos_rel1) local native_pos1 = self:reflowToNativePosTransform(doc, pageno, reflowed_pos_abs1, reflowed_pos_rel1)
--DEBUG("native positions", native_pos0, native_pos1)
local reflowed_text_boxes = self:getTextFromBoxes(reflowed_page_boxes, pos0, pos1) local reflowed_text_boxes = self:getTextFromBoxes(reflowed_page_boxes, pos0, pos1)
local native_text_boxes = self:getTextFromBoxes(native_boxes, native_pos0, native_pos1) local native_text_boxes = self:getTextFromBoxes(native_boxes, native_pos0, native_pos1)

@ -321,7 +321,7 @@ function ReaderHighlight:saveHighlight()
hl_item["text"] = self.selected_text.text hl_item["text"] = self.selected_text.text
hl_item["pos0"] = self.selected_text.pos0 hl_item["pos0"] = self.selected_text.pos0
hl_item["pos1"] = self.selected_text.pos1 hl_item["pos1"] = self.selected_text.pos1
hl_item["datetime"] = os.date("%Y-%m-%d %H:%M:%S"), hl_item["datetime"] = os.date("%Y-%m-%d %H:%M:%S")
table.insert(self.view.highlight.saved[page], hl_item) table.insert(self.view.highlight.saved[page], hl_item)
if self.selected_text.text ~= "" then if self.selected_text.text ~= "" then
self:exportToClippings(page, hl_item) self:exportToClippings(page, hl_item)

Loading…
Cancel
Save