deadcxap/liberama
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Добавлено отображение номера изображения в статусбар

Browse Source
This commit is contained in:
Book Pauk
2020-12-16 01:41:37 +07:00
parent 3dbf00344e
commit 72f8977071
3 changed files with 40 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
client/components/Reader/TextPage/DrawHelper.js
View File

@@ -160,12 +160,13 @@ export default class DrawHelper {
return out; return out;
} }
drawPercentBar(x, y, w, h, font, fontSize, bookPos, textLength) { drawPercentBar(x, y, w, h, font, fontSize, bookPos, textLength, imageNum, imageLength) {
const pad = 3; const pad = 3;
const fh = h - 2*pad; const fh = h - 2*pad;
const fh2 = fh/2; const fh2 = fh/2;
const t1 = `${Math.floor((bookPos + 1)/1000)}/${Math.floor(textLength/1000)}`; const tImg = (imageNum > 0 ? ` (${imageNum}/${imageLength})` : '');
const t1 = `${Math.floor((bookPos + 1)/1000)}/${Math.floor(textLength/1000)}${tImg}`;
const w1 = this.measureTextFont(t1, font) + fh2; const w1 = this.measureTextFont(t1, font) + fh2;
const read = (bookPos + 1)/textLength; const read = (bookPos + 1)/textLength;
const t2 = `${(read*100).toFixed(2)}%`; const t2 = `${(read*100).toFixed(2)}%`;
@@ -188,7 +189,7 @@ export default class DrawHelper {
return out; return out;
} }
drawStatusBar(statusBarTop, statusBarHeight, bookPos, textLength, title) { drawStatusBar(statusBarTop, statusBarHeight, bookPos, textLength, title, imageNum, imageLength) {
let out = `<div class="layout" style="` + let out = `<div class="layout" style="` +
`width: ${this.realWidth}px; height: ${statusBarHeight}px; ` + `width: ${this.realWidth}px; height: ${statusBarHeight}px; ` +
@@ -206,7 +207,7 @@ export default class DrawHelper {
out += this.fillTextShift(this.fittingString(title, this.realWidth/2 - fontSize - 3, font), fontSize, 2, font, fontSize); out += this.fillTextShift(this.fittingString(title, this.realWidth/2 - fontSize - 3, font), fontSize, 2, font, fontSize);
out += this.drawPercentBar(this.realWidth/2, 2, this.realWidth/2 - timeW - 2*fontSize, statusBarHeight, font, fontSize, bookPos, textLength); out += this.drawPercentBar(this.realWidth/2, 2, this.realWidth/2 - timeW - 2*fontSize, statusBarHeight, font, fontSize, bookPos, textLength, imageNum, imageLength);
out += '</div>'; out += '</div>';
return out; return out;

18
client/components/Reader/TextPage/TextPage.vue
View File

@@ -722,8 +722,24 @@ class TextPage extends Vue {
message = this.statusBarMessage; message = this.statusBarMessage;
if (!message) if (!message)
message = this.title; message = this.title;
//check image num
let imageNum = 0;
const len = (lines.length > 2 ? 2 : lines.length);
loop:
for (let j = 0; j < len; j++) {
const line = lines[j];
for (const part of line.parts) {
if (part.image) {
imageNum = part.image.num;
break loop;
}
}
}
//drawing
this.statusBar = this.drawHelper.drawStatusBar(this.statusBarTop, this.statusBarHeight, this.statusBar = this.drawHelper.drawStatusBar(this.statusBarTop, this.statusBarHeight,
lines[i].end, this.parsed.textLength, message); lines[i].end, this.parsed.textLength, message, imageNum, this.parsed.images.length);
this.bookPosSeen = lines[i].end; this.bookPosSeen = lines[i].end;
} }
} else { } else {

31
client/components/Reader/share/BookParser.js
View File

@@ -61,7 +61,7 @@ export default class BookParser {
let inSubtitle = false; let inSubtitle = false;
let sectionLevel = 0; let sectionLevel = 0;
let bodyIndex = 0; let bodyIndex = 0;
let imageIndex = 0; let imageNum = 0;
let paraIndex = -1; let paraIndex = -1;
let paraOffset = 0; let paraOffset = 0;
@@ -206,22 +206,24 @@ export default class BookParser {
const href = attrs.href.value; const href = attrs.href.value;
const {id} = this.imageHrefToId(href); const {id} = this.imageHrefToId(href);
if (href[0] == '#') {//local if (href[0] == '#') {//local
if (inPara && !this.showInlineImagesInCenter && !center) imageNum++;
growParagraph(`<image-inline href="${href}"></image-inline>`, 0);
else
newParagraph(`<image href="${href}">${' '.repeat(maxImageLineCount)}</image>`, maxImageLineCount);
imageIndex++; if (inPara && !this.showInlineImagesInCenter && !center)
this.images.push({paraIndex, num: imageIndex, id}); growParagraph(`<image-inline href="${href}" num="${imageNum}"></image-inline>`, 0);
else
newParagraph(`<image href="${href}" num="${imageNum}">${' '.repeat(maxImageLineCount)}</image>`, maxImageLineCount);
this.images.push({paraIndex, num: imageNum, id});
if (inPara && this.showInlineImagesInCenter) if (inPara && this.showInlineImagesInCenter)
newParagraph(' ', 1); newParagraph(' ', 1);
} else {//external } else {//external
dimPromises.push(getExternalImageDimensions(href)); imageNum++;
newParagraph(`<image href="${href}">${' '.repeat(maxImageLineCount)}</image>`, maxImageLineCount);
imageIndex++; dimPromises.push(getExternalImageDimensions(href));
this.images.push({paraIndex, num: imageIndex, id}); newParagraph(`<image href="${href}" num="${imageNum}">${' '.repeat(maxImageLineCount)}</image>`, maxImageLineCount);
this.images.push({paraIndex, num: imageNum, id});
} }
} }
} }
@@ -574,6 +576,7 @@ export default class BookParser {
if (attrs.href && attrs.href.value) { if (attrs.href && attrs.href.value) {
image = this.imageHrefToId(attrs.href.value); image = this.imageHrefToId(attrs.href.value);
image.inline = false; image.inline = false;
image.num = (attrs.num && attrs.num.value ? attrs.num.value : 0);
} }
break; break;
} }
@@ -582,6 +585,7 @@ export default class BookParser {
if (attrs.href && attrs.href.value) { if (attrs.href && attrs.href.value) {
const img = this.imageHrefToId(attrs.href.value); const img = this.imageHrefToId(attrs.href.value);
img.inline = true; img.inline = true;
img.num = (attrs.num && attrs.num.value ? attrs.num.value : 0);
result.push({ result.push({
style: Object.assign({}, style), style: Object.assign({}, style),
image: img, image: img,
@@ -811,6 +815,7 @@ export default class BookParser {
paraIndex, paraIndex,
w: imageWidth, w: imageWidth,
h: imageHeight, h: imageHeight,
num: part.image.num
}}); }});
lines.push(line); lines.push(line);
line = {begin: line.end + 1, parts: []}; line = {begin: line.end + 1, parts: []};
@@ -821,7 +826,7 @@ export default class BookParser {
line.last = true; line.last = true;
line.parts.push({style, text: ' ', line.parts.push({style, text: ' ',
image: {local: part.image.local, inline: false, id: part.image.id, image: {local: part.image.local, inline: false, id: part.image.id,
imageLine: i, lineCount, paraIndex, w: imageWidth, h: imageHeight} imageLine: i, lineCount, paraIndex, w: imageWidth, h: imageHeight, num: part.image.num}
}); });
continue; continue;
@@ -833,7 +838,7 @@ export default class BookParser {
let imgH = (bin.h > this.fontSize ? this.fontSize : bin.h); let imgH = (bin.h > this.fontSize ? this.fontSize : bin.h);
imgW += bin.w*imgH/bin.h; imgW += bin.w*imgH/bin.h;
line.parts.push({style, text: '', line.parts.push({style, text: '',
image: {local: part.image.local, inline: true, id: part.image.id}}); image: {local: part.image.local, inline: true, id: part.image.id, num: part.image.num}});
} }
} }