mirrors/LimeReport
0
0
Fork 0
mirror of https://github.com/fralx/LimeReport.git synced 2024-12-25 17:14:40 +03:00
Code

Splitting has been fixed

Browse Source
This commit is contained in:
Arin Alexander 2017-12-07 02:39:23 +03:00
commit 71913801a8
1 changed files with 30 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
limereport/items/lrtextitem.cpp
View File

@ -807,43 +807,59 @@ bool TextItem::canBeSplitted(int height) const
QString TextItem::getTextPart(int height, int skipHeight){ QString TextItem::getTextPart(int height, int skipHeight){
int linesHeight = 0; int linesHeight = 0;
int curLine = 0; int curLine = 0;
int textPos = 0; // int textPos = 0;
TextPtr text = textDocument(); TextPtr text = textDocument();
text->documentLayout(); text->size().height();
QTextCursor cursor(text.data());
cursor.movePosition(QTextCursor::Start);
QTextBlock curBlock = text->begin(); QTextBlock curBlock = text->begin();
QString resultText = ""; QString resultText = "";
if (skipHeight > 0){ if (skipHeight > 0){
for (;curBlock != text->end(); curBlock=curBlock.next()){ for (;curBlock != text->end() || curLine<=curBlock.lineCount(); curBlock = curBlock.next(), curLine = 0){
for (curLine = 0; curLine < curBlock.layout()->lineCount(); curLine++){ linesHeight+=curBlock.blockFormat().topMargin();
linesHeight += curBlock.layout()->lineAt(curLine).height() + lineSpacing(); for (;curLine < curBlock.layout()->lineCount(); curLine++){
linesHeight += curBlock.layout()->lineAt(curLine).rect().height() + lineSpacing();
if (linesHeight > (skipHeight-(/*fakeMarginSize()*2+*/borderLineSize() * 2))) {goto loop_exit;} if (linesHeight > (skipHeight-(/*fakeMarginSize()*2+*/borderLineSize() * 2))) {goto loop_exit;}
cursor.movePosition(QTextCursor::Right, QTextCursor::MoveAnchor, curBlock.layout()->lineAt(curLine).textLength());
} }
} }
loop_exit:; loop_exit: cursor.movePosition(QTextCursor::EndOfLine, QTextCursor::MoveAnchor);
} }
linesHeight = 0; linesHeight = 0;
for (;curBlock != text->end() || curLine<curBlock.lineCount(); curBlock = curBlock.next(), curLine = 0, resultText += '\n'){ for (;curBlock != text->end() || curLine<curBlock.lineCount(); curBlock = curBlock.next(), curLine = 0, resultText += '\n')
for (; curLine<curBlock.layout()->lineCount(); curLine++){ {
if (resultText == "") textPos= curBlock.layout()->lineAt(curLine).textStart(); linesHeight+=curBlock.blockFormat().topMargin();
for (; curLine < curBlock.layout()->lineCount(); curLine++){
// if (resultText == "") textPos = curBlock.layout()->lineAt(curLine).textStart();
linesHeight += curBlock.layout()->lineAt(curLine).height() + lineSpacing(); linesHeight += curBlock.layout()->lineAt(curLine).height() + lineSpacing();
if ( (height>0) && (linesHeight>(height-(/*fakeMarginSize()*2+*/borderLineSize()*2))) ) { if ( (height>0) && (linesHeight>(height-(/*fakeMarginSize()*2+*/borderLineSize()*2))) ) {
linesHeight-=curBlock.layout()->lineAt(curLine).height(); linesHeight-=curBlock.layout()->lineAt(curLine).height();
goto loop_exit1; goto loop_exit1;
} }
resultText+=curBlock.text().mid(curBlock.layout()->lineAt(curLine).textStart(), // QString fragment = curBlock.text().mid(curBlock.layout()->lineAt(curLine).textStart(),
curBlock.layout()->lineAt(curLine).textLength()); // curBlock.layout()->lineAt(curLine).textLength());
// resultText+=fragment;
cursor.movePosition(QTextCursor::Right, QTextCursor::KeepAnchor, curBlock.layout()->lineAt(curLine).textLength());
} }
} }
loop_exit1:; loop_exit1:;
cursor.movePosition(QTextCursor::EndOfLine, QTextCursor::KeepAnchor);
if (allowHTML()){
resultText = cursor.selection().toHtml();
resultText.remove("<!--StartFragment-->");
resultText.remove("<!--EndFragment-->");
} else {
resultText = cursor.selection().toPlainText();
}
resultText.chop(1); // resultText.chop(1);
QScopedPointer<HtmlContext> context(new HtmlContext(m_strText)); // QScopedPointer<HtmlContext> context(new HtmlContext(m_strText));
return context->extendTextByTags(resultText,textPos); return resultText;//context->extendTextByTags(resultText,textPos);
} }
void TextItem::restoreLinksEvent() void TextItem::restoreLinksEvent()