mirrors/LimeReport
0
0
Fork 0
mirror of https://github.com/fralx/LimeReport.git synced 2025-01-12 01:21:03 +03:00
Code

Merge branch 'master' into develop

Browse Source 
# Conflicts:
#	limereport/lrreportrender.cpp
#	limereport/lrreportrender.h
This commit is contained in:
Arin Alexander 2017-06-13 19:05:15 +03:00
commit 4c791e607c
2 changed files with 87 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
limereport/lrreportrender.cpp
View File

@ -289,11 +289,24 @@ void ReportRender::clearPageMap()
m_renderedPages.clear(); m_renderedPages.clear();
} }
void ReportRender::extractGroupsFunction(BandDesignIntf *band) bool ReportRender::containsGroupFunctions(BandDesignIntf *band){
{
foreach(BaseDesignIntf* item,band->childBaseItems()){ foreach(BaseDesignIntf* item,band->childBaseItems()){
ContentItemDesignIntf* contentItem = dynamic_cast<ContentItemDesignIntf*>(item); ContentItemDesignIntf* contentItem = dynamic_cast<ContentItemDesignIntf*>(item);
if (contentItem&&(contentItem->content().contains(QRegExp("\\$S\\s*\\{.*\\}")))){ if (contentItem){
QString content = contentItem->content();
foreach(QString functionName, m_datasources->groupFunctionNames()){
QRegExp rx(QString(Const::GROUP_FUNCTION_RX).arg(functionName));
if (rx.indexIn(content)>=0){
return true;
}
}
}
}
return false;
}
void ReportRender::extractGroupFuntionsFromItem(ContentItemDesignIntf* contentItem, BandDesignIntf* band){
if ( contentItem && contentItem->content().contains(QRegExp("\\$S\\s*\\{.*\\}"))){
foreach(const QString &functionName, m_datasources->groupFunctionNames()){ foreach(const QString &functionName, m_datasources->groupFunctionNames()){
QRegExp rx(QString(Const::GROUP_FUNCTION_RX).arg(functionName)); QRegExp rx(QString(Const::GROUP_FUNCTION_RX).arg(functionName));
QRegExp rxName(QString(Const::GROUP_FUNCTION_NAME_RX).arg(functionName)); QRegExp rxName(QString(Const::GROUP_FUNCTION_NAME_RX).arg(functionName));
@ -322,29 +335,24 @@ void ReportRender::extractGroupsFunction(BandDesignIntf *band)
} }
} }
} }
}
} }
bool ReportRender::containsGroupsFunction(BandDesignIntf *band){ void ReportRender::extractGroupFunctionsFromContainer(BaseDesignIntf* baseItem, BandDesignIntf* band){
foreach(BaseDesignIntf* item,band->childBaseItems()){ foreach (BaseDesignIntf* item, baseItem->childBaseItems()) {
ContentItemDesignIntf* contentItem = dynamic_cast<ContentItemDesignIntf*>(item); ContentItemDesignIntf* contentItem = dynamic_cast<ContentItemDesignIntf*>(item);
if (contentItem){ if (contentItem) extractGroupFuntionsFromItem(contentItem, band);
QString content = contentItem->content(); else extractGroupFunctionsFromContainer(item, band);
foreach(QString functionName, m_datasources->groupFunctionNames()){
QRegExp rx(QString(Const::GROUP_FUNCTION_RX).arg(functionName));
if (rx.indexIn(content)>=0){
return true;
} }
}
}
}
return false;
} }
void ReportRender::replaceGroupsFunction(BandDesignIntf *band) void ReportRender::extractGroupFunctions(BandDesignIntf *band)
{ {
foreach(BaseDesignIntf* item,band->childBaseItems()){ extractGroupFunctionsFromContainer(band, band);
ContentItemDesignIntf* contentItem = dynamic_cast<ContentItemDesignIntf*>(item); }
void ReportRender::replaceGroupFunctionsInItem(ContentItemDesignIntf* contentItem, BandDesignIntf* band){
if (contentItem){ if (contentItem){
QString content = contentItem->content(); QString content = contentItem->content();
foreach(const QString &functionName, m_datasources->groupFunctionNames()){ foreach(const QString &functionName, m_datasources->groupFunctionNames()){
@ -363,9 +371,22 @@ void ReportRender::replaceGroupsFunction(BandDesignIntf *band)
} }
} }
} }
}
void ReportRender::replaceGroupFunctionsInContainer(BaseDesignIntf* baseItem, BandDesignIntf* band)
{
foreach(BaseDesignIntf* item, baseItem->childBaseItems()){
ContentItemDesignIntf* contentItem = dynamic_cast<ContentItemDesignIntf*>(item);
if (contentItem) replaceGroupFunctionsInItem(contentItem, band);
else replaceGroupFunctionsInContainer(item, band);
} }
} }
void ReportRender::replaceGroupsFunction(BandDesignIntf *band)
{
replaceGroupFunctionsInContainer(band, band);
}
BandDesignIntf* ReportRender::renderBand(BandDesignIntf *patternBand, BandDesignIntf* bandData, ReportRender::DataRenderMode mode, bool isLast) BandDesignIntf* ReportRender::renderBand(BandDesignIntf *patternBand, BandDesignIntf* bandData, ReportRender::DataRenderMode mode, bool isLast)
{ {
QApplication::processEvents(); QApplication::processEvents();
@ -681,7 +702,7 @@ void ReportRender::renderDataHeader(BandDesignIntf *header)
{ {
recalcIfNeeded(header); recalcIfNeeded(header);
BandDesignIntf* renderedHeader = renderBand(header, 0); BandDesignIntf* renderedHeader = renderBand(header, 0);
if (containsGroupsFunction(header)) if (containsGroupFunctions(header))
m_recalcBands.append(renderedHeader); m_recalcBands.append(renderedHeader);
} }
@ -725,7 +746,7 @@ void ReportRender::renderGroupHeader(BandDesignIntf *parentBand, IDataSource* da
} else { } else {
renderedHeader = renderBand(band, 0, StartNewPageAsNeeded); renderedHeader = renderBand(band, 0, StartNewPageAsNeeded);
} }
if (containsGroupsFunction(band)) if (containsGroupFunctions(band))
m_recalcBands.append(renderedHeader); m_recalcBands.append(renderedHeader);
} }
@ -764,11 +785,11 @@ void ReportRender::initGroups()
{ {
m_datasources->clearGroupFunction(); m_datasources->clearGroupFunction();
foreach(BandDesignIntf* band, m_patternPageItem->childBands()){ foreach(BandDesignIntf* band, m_patternPageItem->childBands()){
if (band->isFooter()) extractGroupsFunction(band); if (band->isFooter()) extractGroupFunctions(band);
if (band->isHeader()){ if (band->isHeader()){
IGroupBand* gb = dynamic_cast<IGroupBand*>(band); IGroupBand* gb = dynamic_cast<IGroupBand*>(band);
if (gb) gb->closeGroup(); if (gb) gb->closeGroup();
extractGroupsFunction(band); extractGroupFunctions(band);
} }
} }
} }

10
limereport/lrreportrender.h
View File

@ -40,6 +40,7 @@ namespace LimeReport{
class PageDesignIntf; class PageDesignIntf;
class BandDesignIntf; class BandDesignIntf;
class ContentItemDesignIntf;
class GroupBandsHolder: public QList<BandDesignIntf*>{ class GroupBandsHolder: public QList<BandDesignIntf*>{
public: public:
@ -112,8 +113,12 @@ private:
qreal calcPageFooterHeight(PageItemDesignIntf* patternPage); qreal calcPageFooterHeight(PageItemDesignIntf* patternPage);
qreal calcSlicePercent(qreal height); qreal calcSlicePercent(qreal height);
bool containsGroupsFunction(BandDesignIntf* band); bool containsGroupFunctions(BandDesignIntf* band);
void extractGroupsFunction(BandDesignIntf* band); void extractGroupFuntionsFromItem(ContentItemDesignIntf* contentItem, BandDesignIntf* band);
void extractGroupFunctionsFromContainer(BaseDesignIntf* baseItem, BandDesignIntf* band);
void extractGroupFunctions(BandDesignIntf* band);
void replaceGroupFunctionsInItem(ContentItemDesignIntf* contentItem, BandDesignIntf* band);
void replaceGroupFunctionsInContainer(BaseDesignIntf* baseItem, BandDesignIntf* band);
void replaceGroupsFunction(BandDesignIntf* band); void replaceGroupsFunction(BandDesignIntf* band);
BandDesignIntf *findRecalcableBand(BandDesignIntf *patternBand); BandDesignIntf *findRecalcableBand(BandDesignIntf *patternBand);
@ -183,6 +188,7 @@ private:
QVector<BandDesignIntf*> m_columnedBandItems; QVector<BandDesignIntf*> m_columnedBandItems;
unsigned long long m_curentNameIndex; unsigned long long m_curentNameIndex;
}; };
} // namespace LimeReport } // namespace LimeReport
#endif // LRREPORTRENDER_H #endif // LRREPORTRENDER_H