python-LimeReport/LimeReport
0
0
Fork 0
mirror of https://github.com/python-LimeReport/LimeReport.git synced 2025-10-22 10:27:32 +03:00
Code Issues Packages Projects Releases Wiki Activity

Finish 1.4.124

Browse Source 
# Conflicts:
#	limereport/lrbanddesignintf.h
#	limereport/lrpagedesignintf.cpp
#	limereport/lrpageitemdesignintf.h
#	translations/limereport_zh.ts
This commit is contained in:
Arin Alexander
2019-03-05 22:35:13 +03:00
parent a2b7de4c10 6cad2bd6db
commit c475159799
7 changed files with 78 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
limereport/lrbanddesignintf.cpp
View File

@@ -425,10 +425,23 @@ int BandDesignIntf::maxChildIndex(QSet<BandDesignIntf::BandsType> ignoredBands)
return curIndex;
}
int BandDesignIntf::rootIndex(BandDesignIntf* parentBand)
{
return rootBand(parentBand)->bandIndex();
}
BandDesignIntf *BandDesignIntf::rootBand(BandDesignIntf* parentBand)
{
BandDesignIntf* currentBand = this;
while (currentBand->parentBand() && currentBand->parentBand() != parentBand)
currentBand = currentBand->parentBand();
return currentBand;
}
int BandDesignIntf::minChildIndex(BandDesignIntf::BandsType bandType){
int curIndex = bandIndex();
foreach(BandDesignIntf* childBand, childBands()){
if (curIndex>childBand->bandIndex() && (childBand->bandType()>bandType)){
if (curIndex > childBand->bandIndex() && (childBand->bandType() > bandType)){
curIndex = childBand->bandIndex();
}
}
@@ -440,7 +453,7 @@ int BandDesignIntf::minChildIndex(QSet<BandDesignIntf::BandsType> ignoredBands)
int curIndex = bandIndex();
foreach(BandDesignIntf* childBand, childBands()){
if (!ignoredBands.contains(childBand->bandType()) && childBand->bandIndex() < bandIndex()){
curIndex = std::min(curIndex, childBand->maxChildIndex(ignoredBands));
curIndex = std::min(curIndex, childBand->minChildIndex(ignoredBands));
}
}
return curIndex;