mirror of
https://github.com/python-LimeReport/LimeReport.git
synced 2024-12-24 04:33:03 +03:00
Finish 1.5.78
This commit is contained in:
commit
175ef4edae
@ -133,7 +133,7 @@ RCC_DIR = $${ARCH_DIR}/$${BUILD_TYPE}/rcc
|
|||||||
|
|
||||||
LIMEREPORT_VERSION_MAJOR = 1
|
LIMEREPORT_VERSION_MAJOR = 1
|
||||||
LIMEREPORT_VERSION_MINOR = 5
|
LIMEREPORT_VERSION_MINOR = 5
|
||||||
LIMEREPORT_VERSION_RELEASE = 76
|
LIMEREPORT_VERSION_RELEASE = 78
|
||||||
|
|
||||||
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}\\\"
|
||||||
|
@ -274,8 +274,8 @@ public:
|
|||||||
bool isNeedUpdateSize(RenderPass) const;
|
bool isNeedUpdateSize(RenderPass) const;
|
||||||
void copyBandAttributes(BandDesignIntf* source);
|
void copyBandAttributes(BandDesignIntf* source);
|
||||||
signals:
|
signals:
|
||||||
void bandRendered(LimeReport::BandDesignIntf* band);
|
void bandRendered(BandDesignIntf* band);
|
||||||
void bandReRendered(LimeReport::BandDesignIntf* oldBand, LimeReport::BandDesignIntf* newBand);
|
void bandReRendered(BandDesignIntf* oldBand, BandDesignIntf* newBand);
|
||||||
void preparedForRender();
|
void preparedForRender();
|
||||||
void bandRegistred();
|
void bandRegistred();
|
||||||
protected:
|
protected:
|
||||||
|
@ -480,8 +480,8 @@ signals:
|
|||||||
void propertyChanged(const QString& propertName, const QVariant& oldValue,const QVariant& newValue);
|
void propertyChanged(const QString& propertName, const QVariant& oldValue,const QVariant& newValue);
|
||||||
void propertyObjectNameChanged(const QString& oldValue, const QString& newValue);
|
void propertyObjectNameChanged(const QString& oldValue, const QString& newValue);
|
||||||
void propertyesChanged(QVector<QString> propertyNames);
|
void propertyesChanged(QVector<QString> propertyNames);
|
||||||
void itemAlignChanged(LimeReport::BaseDesignIntf* item, const LimeReport::BaseDesignIntf::ItemAlign& oldValue, const LimeReport::BaseDesignIntf::ItemAlign& newValue);
|
void itemAlignChanged(BaseDesignIntf* item, const BaseDesignIntf::ItemAlign& oldValue, const BaseDesignIntf::ItemAlign& newValue);
|
||||||
void itemVisibleHasChanged(LimeReport::BaseDesignIntf* item);
|
void itemVisibleHasChanged(BaseDesignIntf* item);
|
||||||
void beforeRender();
|
void beforeRender();
|
||||||
void afterData();
|
void afterData();
|
||||||
void afterRender();
|
void afterRender();
|
||||||
|
@ -505,7 +505,6 @@ BandDesignIntf* ReportRender::renderBand(BandDesignIntf *patternBand, BandDesign
|
|||||||
bandClone->setBackgroundColor(makeBackgroundColor(patternBand));
|
bandClone->setBackgroundColor(makeBackgroundColor(patternBand));
|
||||||
patternBand->emitBandRendered(bandClone);
|
patternBand->emitBandRendered(bandClone);
|
||||||
m_scriptEngineContext->setCurrentBand(bandClone);
|
m_scriptEngineContext->setCurrentBand(bandClone);
|
||||||
emit(patternBand->afterRender());
|
|
||||||
|
|
||||||
if ( isLast && bandClone->keepFooterTogether() && bandClone->sliceLastRow() ){
|
if ( isLast && bandClone->keepFooterTogether() && bandClone->sliceLastRow() ){
|
||||||
if (m_maxHeightByColumn[m_currentColumn] < (bandClone->height()+m_reportFooterHeight))
|
if (m_maxHeightByColumn[m_currentColumn] < (bandClone->height()+m_reportFooterHeight))
|
||||||
@ -549,7 +548,7 @@ BandDesignIntf* ReportRender::renderBand(BandDesignIntf *patternBand, BandDesign
|
|||||||
savePage();
|
savePage();
|
||||||
startNewPage();
|
startNewPage();
|
||||||
if (!bandIsSliced){
|
if (!bandIsSliced){
|
||||||
BandDesignIntf* t = renderData(patternBand);
|
BandDesignIntf* t = renderData(patternBand, false);
|
||||||
t->copyBandAttributes(bandClone);
|
t->copyBandAttributes(bandClone);
|
||||||
patternBand->emitBandReRendered(bandClone, t);
|
patternBand->emitBandReRendered(bandClone, t);
|
||||||
delete bandClone;
|
delete bandClone;
|
||||||
@ -577,6 +576,7 @@ BandDesignIntf* ReportRender::renderBand(BandDesignIntf *patternBand, BandDesign
|
|||||||
|
|
||||||
if (patternBand->isFooter())
|
if (patternBand->isFooter())
|
||||||
datasources()->clearGroupFunctionValues(patternBand->objectName());
|
datasources()->clearGroupFunctionValues(patternBand->objectName());
|
||||||
|
emit(patternBand->afterRender());
|
||||||
return bandClone;
|
return bandClone;
|
||||||
}
|
}
|
||||||
return 0;
|
return 0;
|
||||||
@ -1259,13 +1259,14 @@ BandDesignIntf *ReportRender::saveUppperPartReturnBottom(BandDesignIntf *band, i
|
|||||||
return bottomBandPart;
|
return bottomBandPart;
|
||||||
}
|
}
|
||||||
|
|
||||||
BandDesignIntf *ReportRender::renderData(BandDesignIntf *patternBand)
|
BandDesignIntf *ReportRender::renderData(BandDesignIntf *patternBand, bool emitBeforeRender)
|
||||||
{
|
{
|
||||||
BandDesignIntf* bandClone = dynamic_cast<BandDesignIntf*>(patternBand->cloneItem(PreviewMode));
|
BandDesignIntf* bandClone = dynamic_cast<BandDesignIntf*>(patternBand->cloneItem(PreviewMode));
|
||||||
|
|
||||||
m_scriptEngineContext->baseDesignIntfToScript(patternBand->parent()->objectName(), bandClone);
|
m_scriptEngineContext->baseDesignIntfToScript(patternBand->parent()->objectName(), bandClone);
|
||||||
m_scriptEngineContext->setCurrentBand(bandClone);
|
m_scriptEngineContext->setCurrentBand(bandClone);
|
||||||
emit(patternBand->beforeRender());
|
if (emitBeforeRender)
|
||||||
|
emit(patternBand->beforeRender());
|
||||||
|
|
||||||
if (patternBand->isFooter()){
|
if (patternBand->isFooter()){
|
||||||
replaceGroupsFunction(bandClone);
|
replaceGroupsFunction(bandClone);
|
||||||
|
@ -169,7 +169,7 @@ private:
|
|||||||
BandDesignIntf *sliceBand(BandDesignIntf* band, BandDesignIntf *patternBand, bool isLast);
|
BandDesignIntf *sliceBand(BandDesignIntf* band, BandDesignIntf *patternBand, bool isLast);
|
||||||
|
|
||||||
BandDesignIntf* saveUppperPartReturnBottom(BandDesignIntf *band, int height, BandDesignIntf *patternBand);
|
BandDesignIntf* saveUppperPartReturnBottom(BandDesignIntf *band, int height, BandDesignIntf *patternBand);
|
||||||
BandDesignIntf* renderData(BandDesignIntf* patternBand);
|
BandDesignIntf* renderData(BandDesignIntf* patternBand, bool emitBeforeRender = true);
|
||||||
void startNewColumn();
|
void startNewColumn();
|
||||||
void startNewPage(bool isFirst = false);
|
void startNewPage(bool isFirst = false);
|
||||||
void resetPageNumber(ResetPageNuberType resetType);
|
void resetPageNumber(ResetPageNuberType resetType);
|
||||||
|
Loading…
Reference in New Issue
Block a user