Band names translation has been fixed

Subdetail header render has been fixed

limereport/lrbanddesignintf.cpp

@@ -145,6 +145,8 @@ BandDesignIntf::BandDesignIntf(BandsType bandType, const QString &xmlTypeName, Q
     m_bandNameLabel->setVisible(false);
     if (scene()) scene()->addItem(m_bandNameLabel);
     m_alternateBackgroundColor = backgroundColor();
+    connect(this, SIGNAL(propertyObjectNameChanged(QString, QString)),
+            this, SLOT(slotPropertyObjectNameChanged(const QString&,const QString&)));
 }
 
 BandDesignIntf::~BandDesignIntf()
@@ -166,7 +168,12 @@ int extractItemIndex(const BaseDesignIntf* item){
 }
 
 QString BandDesignIntf::translateBandName(const BaseDesignIntf* item) const{
+    QString defaultBandName = extractClassName(item->metaObject()->className()).toLatin1()+QString::number(extractItemIndex(item));
+    if (item->objectName().compare(defaultBandName) == 0){
         return tr(extractClassName(item->metaObject()->className()).toLatin1())+QString::number(extractItemIndex(item));
+    } else {
+        return item->objectName();
+    }
 }
 
 void BandDesignIntf::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
@@ -612,7 +619,7 @@ void BandDesignIntf::trimToMaxHeight(int maxHeight)
 
 void BandDesignIntf::setBandTypeText(const QString &value){
     m_bandTypeText=value;
-    m_bandNameLabel->updateLabel();
+    m_bandNameLabel->updateLabel(bandTitle());
 }
 
 QSet<BandDesignIntf::BandsType> BandDesignIntf::groupBands()
@@ -670,7 +677,7 @@ QVariant BandDesignIntf::itemChange(QGraphicsItem::GraphicsItemChange change, co
             m_bandMarker->update(0,0,
                                  m_bandMarker->boundingRect().width(),
                                  m_bandMarker->boundingRect().width());
-            m_bandNameLabel->updateLabel();
+            m_bandNameLabel->updateLabel(bandTitle());
             m_bandNameLabel->setVisible(value.toBool());
 
         }
@@ -724,6 +731,13 @@ void BandDesignIntf::setAlternateBackgroundColor(const QColor &alternateBackgrou
     m_alternateBackgroundColor = alternateBackgroundColor;
 }
 
+void BandDesignIntf::slotPropertyObjectNameChanged(const QString &, const QString& newName)
+{
+    update();
+    if (m_bandNameLabel)
+        m_bandNameLabel->updateLabel(newName);
+}
+
 bool BandDesignIntf::repeatOnEachRow() const
 {
     return m_repeatOnEachRow;
@@ -878,7 +892,7 @@ void BandDesignIntf::updateItemSize(DataSourceManager* dataManager, RenderPass p
 
 void BandDesignIntf::updateBandNameLabel()
 {
-    if (m_bandNameLabel) m_bandNameLabel->updateLabel();
+    if (m_bandNameLabel) m_bandNameLabel->updateLabel(bandTitle());
 }
 
 QColor BandDesignIntf::selectionColor() const
@@ -921,7 +935,7 @@ QRectF BandNameLabel::boundingRect() const
     return m_rect;
 }
 
-void BandNameLabel::updateLabel()
+void BandNameLabel::updateLabel(const QString& bandName)
 {
     QFont font("Arial",7*Const::fontFACTOR,-1,true);
     QFontMetrics fontMetrics(font);
@@ -929,7 +943,7 @@ void BandNameLabel::updateLabel()
     m_rect = QRectF(
                 m_band->pos().x()+10,
                 m_band->pos().y()-(fontMetrics.height()+10),
-                fontMetrics.width(m_band->bandTitle())+20,fontMetrics.height()+10
+                fontMetrics.width(bandName)+20,fontMetrics.height()+10
                 );
     update();
 }

limereport/lrbanddesignintf.h

@@ -74,7 +74,7 @@ public:
     explicit BandNameLabel(BandDesignIntf* band, QGraphicsItem* parent=0);
     void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
     QRectF boundingRect() const;
-    void updateLabel();
+    void updateLabel(const QString &bandName);
     void hoverEnterEvent(QGraphicsSceneHoverEvent *event);
 private:
     QRectF m_rect;
@@ -245,6 +245,7 @@ protected:
     QString translateBandName(const BaseDesignIntf *item) const;
 private slots:
     void childBandDeleted(QObject* band);
+    void slotPropertyObjectNameChanged(const QString&,const QString&);
 private:
     QString                     m_bandTypeText;
     BandsType                   m_bandType;

limereport/lrreportrender.cpp

@@ -430,7 +430,6 @@ BandDesignIntf* ReportRender::renderBand(BandDesignIntf *patternBand, BandDesign
         if (patternBand->isFooter())
             m_lastRenderedFooter = patternBand;
 
-
         bandClone->setBackgroundColor(
                     (datasources()->variable(QLatin1String("line_")+patternBand->objectName().toLower()).toInt() %2 !=0 ?
                          bandClone->backgroundColor():
@@ -505,6 +504,7 @@ void ReportRender::renderDataBand(BandDesignIntf *dataBand)
 
     IDataSource* bandDatasource = 0;
     m_lastRenderedFooter = 0;
+
     if (!dataBand->datasourceName().isEmpty())
        bandDatasource = datasources()->dataSource(dataBand->datasourceName());
 
@@ -524,7 +524,7 @@ void ReportRender::renderDataBand(BandDesignIntf *dataBand)
         if (dataBand->bandHeader() && dataBand->bandHeader()->reprintOnEachPage())
             m_reprintableBands.append(dataBand->bandHeader());
 
-        renderChildHeader(dataBand,PrintNotAlwaysPrintable);
+        //renderChildHeader(dataBand,PrintNotAlwaysPrintable);
         renderGroupHeader(dataBand, bandDatasource, true);
 
         bool firstTime = true;
@@ -658,7 +658,8 @@ void ReportRender::renderChildHeader(BandDesignIntf *parent, BandPrintMode print
         if (band->metaObject()->indexOfProperty("printAlways")>0){
             printAlways=band->property("printAlways").toBool();
         }
-        if (printAlways == (printMode==PrintAlwaysPrintable) )  renderBand(band, 0, StartNewPageAsNeeded);
+        if ((band != m_lastRenderedHeader) && (printAlways == (printMode == PrintAlwaysPrintable)) )
+            renderBand(band, 0, StartNewPageAsNeeded);
     }
 }
 
@@ -682,9 +683,9 @@ void ReportRender::renderChildBands(BandDesignIntf *parentBand)
         if (!band->datasourceName().isEmpty())
             ds = m_datasources->dataSource(band->datasourceName());
         if (ds) ds->first();
-        renderChildHeader(band,PrintAlwaysPrintable);
+        //renderChildHeader(band,PrintAlwaysPrintable);
         renderDataBand(band);
-        renderChildFooter(band,PrintAlwaysPrintable);
+        //renderChildFooter(band,PrintAlwaysPrintable);
         closeFooterGroup(band);
     }
 }