pengjunjie/core
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/core.git synced 2026-04-07 13:55:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Refactoring

Browse Source
This commit is contained in:
Alexey Nagaev
2025-03-26 15:37:33 +03:00
parent b1b4c0e5ff
commit cab887c161
4 changed files with 33 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
DocxRenderer/src/logic/Page.cpp
View File

@ -64,7 +64,6 @@ namespace NSDocxRenderer
m_oCurrVectorGraphics.Clear();
m_oClipVectorGraphics.Clear();
m_arCompleteObjectsXml.clear();
m_arTextLineGroups.clear();
}
CPage::~CPage()
@ -401,10 +400,11 @@ namespace NSDocxRenderer
// analyzing data. can take shapes and set them to nullptr
AnalyzeShapes();
AnalyzeTextLines();
BuildTextLineGroups();
auto text_line_groups = BuildTextLineGroups();
// building final objects
m_arParagraphs = BuildParagraphs();
m_arParagraphs = BuildParagraphs(text_line_groups);
// if (m_bIsBuildTables)
// m_arTables = BuildTables();
@ -1405,10 +1405,10 @@ namespace NSDocxRenderer
}
}
void CPage::BuildTextLineGroups()
std::vector<std::shared_ptr<CTextLineGroup>> CPage::BuildTextLineGroups()
{
if (m_arTextLines.empty())
return;
return {};
double curr_bot = std::numeric_limits<double>::max();
std::vector<std::vector<text_line_ptr_t>> bot_aligned_text_lines;
@ -1427,6 +1427,7 @@ namespace NSDocxRenderer
}
}
std::vector<std::shared_ptr<CTextLineGroup>> text_line_groups;
std::vector<bool> ar_is_group_open;
for (const auto& text_lines : bot_aligned_text_lines)
{
@ -1434,25 +1435,25 @@ namespace NSDocxRenderer
// only 1 [i] to 1 [j] on the same bot position
std::vector<std::vector<bool>> lines_x_groups(text_lines.size());
for (auto& lxg : lines_x_groups)
lxg.resize(m_arTextLineGroups.size());
lxg.resize(text_line_groups.size());
for (size_t i = 0; i < text_lines.size(); ++i)
{
for (size_t j = 0; j < m_arTextLineGroups.size(); ++j)
for (size_t j = 0; j < text_line_groups.size(); ++j)
{
if (!ar_is_group_open[j])
continue;
// line inside of the group
if (CmpOrEqual(text_lines[i]->m_dLeft, m_arTextLineGroups[j]->m_dRight, c_dTHE_SAME_STRING_X_PRECISION_MM) &&
CmpOrEqual(m_arTextLineGroups[j]->m_dLeft, text_lines[i]->m_dRight, c_dTHE_SAME_STRING_X_PRECISION_MM))
if (CmpOrEqual(text_lines[i]->m_dLeft, text_line_groups[j]->m_dRight, c_dTHE_SAME_STRING_X_PRECISION_MM) &&
CmpOrEqual(text_line_groups[j]->m_dLeft, text_lines[i]->m_dRight, c_dTHE_SAME_STRING_X_PRECISION_MM))
{
lines_x_groups[i][j] = true;
}
}
}
for (size_t j = 0; j < m_arTextLineGroups.size(); ++j)
for (size_t j = 0; j < text_line_groups.size(); ++j)
{
size_t lines_counter = 0;
for (size_t i = 0; i < text_lines.size(); ++i)
@ -1469,7 +1470,7 @@ namespace NSDocxRenderer
for (size_t i = 0; i < text_lines.size(); ++i)
{
std::vector<size_t> groups_taken;
for (size_t j = 0; j < m_arTextLineGroups.size(); ++j)
for (size_t j = 0; j < text_line_groups.size(); ++j)
{
if (!ar_is_group_open[j])
continue;
@ -1489,13 +1490,13 @@ namespace NSDocxRenderer
}
else
{
m_arTextLineGroups[groups_taken[0]]->AddTextLine(text_lines[i]);
text_line_groups[groups_taken[0]]->AddTextLine(text_lines[i]);
}
}
for (auto&& group : groups_add_later)
m_arTextLineGroups.push_back(std::move(group));
text_line_groups.push_back(std::move(group));
}
return;
return text_line_groups;
}
void CPage::AnalyzeOverlapLines()
@ -1546,7 +1547,7 @@ namespace NSDocxRenderer
}
}
std::vector<CPage::paragraph_ptr_t> CPage::BuildParagraphs()
std::vector<CPage::paragraph_ptr_t> CPage::BuildParagraphs(const std::vector<std::shared_ptr<CTextLineGroup>>& arTextLineGroups)
{
if (m_arTextLines.empty())
return {};
@ -1892,7 +1893,7 @@ namespace NSDocxRenderer
else if (m_eTextAssociationType == TextAssociationType::tatPlainParagraph ||
m_eTextAssociationType == TextAssociationType::tatParagraphToShape)
{
for (auto& g : m_arTextLineGroups)
for (auto& g : arTextLineGroups)
build_paragraphs(g->m_arTextLines);
}

19
DocxRenderer/src/logic/Page.h
View File

@ -100,8 +100,11 @@ namespace NSDocxRenderer
// returns std::vector of text lines builded from m_arConts
std::vector<text_line_ptr_t> BuildTextLines(const std::vector<cont_ptr_t>& arConts);
// build text line groups
std::vector<std::shared_ptr<CTextLineGroup>> BuildTextLineGroups();
// returns std::vector of paragraphs builded from m_arTextLines
std::vector<paragraph_ptr_t> BuildParagraphs();
std::vector<paragraph_ptr_t> BuildParagraphs(const std::vector<std::shared_ptr<CTextLineGroup>>& arTextLineGroups);
// returns std::vector of tables builded from shapes and paragraphes
std::vector<table_ptr_t> BuildTables();
@ -121,9 +124,6 @@ namespace NSDocxRenderer
// analyze m_arTextLines and add effects, adds diac, super-sub scripts etc.
void AnalyzeTextLines();
// build text line groups
void BuildTextLineGroups();
// analyze drop caps (creates shapes)
void AnalyzeDropCaps();
@ -197,12 +197,11 @@ namespace NSDocxRenderer
CContTextBuilder m_oContBuilder;
CHorVerLinesCollector m_oHorVerLinesCollector;
std::vector<shape_ptr_t> m_arShapes;
std::vector<text_line_ptr_t> m_arTextLines;
std::vector<group_text_line_ptr_t> m_arTextLineGroups;
std::vector<paragraph_ptr_t> m_arParagraphs;
std::vector<table_ptr_t> m_arTables;
std::vector<ooxml_item_ptr_t> m_arOutputObjects;
std::vector<shape_ptr_t> m_arShapes;
std::vector<text_line_ptr_t> m_arTextLines;
std::vector<paragraph_ptr_t> m_arParagraphs;
std::vector<table_ptr_t> m_arTables;
std::vector<ooxml_item_ptr_t> m_arOutputObjects;
std::vector<std::wstring> m_arCompleteObjectsXml;

6
DocxRenderer/src/logic/elements/Table.cpp
View File

@ -209,4 +209,10 @@ namespace NSDocxRenderer
return m_arRows.empty();
}
void CTextCell::AddTextLine(const std::shared_ptr<CTextLine>& pTextLine)
{
CBaseItem::RecalcWithNewItem(pTextLine.get());
m_arTextLines.push_back(pTextLine);
}
} // namespace NSDocxRenderer

1
DocxRenderer/src/logic/elements/Table.h
View File

@ -103,6 +103,7 @@ namespace NSDocxRenderer
class CTextCell : public CBaseItem
{
public:
void AddTextLine(const std::shared_ptr<CTextLine>& pTextLine);
std::vector<std::shared_ptr<CTextLine>> m_arTextLines;
};
} // namespace NSDocxRenderer