python-LimeReport/LimeReport
0
0
Fork 0
mirror of https://github.com/python-LimeReport/LimeReport.git synced 2024-12-25 13:04:38 +03:00
Code Issues Packages Projects Releases Wiki Activity

Spliting band without AutoHeight has been fixed

Browse Source
This commit is contained in:
Arin Alexander 2016-05-17 22:52:53 +04:00
parent f3401c4c7e
commit 80f2a135cd
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
limereport/lrbanddesignintf.h
View File

@ -203,6 +203,9 @@ public:
bool startNewPage() const; bool startNewPage() const;
void setStartNewPage(bool startNewPage); void setStartNewPage(bool startNewPage);
void setAutoHeight(bool value){m_autoHeight=value;}
bool autoHeight(){return m_autoHeight;}
signals: signals:
void bandRendered(BandDesignIntf* band); void bandRendered(BandDesignIntf* band);
protected: protected:
@ -211,11 +214,7 @@ protected:
qreal findMaxBottom(); qreal findMaxBottom();
qreal findMaxHeight(); qreal findMaxHeight();
void trimToMaxHeight(int maxHeight); void trimToMaxHeight(int maxHeight);
void setBandTypeText(const QString& value);
void setAutoHeight(bool value){m_autoHeight=value;}
bool autoHeight(){return m_autoHeight;}
void setBandTypeText(const QString& value);
QString bandTypeText(){return m_bandTypeText;} QString bandTypeText(){return m_bandTypeText;}
void moveDown(){} void moveDown(){}
void moveUp(){} void moveUp(){}

6
limereport/lrreportrender.cpp
View File

@ -741,8 +741,10 @@ BandDesignIntf* ReportRender::sliceBand(BandDesignIntf *band, BandDesignIntf* pa
while (band->height()>m_maxHeightByColumn[m_currentColumn]) { while (band->height()>m_maxHeightByColumn[m_currentColumn]) {
band = saveUppperPartReturnBottom(band,m_maxHeightByColumn[m_currentColumn],patternBand); band = saveUppperPartReturnBottom(band,m_maxHeightByColumn[m_currentColumn],patternBand);
if (!band->isEmpty()) { if (!band->isEmpty()) {
band->setHeight(0); if (band->autoHeight()){
band->updateItemSize(m_datasources); band->setHeight(0);
band->updateItemSize(m_datasources);
}
DataBandDesignIntf* data = dynamic_cast<DataBandDesignIntf*>(band); DataBandDesignIntf* data = dynamic_cast<DataBandDesignIntf*>(band);
if (isLast && data && data->keepFooterTogether() && if (isLast && data && data->keepFooterTogether() &&
band->height()<m_maxHeightByColumn[m_currentColumn] && band->sliceLastRow() band->height()<m_maxHeightByColumn[m_currentColumn] && band->sliceLastRow()