mirrors/LimeReport
0
0
Fork 0
mirror of https://github.com/fralx/LimeReport.git synced 2024-12-25 00:54:39 +03:00
Code

Finish 1.4.95

Browse Source 
# Conflicts:
#	limereport/lrreportrender.cpp
This commit is contained in:
Arin Alexander 2018-07-20 14:10:51 +03:00
commit ba7a786a81
3 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common.pri
View File

@ -105,7 +105,7 @@ RCC_DIR = $${ARCH_DIR}/$${BUILD_TYPE}/rcc
LIMEREPORT_VERSION_MAJOR = 1 LIMEREPORT_VERSION_MAJOR = 1
LIMEREPORT_VERSION_MINOR = 4 LIMEREPORT_VERSION_MINOR = 4
LIMEREPORT_VERSION_RELEASE = 94 LIMEREPORT_VERSION_RELEASE = 95
LIMEREPORT_VERSION = '$${LIMEREPORT_VERSION_MAJOR}.$${LIMEREPORT_VERSION_MINOR}.$${LIMEREPORT_VERSION_RELEASE}' LIMEREPORT_VERSION = '$${LIMEREPORT_VERSION_MAJOR}.$${LIMEREPORT_VERSION_MINOR}.$${LIMEREPORT_VERSION_RELEASE}'
DEFINES *= LIMEREPORT_VERSION_STR=\\\"$${LIMEREPORT_VERSION}\\\" DEFINES *= LIMEREPORT_VERSION_STR=\\\"$${LIMEREPORT_VERSION}\\\"

16
limereport/lrreportrender.cpp
View File

@ -88,11 +88,11 @@ void ReportRender::rearrangeColumnsItems()
{ {
if (isNeedToRearrangeColumnsItems()){ if (isNeedToRearrangeColumnsItems()){
qreal startHeight = columnHeigth(0); qreal startHeight = columnHeigth(0);
int avg = m_columnedBandItems.size()/m_columnedBandItems[0]->columnsCount(); int avg = m_columnedBandItems.size() / m_columnedBandItems[0]->columnsCount();
for (int i=1;i<m_columnedBandItems[0]->columnsCount();++i){ for (int i = 1; i < m_columnedBandItems[0]->columnsCount(); ++i){
if (columnItemsCount(i)<avg){ if (columnItemsCount(i) < avg){
int getCount = avg * (m_columnedBandItems[0]->columnsCount()-i) - columnItemsCount(i); int getCount = avg * (m_columnedBandItems[0]->columnsCount()-i) - columnItemsCount(i);
for (int j=0;j<getCount;++j){ for (int j = 0; j < getCount; ++j){
BandDesignIntf* band = lastColumnItem(i-1); BandDesignIntf* band = lastColumnItem(i-1);
band->setPos(band->pos().x()+band->width(),m_columnedBandItems[0]->pos().y()); band->setPos(band->pos().x()+band->width(),m_columnedBandItems[0]->pos().y());
band->setColumnIndex(i); band->setColumnIndex(i);
@ -148,7 +148,7 @@ void ReportRender::renameChildItems(BaseDesignIntf *item){
ReportRender::ReportRender(QObject *parent) ReportRender::ReportRender(QObject *parent)
:QObject(parent), m_renderPageItem(0), m_pageCount(0), :QObject(parent), m_renderPageItem(0), m_pageCount(0),
m_lastDataBand(0), m_lastRenderedFooter(0), m_currentColumn(0), m_newPageStarted(false), m_renderingFirstTOC(false) m_lastRenderedHeader(0), m_lastDataBand(0), m_lastRenderedFooter(0), m_currentColumn(0), m_newPageStarted(false), m_renderingFirstTOC(false)
{ {
initColumns(); initColumns();
} }
@ -440,6 +440,9 @@ BandDesignIntf* ReportRender::renderBand(BandDesignIntf *patternBand, BandDesign
QCoreApplication::processEvents(); QCoreApplication::processEvents();
if (patternBand){ if (patternBand){
if (patternBand->isHeader())
m_lastRenderedHeader = patternBand;
BandDesignIntf* bandClone = 0; BandDesignIntf* bandClone = 0;
if (bandData){ if (bandData){
@ -499,6 +502,9 @@ BandDesignIntf* ReportRender::renderBand(BandDesignIntf *patternBand, BandDesign
bandClone->columnsFillDirection()==BandDesignIntf::VerticalUniform)) bandClone->columnsFillDirection()==BandDesignIntf::VerticalUniform))
{ {
startNewColumn(); startNewColumn();
if (patternBand->bandHeader() && patternBand->bandHeader()->columnsCount()>1){
renderBand(patternBand->bandHeader(), 0, mode);
}
} else { } else {
savePage(); savePage();
startNewPage(); startNewPage();

1
limereport/lrreportrender.h
View File

@ -183,6 +183,7 @@ private:
qreal m_dataAreaSize; qreal m_dataAreaSize;
qreal m_reportFooterHeight; qreal m_reportFooterHeight;
int m_renderedDataBandCount; int m_renderedDataBandCount;
BandDesignIntf* m_lastRenderedHeader;
BandDesignIntf* m_lastDataBand; BandDesignIntf* m_lastDataBand;
BandDesignIntf* m_lastRenderedFooter; BandDesignIntf* m_lastRenderedFooter;
bool m_renderCanceled; bool m_renderCanceled;