fenix/PDF4QT
1
0
Fork 0
mirror of https://github.com/JakubMelka/PDF4QT.git synced 2025-06-05 21:59:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

XFA: bugfixing, exclusion group

Browse Source
This commit is contained in:
Jakub Melka
2021-12-05 14:38:20 +01:00
parent ac7519df22
commit f5131dc7ed
1 changed files with 167 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

151
Pdf4QtLib/sources/pdfxfaengine.cpp
View File

@ -9792,6 +9792,7 @@ public:
virtual void visit(const xfa::XFA_area* node) override;
virtual void visit(const xfa::XFA_draw* node) override;
virtual void visit(const xfa::XFA_field* node) override;
virtual void visit(const xfa::XFA_exclGroup* node) override;
void performLayout(PDFXFAEngineImpl* engine, const xfa::XFA_template* node);
@ -9812,7 +9813,6 @@ private:
PDFInteger getCurrentPageIndex() const { return isCurrentPageValid() ? m_pages[m_currentPageIndex].pageIndex : -1; }
void handleMargin(const xfa::XFA_margin* margin);
void handleBorder(const xfa::XFA_border* border);
void handlePara(const xfa::XFA_para* para);
void handleFont(const xfa::XFA_font* font);
@ -9944,7 +9944,8 @@ private:
{
xfa::XFA_BaseNode::PRESENCE presence = xfa::XFA_BaseNode::PRESENCE::Visible;
xfa::XFA_BaseNode::ANCHORTYPE anchorType = xfa::XFA_BaseNode::ANCHORTYPE::TopLeft;
const xfa::XFA_border* border = nullptr;
const xfa::XFA_subform* nodeSubform = nullptr;
const xfa::XFA_exclGroup* nodeExclGroup = nullptr;
const xfa::XFA_area* nodeArea = nullptr;
const xfa::XFA_caption* nodeCaption = nullptr;
xfa::XFA_ParagraphSettings paragraphSettings;
@ -10180,59 +10181,17 @@ void PDFXFALayoutEngine::layoutFlow(LayoutParameters& layoutParameters)
return;
}
std::map<size_t, std::vector<Layout>> layoutsPerPage;
for (Layout& layout : layoutParameters.layout)
{
layoutsPerPage[layout.pageIndex].emplace_back(std::move(layout));
}
layoutParameters.layout.clear();
QMarginsF captionMargins = getCaptionMargins(layoutParameters);
for (auto& item : layoutsPerPage)
{
const size_t pageIndex = item.first;
std::vector<Layout> layouts = std::move(item.second);
for (Layout& layout : layouts)
{
layout.updatePresence(layoutParameters.presence);
}
switch (layoutParameters.layoutType)
{
case xfa::XFA_BaseNode::LAYOUT::Position:
// Do nothing - positional layout is done elsewhere
break;
case xfa::XFA_BaseNode::LAYOUT::Lr_tb:
break;
case xfa::XFA_BaseNode::LAYOUT::Rl_row:
{
std::reverse(layouts.begin(), layouts.end());
layoutParameters.tableRows.emplace_back(std::move(layouts));
break;
}
case xfa::XFA_BaseNode::LAYOUT::Rl_tb:
break;
case xfa::XFA_BaseNode::LAYOUT::Row:
{
layoutParameters.tableRows.emplace_back(std::move(layouts));
break;
}
case xfa::XFA_BaseNode::LAYOUT::Table:
if (layoutParameters.layoutType == xfa::XFA_BaseNode::LAYOUT::Table)
{
if (layoutParameters.tableRows.empty())
{
// No table to lay out
break;
return;
}
size_t pageIndex = 0;
std::vector<PDFReal> rowHeights(layoutParameters.tableRows.size(), 0.0);
std::vector<PDFReal> columnWidths;
@ -10251,6 +10210,7 @@ void PDFXFALayoutEngine::layoutFlow(LayoutParameters& layoutParameters)
{
const PDFReal cellHeight = row[columnIndex].nominalExtent.height();
const PDFReal cellWidth = row[columnIndex].nominalExtent.width();
pageIndex = row[columnIndex].pageIndex;
if (rowHeights[rowIndex] < cellHeight)
{
rowHeights[rowIndex] = cellHeight;
@ -10339,6 +10299,55 @@ void PDFXFALayoutEngine::layoutFlow(LayoutParameters& layoutParameters)
layoutParameters.layout.emplace_back(std::move(finalLayout));
}
return;
}
std::map<size_t, std::vector<Layout>> layoutsPerPage;
for (Layout& layout : layoutParameters.layout)
{
layoutsPerPage[layout.pageIndex].emplace_back(std::move(layout));
}
layoutParameters.layout.clear();
for (auto& item : layoutsPerPage)
{
const size_t pageIndex = item.first;
std::vector<Layout> layouts = std::move(item.second);
for (Layout& layout : layouts)
{
layout.updatePresence(layoutParameters.presence);
}
switch (layoutParameters.layoutType)
{
case xfa::XFA_BaseNode::LAYOUT::Position:
// Do nothing - positional layout is done elsewhere
break;
case xfa::XFA_BaseNode::LAYOUT::Lr_tb:
break;
case xfa::XFA_BaseNode::LAYOUT::Rl_row:
{
std::reverse(layouts.begin(), layouts.end());
layoutParameters.tableRows.emplace_back(std::move(layouts));
break;
}
case xfa::XFA_BaseNode::LAYOUT::Rl_tb:
break;
case xfa::XFA_BaseNode::LAYOUT::Row:
{
layoutParameters.tableRows.emplace_back(std::move(layouts));
break;
}
case xfa::XFA_BaseNode::LAYOUT::Table:
{
Q_ASSERT(false);
break;
}
@ -10528,6 +10537,7 @@ void PDFXFALayoutEngine::visit(const xfa::XFA_draw* node)
layout.items.back().presence = node->getPresence();
layout.items.back().draw = node;
layout.items.back().captionParagraphSettingsIndex = handleCaption(node->getCaption());
layout.colSpan = parameters.columnSpan;
parameters.layout.emplace_back(std::move(layout));
}
@ -10565,6 +10575,7 @@ void PDFXFALayoutEngine::visit(const xfa::XFA_field* node)
parameters.presence = node->getPresence();
parameters.sizeInfo = sizeInfo;
parameters.nodeCaption = node->getCaption();
parameters.columnSpan = node->getColSpan();
handlePara(node->getPara());
handleFont(node->getFont());
@ -10573,6 +10584,7 @@ void PDFXFALayoutEngine::visit(const xfa::XFA_field* node)
layout.items.back().presence = node->getPresence();
layout.items.back().field = node;
layout.items.back().captionParagraphSettingsIndex = handleCaption(node->getCaption());
layout.colSpan = parameters.columnSpan;
parameters.layout.emplace_back(std::move(layout));
}
@ -10773,6 +10785,8 @@ void PDFXFALayoutEngine::visit(const xfa::XFA_subform* node)
parameters.sizeInfo = sizeInfo;
parameters.layoutType = node->getLayout();
parameters.colWidths = node->getColumnWidths();
parameters.nodeSubform = node;
parameters.columnSpan = node->getColSpan();
// Handle break before
handleBreak(node->getBreak(), true);
@ -10780,7 +10794,6 @@ void PDFXFALayoutEngine::visit(const xfa::XFA_subform* node)
// Handle settings
handlePara(node->getPara());
handleBorder(node->getBorder());
handleMargin(node->getMargin());
// Perform layout, layout subforms so many times
@ -10802,6 +10815,43 @@ void PDFXFALayoutEngine::visit(const xfa::XFA_subform* node)
handleBreak(node->getBreakAfter());
}
void PDFXFALayoutEngine::visit(const xfa::XFA_exclGroup* node)
{
switch (node->getPresence())
{
case xfa::XFA_BaseNode::PRESENCE::Visible:
break;
case xfa::XFA_BaseNode::PRESENCE::Hidden:
case xfa::XFA_BaseNode::PRESENCE::Inactive:
return;
case xfa::XFA_BaseNode::PRESENCE::Invisible:
break;
}
LayoutParametersStackGuard guard(this);
SizeInfo sizeInfo = getSizeInfo(node);
QPointF point = getPointFromMeasurement(node->getX(), node->getY());
LayoutParameters& parameters = getLayoutParameters();
parameters.xOffset = point.x();
parameters.yOffset = point.y();
parameters.anchorType = node->getAnchorType();
parameters.presence = node->getPresence();
parameters.sizeInfo = sizeInfo;
parameters.layoutType = node->getLayout();
parameters.nodeExclGroup = node;
parameters.columnSpan = node->getColSpan();
// Handle settings
handlePara(node->getPara());
handleMargin(node->getMargin());
xfa::XFA_AbstractNode::acceptOrdered(this, node->getField());
}
void PDFXFALayoutEngine::moveToNextArea(ContentAreaScope scope)
{
switch (scope)
@ -10856,11 +10906,6 @@ void PDFXFALayoutEngine::handleMargin(const xfa::XFA_margin* margin)
getLayoutParameters().margins = createMargin(margin);
}
void PDFXFALayoutEngine::handleBorder(const xfa::XFA_border* border)
{
getLayoutParameters().border = border;
}
void PDFXFALayoutEngine::handlePara(const xfa::XFA_para* para)
{
if (!para)