Group functions rendering has been optimized

limereport/lrreportrender.cpp

@@ -189,11 +189,45 @@ void ReportRender::initDatasource(const QString& name){
     }
 }
 
+void ReportRender::analizeItem(ContentItemDesignIntf* contentItem, BandDesignIntf* band){
+    if (contentItem){
+        QString content = contentItem->content();
+        QVector<QString> functions;
+        foreach(const QString &functionName, m_datasources->groupFunctionNames()){
+            QRegExp rx(QString(Const::GROUP_FUNCTION_RX).arg(functionName));
+            rx.setMinimal(true);
+            if (rx.indexIn(content)>=0){
+                functions.append(functionName);
+            }
+        }
+        if (functions.size()>0)
+            m_groupfunctionItems.insert(contentItem->patternName(), functions);
+    }
+}
+
+void ReportRender::analizeContainer(BaseDesignIntf* item, BandDesignIntf* band){
+    foreach(BaseDesignIntf* child, item->childBaseItems()){
+        ContentItemDesignIntf* contentItem = dynamic_cast<ContentItemDesignIntf*>(child);
+        if (contentItem) analizeItem(contentItem, band);
+        else analizeContainer(child, band);
+    }
+}
+
+void ReportRender::analizePage(PageItemDesignIntf* patternPage){
+    foreach(BandDesignIntf* band, patternPage->bands()){
+        if (band->isFooter() || band->isHeader()){
+            analizeContainer(band,band);
+        }
+    }
+}
+
 void ReportRender::renderPage(PageItemDesignIntf* patternPage, bool isTOC, bool /*isFirst*/, bool /*resetPageNumbers*/)
 {
     m_currentNameIndex = 0;
     m_patternPageItem = patternPage;
 
+    analizePage(patternPage);
+
     if (m_patternPageItem->resetPageNumber() && m_pageCount>0 && !isTOC) {
         resetPageNumber(PageReset);
     }
@@ -380,11 +414,11 @@ void ReportRender::extractGroupFunctions(BandDesignIntf *band)
     extractGroupFunctionsFromContainer(band, band);
 }
 
-
 void ReportRender::replaceGroupFunctionsInItem(ContentItemDesignIntf* contentItem, BandDesignIntf* band){
     if (contentItem){
+        if (m_groupfunctionItems.contains(contentItem->patternName())){
             QString content = contentItem->content();
-        foreach(const QString &functionName, m_datasources->groupFunctionNames()){
+            foreach(QString functionName, m_groupfunctionItems.value(contentItem->patternName())){
                 QRegExp rx(QString(Const::GROUP_FUNCTION_RX).arg(functionName));
                 rx.setMinimal(true);
                 if (rx.indexIn(content)>=0){
@@ -405,9 +439,10 @@ void ReportRender::replaceGroupFunctionsInItem(ContentItemDesignIntf* contentIte
                         }
                         pos += rx.matchedLength();
                     }
-                contentItem->setContent(content);
                 }
             }
+            contentItem->setContent(content);
+        }
     }
 }
 

limereport/lrreportrender.h

@@ -82,6 +82,7 @@ private:
     int m_TOCRangeIndex;
 };
 
+
 class ReportRender: public QObject
 {
     Q_OBJECT
@@ -109,6 +110,10 @@ signals:
 public slots:
     void    cancelRender();
 private:
+    void    analizeContainer(BaseDesignIntf *item, BandDesignIntf *band);
+    void    analizeItem(ContentItemDesignIntf *item, BandDesignIntf *band);
+    void    analizePage(PageItemDesignIntf *patternPage);
+
     void    initDatasources();
     void    initDatasource(const QString &name);
     void    initRenderPage();
@@ -193,7 +198,7 @@ private:
     QMultiMap< BandDesignIntf*, GroupBandsHolder* > m_childBands;
     QList<BandDesignIntf*> m_reprintableBands;
     QList<BandDesignIntf*> m_recalcBands;
-
+    QMap<QString, QVector<QString>> m_groupfunctionItems;
     int m_currentIndex;
     int m_pageCount;
 
@@ -217,6 +222,7 @@ private:
     bool            m_newPageStarted;
     bool            m_lostHeadersMoved;
 
+
 };
 } // namespace LimeReport
 #endif // LRREPORTRENDER_H